Add MySQL 5.6 stanzas next to MySQL 5.5 in debian/control file

This should make the provides/breaks/replaces/conflicts lines work properly when upgrading from mysql-5.6 to mariadb-packages.
MariaDB · Sep 1, 2015 · cc08c13 · cc08c13
1 parent bd3864e
commit cc08c13
Showing 1 changed file with 29 additions and 14 deletions.
diff --git a/debian/control b/debian/control
@@ -11,8 +11,6 @@ Build-Depends: bison,
                dpatch,
                libaio-dev,
                libboost-dev,
-               ${MAYBE_LIBCRACK}
-               libjemalloc-dev (>= 3.0.0~) [linux-any],
                libjudy-dev,
                libncurses5-dev (>= 5.0-6~),
                libpam0g-dev,
@@ -22,7 +20,9 @@ Build-Depends: bison,
                perl (>= 5.6.0),
                po-debconf,
                psmisc,
-               zlib1g-dev (>= 1:1.1.3-5~)
+               zlib1g-dev (>= 1:1.1.3-5~),
+               ${MAYBE_LIBCRACK}
+               libjemalloc-dev (>= 3.0.0~) [linux-any]
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
 Vcs-Bzr: https://github.com/MariaDB/server.git
@@ -134,7 +134,10 @@ Depends: libmariadbclient18 (>= ${source:Version}),
          mariadb-common,
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
+Provides: mysql-client-core,
+          mysql-client-core-5.1,
+          mysql-client-core-5.5,
+          mysql-client-core-5.6
 Conflicts: mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -148,7 +151,8 @@ Conflicts: mariadb-client-5.1,
            mysql-client-5.1 (<< ${source:Version}),
            mysql-client-5.5 (<< ${source:Version}),
            mysql-client-core-5.1,
-           mysql-client-core-5.5
+           mysql-client-core-5.5,
+           mysql-client-core-5.6
 Replaces: mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -162,7 +166,8 @@ Replaces: mariadb-client-5.1,
           mysql-client-5.1,
           mysql-client-5.5,
           mysql-client-core-5.1,
-          mysql-client-core-5.5
+          mysql-client-core-5.5,
+          mysql-client-core-5.6
 Description: MariaDB database core client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -187,6 +192,7 @@ Provides: mysql-client,
           mysql-client-4.1,
           mysql-client-5.1,
           mysql-client-5.5,
+          mysql-client-5.6,
           virtual-mysql-client
 Conflicts: mariadb-client (<< ${source:Version}),
            mariadb-client-5.1,
@@ -196,7 +202,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client (<< 5.0.51),
            mysql-client-5.0,
            mysql-client-5.1,
-           mysql-client-5.5
+           mysql-client-5.5,
+           mysql-client-5.6
 Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-5.1,
           mariadb-client-5.2,
@@ -205,7 +212,8 @@ Replaces: mariadb-client (<< ${source:Version}),
           mysql-client (<< 5.0.51),
           mysql-client-5.0,
           mysql-client-5.1,
-          mysql-client-5.5
+          mysql-client-5.5,
+          mysql-client-5.6
 Description: MariaDB database client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -220,23 +228,28 @@ Architecture: any
 Depends: libmariadbclient18 (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
+Provides: mysql-server-core,
+          mysql-server-core-5.1,
+          mysql-server-core-5.5,
+          mysql-server-core-5.6
 Conflicts: mariadb-server-core-5.1,
            mariadb-server-core-5.2,
            mariadb-server-core-5.3,
            mariadb-server-core-5.5,
            mysql-server-5.0,
            mysql-server-core-5.0,
            mysql-server-core-5.1,
-           mysql-server-core-5.5
+           mysql-server-core-5.5,
+           mysql-server-core-5.6
 Replaces: mariadb-server-core-5.1,
           mariadb-server-core-5.2,
           mariadb-server-core-5.3,
           mariadb-server-core-5.5,
           mysql-server-5.0,
           mysql-server-core-5.0,
           mysql-server-core-5.1,
-          mysql-server-core-5.5
+          mysql-server-core-5.5,
+          mysql-server-core-5.6
 Description: MariaDB database core server files
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -271,7 +284,7 @@ Description: MariaDB database regression test suite
 Package: mariadb-server-10.1
 Architecture: any
 Suggests: mailx, mariadb-test, netcat-openbsd, socat, tinyca
-Recommends: libhtml-template-perl, galera-3 (>=25.3)
+Recommends: galera-3 (>=25.3), libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
 Depends: bsdutils,
          coreutils,
@@ -303,7 +316,8 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mysql-server-4.1,
            mysql-server-5.0,
            mysql-server-5.1,
-           mysql-server-5.5
+           mysql-server-5.5,
+           mysql-server-5.6
 Replaces: libmariadbclient-dev (<< 5.5.0),
           libmariadbclient16 (<< 5.3.4),
           mariadb-server (<< ${source:Version}),
@@ -317,7 +331,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mysql-server-4.1,
           mysql-server-5.0,
           mysql-server-5.1,
-          mysql-server-5.5
+          mysql-server-5.5,
+          mysql-server-5.6
 Description: MariaDB database server binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query