diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-16 21:21:15 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-16 21:21:15 +0200 |
| commit | 6d06ccbe5384874877485ddc470a89217d90c88d (patch) | |
| tree | 0ad2db483c22805dbab3ec8a11002a222bdf7c19 /debian | |
| parent | a784d62dae58642fedf6e909102850ccdfe93431 (diff) | |
| download | mariadb-git-6d06ccbe5384874877485ddc470a89217d90c88d.tar.gz | |
specify deb conflicts correctly
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/control | 4 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 2bea86dad37..d2a946326ed 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -14,7 +14,7 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-5.5 (<< 5.5.32) +Conflicts: mariadb-server-5.5 (<< 5.5.33) Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -169,7 +169,7 @@ Architecture: any Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version}) Conflicts: mariadb-test (<< ${source:Version}), mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.32) + mariadb-server-5.5 (<< 5.5.33) Replaces: mariadb-test (<< ${source:Version}), mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 Description: MariaDB database regression test suite diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 4b731f41722..ebf1e56e7cb 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -14,7 +14,7 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-5.5 (<< 5.5.32) +Conflicts: mariadb-server-5.5 (<< 5.5.33) Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -163,7 +163,7 @@ Architecture: any Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version}) Conflicts: mariadb-test (<< ${source:Version}), mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.32) + mariadb-server-5.5 (<< 5.5.33) Replaces: mariadb-test (<< ${source:Version}), mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 Description: MariaDB database regression test suite |