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

Deb: wrap-and-sort for easier comparison to downstream in future

parent f977709b
...@@ -17,13 +17,13 @@ Build-Depends: bison, ...@@ -17,13 +17,13 @@ Build-Depends: bison,
libjudy-dev, libjudy-dev,
libkrb5-dev, libkrb5-dev,
libncurses5-dev (>= 5.0-6~), libncurses5-dev (>= 5.0-6~),
libnuma-dev,
libpam0g-dev, libpam0g-dev,
libpcre3-dev (>= 2:8.35-3.2~), libpcre3-dev (>= 2:8.35-3.2~),
libreadline-gplv2-dev, libreadline-gplv2-dev,
libssl-dev, libssl-dev,
libsystemd-dev, libsystemd-dev,
libxml2-dev, libxml2-dev,
libnuma-dev,
lsb-release, lsb-release,
perl (>= 5.6.0), perl (>= 5.6.0),
po-debconf, po-debconf,
...@@ -46,8 +46,14 @@ Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), ...@@ -46,8 +46,14 @@ Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
mariadb-server-5.2, mariadb-server-5.2,
mariadb-server-5.3, mariadb-server-5.3,
mariadb-server-5.5 (<< 5.5.33) mariadb-server-5.5 (<< 5.5.33)
Replaces: libmariadbclient18, libmysqlclient18, libmysqlclient19, libmysqlclient20 Replaces: libmariadbclient18,
Provides: libmariadbclient18, libmysqlclient18, libmysqlclient19, libmysqlclient20 libmysqlclient18,
libmysqlclient19,
libmysqlclient20
Provides: libmariadbclient18,
libmysqlclient18,
libmysqlclient19,
libmysqlclient20
Description: MariaDB database client library Description: MariaDB database client library
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
...@@ -87,8 +93,8 @@ Architecture: any ...@@ -87,8 +93,8 @@ Architecture: any
Section: libdevel Section: libdevel
Provides: libmysqld-dev Provides: libmysqld-dev
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: libmariadbd19, Depends: libmariadb-dev (= ${binary:Version}),
libmariadb-dev (= ${binary:Version}), libmariadbd19,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: libmysqld-dev Breaks: libmysqld-dev
...@@ -123,15 +129,15 @@ Depends: libmariadb3 (= ${binary:Version}), ...@@ -123,15 +129,15 @@ Depends: libmariadb3 (= ${binary:Version}),
zlib1g-dev, zlib1g-dev,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: libmysqlclient-dev, libmariadbclient-dev Breaks: libmariadbclient-dev, libmysqlclient-dev
Replaces: libmysqlclient-dev, libmariadbclient-dev Replaces: libmariadbclient-dev, libmysqlclient-dev
Conflicts: libmariadbclient16-dev, Conflicts: libmariadbclient16-dev,
libmysqlclient10-dev, libmysqlclient10-dev,
libmysqlclient12-dev, libmysqlclient12-dev,
libmysqlclient14-dev, libmysqlclient14-dev,
libmysqlclient15-dev, libmysqlclient15-dev,
libmysqlclient16-dev libmysqlclient16-dev
Provides: libmysqlclient-dev, libmariadbclient-dev, libmariadbclient-dev-compat Provides: libmariadbclient-dev, libmariadbclient-dev-compat, libmysqlclient-dev
Description: MariaDB database development files Description: MariaDB database development 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
...@@ -212,12 +218,12 @@ Replaces: mariadb-client-10.0, ...@@ -212,12 +218,12 @@ Replaces: mariadb-client-10.0,
mysql-client-core-5.6, mysql-client-core-5.6,
mysql-client-core-5.7, mysql-client-core-5.7,
virtual-mysql-client-core virtual-mysql-client-core
Provides: mysql-client-core, Provides: default-mysql-client-core,
mysql-client-core,
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, mysql-client-core-5.7,
default-mysql-client-core,
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
...@@ -264,13 +270,13 @@ Replaces: mariadb-client (<< ${source:Version}), ...@@ -264,13 +270,13 @@ Replaces: mariadb-client (<< ${source:Version}),
mysql-client-5.6, mysql-client-5.6,
mysql-client-5.7, mysql-client-5.7,
virtual-mysql-client virtual-mysql-client
Provides: mysql-client, Provides: default-mysql-client,
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, mysql-client-5.6,
mysql-client-5.7, mysql-client-5.7,
default-mysql-client,
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
...@@ -301,13 +307,13 @@ Conflicts: mariadb-server-core-10.0, ...@@ -301,13 +307,13 @@ Conflicts: mariadb-server-core-10.0,
mysql-server-core-5.6, mysql-server-core-5.6,
mysql-server-core-5.7, mysql-server-core-5.7,
virtual-mysql-server-core virtual-mysql-server-core
Breaks: mariadb-server-10.2 (<< ${source:Version}), Breaks: mariadb-client-10.0,
mariadb-client-10.2 (<< ${source:Version}),
mariadb-client-10.1, mariadb-client-10.1,
mariadb-client-10.0 mariadb-client-10.2 (<< ${source:Version}),
Replaces: mariadb-client-10.2 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
Replaces: mariadb-client-10.0,
mariadb-client-10.1, mariadb-client-10.1,
mariadb-client-10.0, mariadb-client-10.2 (<< ${source:Version}),
mariadb-server-10.2 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version}),
mariadb-server-core-10.0, mariadb-server-core-10.0,
mariadb-server-core-10.1, mariadb-server-core-10.1,
...@@ -322,12 +328,12 @@ Replaces: mariadb-client-10.2 (<< ${source:Version}), ...@@ -322,12 +328,12 @@ Replaces: mariadb-client-10.2 (<< ${source:Version}),
mysql-server-core-5.6, mysql-server-core-5.6,
mysql-server-core-5.7, mysql-server-core-5.7,
virtual-mysql-server-core virtual-mysql-server-core
Provides: mysql-server-core, Provides: default-mysql-server-core,
mysql-server-core,
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, mysql-server-core-5.7,
default-mysql-server-core,
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
...@@ -398,7 +404,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0), ...@@ -398,7 +404,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
mysql-server-5.6, mysql-server-5.6,
mysql-server-5.7, mysql-server-5.7,
virtual-mysql-server virtual-mysql-server
Provides: virtual-mysql-server, default-mysql-server Provides: default-mysql-server, 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
...@@ -438,19 +444,19 @@ Depends: mariadb-client-10.2 (= ${binary:Version}), ...@@ -438,19 +444,19 @@ Depends: mariadb-client-10.2 (= ${binary:Version}),
mariadb-test-data (= ${source:Version}), mariadb-test-data (= ${source:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-test-10.0, Breaks: mariadb-server-5.5,
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,
mysql-testsuite-5.7, mysql-testsuite-5.7,
virtual-mysql-testsuite virtual-mysql-testsuite
Replaces: mariadb-test-10.0, Replaces: mariadb-server-5.5,
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,
......
usr/lib/mariadb/libmariadb.so.*
usr/lib/*/libmariadbclient.so.* usr/lib/*/libmariadbclient.so.*
usr/lib/*/libmysqlclient.so.* usr/lib/*/libmysqlclient.so.*
usr/lib/mariadb/libmariadb.so.*
usr/lib/mysql/plugin/dialog.so usr/lib/mysql/plugin/dialog.so
usr/lib/mysql/plugin/mysql_clear_password.so usr/lib/mysql/plugin/mysql_clear_password.so
usr/bin/mariadb_config
usr/lib/*/libmysqld.a usr/lib/*/libmysqld.a
usr/lib/*/libmysqld.so usr/lib/*/libmysqld.so
usr/bin/mariadb_config
usr/lib/mysql/plugin/cracklib_password_check.so
etc/mysql/conf.d/cracklib_password_check.cnf etc/mysql/mariadb.conf.d etc/mysql/conf.d/cracklib_password_check.cnf etc/mysql/mariadb.conf.d
usr/lib/mysql/plugin/cracklib_password_check.so
usr/lib/mysql/plugin/auth_gssapi.so
etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d
usr/lib/mysql/plugin/auth_gssapi.so
...@@ -3,11 +3,15 @@ debian/additions/debian-start.inc.sh usr/share/mysql ...@@ -3,11 +3,15 @@ debian/additions/debian-start.inc.sh usr/share/mysql
debian/additions/echo_stderr usr/share/mysql debian/additions/echo_stderr usr/share/mysql
debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
etc/apparmor.d/usr.sbin.mysqld etc/apparmor.d/usr.sbin.mysqld
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
usr/bin/aria_chk usr/bin/aria_chk
usr/bin/aria_dump_log usr/bin/aria_dump_log
usr/bin/aria_ftdump usr/bin/aria_ftdump
usr/bin/aria_pack usr/bin/aria_pack
usr/bin/aria_read_log usr/bin/aria_read_log
usr/bin/galera_new_cluster
usr/bin/galera_recovery
usr/bin/mariadb-service-convert
usr/bin/msql2mysql usr/bin/msql2mysql
usr/bin/my_print_defaults usr/bin/my_print_defaults
usr/bin/myisam_ftdump usr/bin/myisam_ftdump
...@@ -63,7 +67,3 @@ usr/share/mysql/mysql_system_tables.sql ...@@ -63,7 +67,3 @@ usr/share/mysql/mysql_system_tables.sql
usr/share/mysql/mysql_system_tables_data.sql usr/share/mysql/mysql_system_tables_data.sql
usr/share/mysql/mysql_test_data_timezone.sql usr/share/mysql/mysql_test_data_timezone.sql
usr/share/mysql/wsrep_notify usr/share/mysql/wsrep_notify
usr/bin/galera_new_cluster
usr/bin/galera_recovery
usr/bin/mariadb-service-convert
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
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