Commit c5e7098d authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Sergei Golubchik

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
parent 0d604dd8
...@@ -136,7 +136,10 @@ Depends: libmariadbclient18 (>= ${source:Version}), ...@@ -136,7 +136,10 @@ Depends: libmariadbclient18 (>= ${source:Version}),
mariadb-common, mariadb-common,
${misc:Depends}, ${misc:Depends},
${shlibs: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, Conflicts: mariadb-client-5.1,
mariadb-client-5.2, mariadb-client-5.2,
mariadb-client-5.3, mariadb-client-5.3,
...@@ -150,7 +153,8 @@ Conflicts: mariadb-client-5.1, ...@@ -150,7 +153,8 @@ Conflicts: mariadb-client-5.1,
mysql-client-5.1 (<< ${source:Version}), mysql-client-5.1 (<< ${source:Version}),
mysql-client-5.5 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
mysql-client-core-5.1, 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, Replaces: mariadb-client-5.1,
mariadb-client-5.2, mariadb-client-5.2,
mariadb-client-5.3, mariadb-client-5.3,
...@@ -164,7 +168,8 @@ Replaces: mariadb-client-5.1, ...@@ -164,7 +168,8 @@ Replaces: mariadb-client-5.1,
mysql-client-5.1, mysql-client-5.1,
mysql-client-5.5, mysql-client-5.5,
mysql-client-core-5.1, 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 Description: MariaDB database core client binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query server. SQL (Structured Query Language) is the most popular database query
...@@ -189,6 +194,7 @@ Provides: mysql-client, ...@@ -189,6 +194,7 @@ Provides: mysql-client,
mysql-client-4.1, mysql-client-4.1,
mysql-client-5.1, mysql-client-5.1,
mysql-client-5.5, mysql-client-5.5,
mysql-client-5.6,
virtual-mysql-client virtual-mysql-client
Conflicts: mariadb-client (<< ${source:Version}), Conflicts: mariadb-client (<< ${source:Version}),
mariadb-client-5.1, mariadb-client-5.1,
...@@ -198,7 +204,8 @@ Conflicts: mariadb-client (<< ${source:Version}), ...@@ -198,7 +204,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
mysql-client (<< 5.0.51), mysql-client (<< 5.0.51),
mysql-client-5.0, mysql-client-5.0,
mysql-client-5.1, mysql-client-5.1,
mysql-client-5.5 mysql-client-5.5,
mysql-client-5.6
Replaces: mariadb-client (<< ${source:Version}), Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-5.1, mariadb-client-5.1,
mariadb-client-5.2, mariadb-client-5.2,
...@@ -207,7 +214,8 @@ Replaces: mariadb-client (<< ${source:Version}), ...@@ -207,7 +214,8 @@ Replaces: mariadb-client (<< ${source:Version}),
mysql-client (<< 5.0.51), mysql-client (<< 5.0.51),
mysql-client-5.0, mysql-client-5.0,
mysql-client-5.1, mysql-client-5.1,
mysql-client-5.5 mysql-client-5.5,
mysql-client-5.6
Description: MariaDB database client binaries Description: MariaDB database client binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query server. SQL (Structured Query Language) is the most popular database query
...@@ -222,7 +230,10 @@ Architecture: any ...@@ -222,7 +230,10 @@ Architecture: any
Depends: libmariadbclient18 (>= ${binary:Version}), Depends: libmariadbclient18 (>= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs: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, Conflicts: mariadb-server-core-5.1,
mariadb-server-core-5.2, mariadb-server-core-5.2,
mariadb-server-core-5.3, mariadb-server-core-5.3,
...@@ -230,7 +241,8 @@ Conflicts: mariadb-server-core-5.1, ...@@ -230,7 +241,8 @@ Conflicts: mariadb-server-core-5.1,
mysql-server-5.0, mysql-server-5.0,
mysql-server-core-5.0, mysql-server-core-5.0,
mysql-server-core-5.1, 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, Replaces: mariadb-server-core-5.1,
mariadb-server-core-5.2, mariadb-server-core-5.2,
mariadb-server-core-5.3, mariadb-server-core-5.3,
...@@ -238,7 +250,8 @@ Replaces: mariadb-server-core-5.1, ...@@ -238,7 +250,8 @@ Replaces: mariadb-server-core-5.1,
mysql-server-5.0, mysql-server-5.0,
mysql-server-core-5.0, mysql-server-core-5.0,
mysql-server-core-5.1, 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 Description: MariaDB database core server files
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query server. SQL (Structured Query Language) is the most popular database query
...@@ -298,7 +311,8 @@ Conflicts: mariadb-server (<< ${source:Version}), ...@@ -298,7 +311,8 @@ Conflicts: mariadb-server (<< ${source:Version}),
mysql-server-4.1, mysql-server-4.1,
mysql-server-5.0, mysql-server-5.0,
mysql-server-5.1, mysql-server-5.1,
mysql-server-5.5 mysql-server-5.5,
mysql-server-5.6
Replaces: libmariadbclient-dev (<< 5.5.0), Replaces: libmariadbclient-dev (<< 5.5.0),
libmariadbclient16 (<< 5.3.4), libmariadbclient16 (<< 5.3.4),
mariadb-server (<< ${source:Version}), mariadb-server (<< ${source:Version}),
...@@ -312,7 +326,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0), ...@@ -312,7 +326,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
mysql-server-4.1, mysql-server-4.1,
mysql-server-5.0, mysql-server-5.0,
mysql-server-5.1, mysql-server-5.1,
mysql-server-5.5 mysql-server-5.5,
mysql-server-5.6
Description: MariaDB database server binaries Description: MariaDB database server binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query server. SQL (Structured Query Language) is the most popular database query
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment