MDEV #5682 : Incompatible galera / mariadb-galera-server

version on Debian

Updated galera package version to >=25.2 in Debian/Ubuntu
control files.

2 files changed, 8 insertions, 16 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 6d692773abb..50b216aae7c 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -187,20 +187,16 @@ Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), libmariadbclient18 (>= ${binary:Version}), galera (>=23.2)
-Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server
-Conflicts: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
+Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version}), galera (>=25.2)
+Provides: mariadb-server, mysql-server, virtual-mysql-server, mariadb-galera-server
+Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5, 
     mariadb-tokudb-engine-5.5
-Replaces: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
+Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}), 
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5, 
     mariadb-tokudb-engine-5.5
 Description: MariaDB database server with Galera cluster binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 9e8f491cfcb..f6a1e492008 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -181,20 +181,16 @@ Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), libmariadbclient18 (>= ${binary:Version}), galera (>=23.2)
-Provides:  mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server
-Conflicts: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
+Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version}), galera (>=25.2)
+Provides: mariadb-server, mysql-server, virtual-mysql-server, mariadb-galera-server
+Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5, 
     mariadb-tokudb-engine-5.5
-Replaces: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
+Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
     mariadb-tokudb-engine-5.5
 Description: MariaDB database server with Galera cluster binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database