From 6d06ccbe5384874877485ddc470a89217d90c88d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 16 Sep 2013 21:21:15 +0200 Subject: specify deb conflicts correctly --- debian/dist/Debian/control | 4 ++-- 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 -- cgit v1.2.1 From 69324831a47c93006c82b7bd4d48ec7b33c716b3 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 17 Sep 2013 17:07:45 +0200 Subject: mariadb-tokudb-engine deb package is not architecture-independent --- debian/dist/Debian/control | 2 +- debian/dist/Ubuntu/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index d2a946326ed..77021cad411 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -240,7 +240,7 @@ Description: MariaDB database regression test suite (metapackage depending on th Package: mariadb-tokudb-engine-5.5 Section: database -Architecture: all +Architecture: any Depends: mariadb-server-5.5 Description: TokuDB storage engine for MariaDB TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index ebf1e56e7cb..97dec4b3774 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -234,7 +234,7 @@ Description: MariaDB database regression test suite (metapackage depending on th Package: mariadb-tokudb-engine-5.5 Section: database -Architecture: all +Architecture: any Depends: mariadb-server-5.5 Description: TokuDB storage engine for MariaDB TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC -- cgit v1.2.1