summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-09-18 10:30:23 +0200
committerSergei Golubchik <sergii@pisem.net>2013-09-18 10:30:23 +0200
commit197bdbae4db78ba65f3668803bebd3c4a4509ae5 (patch)
tree494142ca5cc1101abbae1f37b44a994a9a45b115 /debian
parenta5d7e701196052f4a6605f465953098eba37a7aa (diff)
downloadmariadb-git-197bdbae4db78ba65f3668803bebd3c4a4509ae5.tar.gz
fix upgrades when mariadb-galera-server-5.5 is installed
Diffstat (limited to 'debian')
-rw-r--r--debian/dist/Debian/control4
-rw-r--r--debian/dist/Ubuntu/control4
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 77021cad411..c66ffedfd1a 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.33)
+Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-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.33)
+ mariadb-server-5.5 (<< 5.5.33), mariadb-galera-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 97dec4b3774..8eb5f4537ac 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.33)
+Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-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.33)
+ mariadb-server-5.5 (<< 5.5.33), mariadb-galera-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