diff options
| author | Daniel Black <daniel@mariadb.org> | 2020-08-19 09:32:33 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-08-19 15:22:25 +1000 |
| commit | c522f8be3e0c86264f6275e2e9bd072f8b11d4ec (patch) | |
| tree | 1438ee2b6c96a176388c0221885bbe2959f54e9a | |
| parent | d739e6192d1c53e516dda1507e094620b337c5c1 (diff) | |
| download | mariadb-git-bb-10.2-anel-without_server.tar.gz | |
MDEV-23429: Debian package conflict due to server->client programsbb-10.2-anel-without_server
Files in the server package where moved to the client package.
So we introduce a conflict between the new versions both both
to the old versions of both.
| -rw-r--r-- | debian/control | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/debian/control b/debian/control index ba6243c38dd..a79265e705d 100644 --- a/debian/control +++ b/debian/control @@ -198,7 +198,8 @@ Conflicts: mariadb-client-10.0, mysql-client-core-5.5, mysql-client-core-5.6, mysql-client-core-5.7, - virtual-mysql-client-core + virtual-mysql-client-core, + mariadb-server-10.2 (<= 10.2.33 ) Replaces: mariadb-client-10.0, mariadb-client-10.1, mariadb-client-5.1, @@ -383,7 +384,8 @@ Conflicts: mariadb-server (<< ${source:Version}), mysql-server-5.5, mysql-server-5.6, mysql-server-5.7, - virtual-mysql-server + virtual-mysql-server, + mariadb-client-10.2 (<= 10.2.33 ) Replaces: libmariadbclient-dev (<< 5.5.0), libmariadbclient16 (<< 5.3.4), mariadb-server (<< ${source:Version}), |