Commit affa6e3d authored by Otto Kekäläinen's avatar Otto Kekäläinen

MDEV-6284: Break/replace MySQL 5.7 packages to allow upgrade

Also sort control file slightly to be easier to compare to downstream
control file and include gdb for automatic backtraces if the test suite
fails.

Delete duplicate man page installation.

Make mariadb-test breaks/replaces mariadb-server-5.5
as /usr/lib/mysql/plugin/adt_null.so changed package.
parent 8c32d959
...@@ -8,7 +8,7 @@ Build-Depends: bison, ...@@ -8,7 +8,7 @@ Build-Depends: bison,
debhelper (>= 9), debhelper (>= 9),
dh-apparmor, dh-apparmor,
dpatch, dpatch,
libaio-dev, libaio-dev [linux-any],
libboost-dev, libboost-dev,
libjemalloc-dev (>= 3.0.0~) [linux-any], libjemalloc-dev (>= 3.0.0~) [linux-any],
libjudy-dev, libjudy-dev,
...@@ -70,7 +70,6 @@ Section: libdevel ...@@ -70,7 +70,6 @@ Section: libdevel
Provides: libmysqld-dev Provides: libmysqld-dev
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: libmariadbclient-dev (= ${binary:Version}), Depends: libmariadbclient-dev (= ${binary:Version}),
libmariadbd18 (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: libmysqld-dev Breaks: libmysqld-dev
...@@ -137,11 +136,6 @@ Depends: libmariadbclient18 (>= ${source:Version}), ...@@ -137,11 +136,6 @@ Depends: libmariadbclient18 (>= ${source:Version}),
mariadb-common (>= ${source:Version}), mariadb-common (>= ${source:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Provides: mysql-client-core,
mysql-client-core-5.1,
mysql-client-core-5.5,
mysql-client-core-5.6,
virtual-mysql-client-core
Conflicts: mariadb-client-10.0, Conflicts: mariadb-client-10.0,
mariadb-client-10.1, mariadb-client-10.1,
mariadb-client-5.1, mariadb-client-5.1,
...@@ -161,6 +155,7 @@ Conflicts: mariadb-client-10.0, ...@@ -161,6 +155,7 @@ Conflicts: mariadb-client-10.0,
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, mysql-client-core-5.6,
mysql-client-core-5.7,
virtual-mysql-client-core virtual-mysql-client-core
Replaces: mariadb-client-10.0, Replaces: mariadb-client-10.0,
mariadb-client-10.1, mariadb-client-10.1,
...@@ -181,6 +176,13 @@ Replaces: mariadb-client-10.0, ...@@ -181,6 +176,13 @@ Replaces: mariadb-client-10.0,
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, mysql-client-core-5.6,
mysql-client-core-5.7,
virtual-mysql-client-core
Provides: mysql-client-core,
mysql-client-core-5.1,
mysql-client-core-5.5,
mysql-client-core-5.6,
mysql-client-core-5.7,
virtual-mysql-client-core virtual-mysql-client-core
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
...@@ -199,12 +201,6 @@ Depends: debianutils (>=1.6), ...@@ -199,12 +201,6 @@ Depends: debianutils (>=1.6),
${misc:Depends}, ${misc:Depends},
${perl:Depends}, ${perl:Depends},
${shlibs:Depends} ${shlibs:Depends}
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}), Conflicts: mariadb-client (<< ${source:Version}),
mariadb-client-10.0, mariadb-client-10.0,
mariadb-client-10.1, mariadb-client-10.1,
...@@ -217,6 +213,7 @@ Conflicts: mariadb-client (<< ${source:Version}), ...@@ -217,6 +213,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
mysql-client-5.1, mysql-client-5.1,
mysql-client-5.5, mysql-client-5.5,
mysql-client-5.6, mysql-client-5.6,
mysql-client-5.7,
virtual-mysql-client virtual-mysql-client
Replaces: mariadb-client (<< ${source:Version}), Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.0, mariadb-client-10.0,
...@@ -230,6 +227,14 @@ Replaces: mariadb-client (<< ${source:Version}), ...@@ -230,6 +227,14 @@ Replaces: mariadb-client (<< ${source:Version}),
mysql-client-5.1, mysql-client-5.1,
mysql-client-5.5, mysql-client-5.5,
mysql-client-5.6, mysql-client-5.6,
mysql-client-5.7,
virtual-mysql-client
Provides: mysql-client,
mysql-client-4.1,
mysql-client-5.1,
mysql-client-5.5,
mysql-client-5.6,
mysql-client-5.7,
virtual-mysql-client virtual-mysql-client
Recommends: libdbd-mysql-perl (>= 1.2202), libdbi-perl, libterm-readkey-perl Recommends: libdbd-mysql-perl (>= 1.2202), libdbi-perl, libterm-readkey-perl
Description: MariaDB database client binaries Description: MariaDB database client binaries
...@@ -247,11 +252,6 @@ Depends: libmariadbclient18 (>= ${binary:Version}), ...@@ -247,11 +252,6 @@ Depends: libmariadbclient18 (>= ${binary:Version}),
mariadb-common (>= ${source:Version}), mariadb-common (>= ${source:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Provides: mysql-server-core,
mysql-server-core-5.1,
mysql-server-core-5.5,
mysql-server-core-5.6,
virtual-mysql-server-core
Conflicts: mariadb-server-core-10.0, Conflicts: mariadb-server-core-10.0,
mariadb-server-core-10.1, mariadb-server-core-10.1,
mariadb-server-core-5.1, mariadb-server-core-5.1,
...@@ -263,8 +263,11 @@ Conflicts: mariadb-server-core-10.0, ...@@ -263,8 +263,11 @@ Conflicts: mariadb-server-core-10.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, mysql-server-core-5.6,
mysql-server-core-5.7,
virtual-mysql-server-core virtual-mysql-server-core
Replaces: mariadb-server-core-10.0, Breaks: mariadb-server-10.2 (<< ${source:Version})
Replaces: mariadb-server-10.2 (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1, mariadb-server-core-10.1,
mariadb-server-core-5.1, mariadb-server-core-5.1,
mariadb-server-core-5.2, mariadb-server-core-5.2,
...@@ -275,6 +278,13 @@ Replaces: mariadb-server-core-10.0, ...@@ -275,6 +278,13 @@ Replaces: mariadb-server-core-10.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, mysql-server-core-5.6,
mysql-server-core-5.7,
virtual-mysql-server-core
Provides: mysql-server-core,
mysql-server-core-5.1,
mysql-server-core-5.5,
mysql-server-core-5.6,
mysql-server-core-5.7,
virtual-mysql-server-core virtual-mysql-server-core
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
...@@ -307,7 +317,6 @@ Depends: bsdutils, ...@@ -307,7 +317,6 @@ Depends: bsdutils,
socat, socat,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Provides: mariadb-server, mysql-server, virtual-mysql-server
Conflicts: mariadb-server (<< ${source:Version}), Conflicts: mariadb-server (<< ${source:Version}),
mariadb-server-10.0, mariadb-server-10.0,
mariadb-server-10.1, mariadb-server-10.1,
...@@ -324,6 +333,7 @@ Conflicts: mariadb-server (<< ${source:Version}), ...@@ -324,6 +333,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
mysql-server-5.1, mysql-server-5.1,
mysql-server-5.5, mysql-server-5.5,
mysql-server-5.6, mysql-server-5.6,
mysql-server-5.7,
virtual-mysql-server virtual-mysql-server
Replaces: libmariadbclient-dev (<< 5.5.0), Replaces: libmariadbclient-dev (<< 5.5.0),
libmariadbclient16 (<< 5.3.4), libmariadbclient16 (<< 5.3.4),
...@@ -343,7 +353,9 @@ Replaces: libmariadbclient-dev (<< 5.5.0), ...@@ -343,7 +353,9 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
mysql-server-5.1, mysql-server-5.1,
mysql-server-5.5, mysql-server-5.5,
mysql-server-5.6, mysql-server-5.6,
mysql-server-5.7,
virtual-mysql-server virtual-mysql-server
Provides: virtual-mysql-server
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
...@@ -386,6 +398,7 @@ Depends: mariadb-client-10.2 (= ${binary:Version}), ...@@ -386,6 +398,7 @@ Depends: mariadb-client-10.2 (= ${binary:Version}),
Breaks: mariadb-test-10.0, Breaks: mariadb-test-10.0,
mariadb-test-10.1, mariadb-test-10.1,
mariadb-test-5.5, mariadb-test-5.5,
mariadb-server-5.5,
mysql-testsuite, mysql-testsuite,
mysql-testsuite-5.5, mysql-testsuite-5.5,
mysql-testsuite-5.6, mysql-testsuite-5.6,
...@@ -394,6 +407,7 @@ Breaks: mariadb-test-10.0, ...@@ -394,6 +407,7 @@ Breaks: mariadb-test-10.0,
Replaces: mariadb-test-10.0, Replaces: mariadb-test-10.0,
mariadb-test-10.1, mariadb-test-10.1,
mariadb-test-5.5, mariadb-test-5.5,
mariadb-server-5.5,
mysql-testsuite, mysql-testsuite,
mysql-testsuite-5.5, mysql-testsuite-5.5,
mysql-testsuite-5.6, mysql-testsuite-5.6,
......
...@@ -5,5 +5,4 @@ usr/lib/*/libmariadb.so ...@@ -5,5 +5,4 @@ usr/lib/*/libmariadb.so
usr/lib/*/libmariadbclient.a usr/lib/*/libmariadbclient.a
usr/lib/*/libmysqlservices.a usr/lib/*/libmysqlservices.a
usr/share/aclocal/mysql.m4 usr/share/aclocal/mysql.m4
usr/share/man/man1/mysql_config.1
usr/share/pkgconfig/mariadb.pc usr/share/pkgconfig/mariadb.pc
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