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.

Conflicts:

	debian/control

1 files changed, 25 insertions, 10 deletions

diff --git a/debian/control b/debian/control
index e6e82697d9c..c699d6cf595 100644
--- a/debian/control
+++ b/debian/control
@@ -136,7 +136,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,
@@ -150,7 +153,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,
@@ -164,7 +168,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
@@ -189,6 +194,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,
@@ -198,7 +204,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,
@@ -207,7 +214,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
@@ -222,7 +230,10 @@ 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,
@@ -230,7 +241,8 @@ Conflicts: mariadb-server-core-5.1,
            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,
@@ -238,7 +250,8 @@ Replaces: mariadb-server-core-5.1,
           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
@@ -298,7 +311,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}),
@@ -312,7 +326,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