summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-09-19 20:19:17 +0200
committerSergei Golubchik <sergii@pisem.net>2013-09-19 20:19:17 +0200
commit93b7d00f006b7ff770e65f6f70ebe5526aa111ba (patch)
tree0ea40a053d487580cf53abc26f223d87678b4d53 /debian
parent43f4e364f0dc818d2d39881a765fe4fce0813f79 (diff)
downloadmariadb-git-93b7d00f006b7ff770e65f6f70ebe5526aa111ba.tar.gz
MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy
Diffstat (limited to 'debian')
-rw-r--r--debian/dist/Debian/control3
-rw-r--r--debian/dist/Ubuntu/control3
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