From 93b7d00f006b7ff770e65f6f70ebe5526aa111ba Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 19 Sep 2013 20:19:17 +0200 Subject: [PATCH] MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy --- debian/dist/Debian/control | 3 ++- debian/dist/Ubuntu/control | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index c66ffedfd1a..38868478abd 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -14,7 +14,8 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) +Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 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 diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 8eb5f4537ac..de7b2405676 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -14,7 +14,8 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) +Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 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