diff options
| -rw-r--r-- | debian/control | 86 | ||||
| -rw-r--r-- | debian/libmariadb-dev.install | 4 | ||||
| -rw-r--r-- | debian/libmariadb3.install | 2 | ||||
| -rw-r--r-- | debian/mariadb-client-10.3.docs | 2 | ||||
| -rw-r--r-- | debian/mariadb-client-10.3.install | 6 | ||||
| -rw-r--r-- | debian/mariadb-client-10.3.links | 4 | ||||
| -rw-r--r-- | debian/mariadb-plugin-aws-key-management.install | 2 | ||||
| -rw-r--r-- | debian/mariadb-plugin-mroonga.install | 4 | ||||
| -rw-r--r-- | debian/mariadb-plugin-rocksdb.install | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.3.install | 34 | ||||
| -rw-r--r-- | debian/mariadb-server-core-10.3.install | 8 | ||||
| -rw-r--r-- | debian/mariadb-test.install | 14 | ||||
| -rw-r--r-- | debian/mariadb-test.links | 2 | ||||
| -rw-r--r-- | debian/mysql-common.install | 2 |
14 files changed, 99 insertions, 73 deletions
diff --git a/debian/control b/debian/control index 680b6e7de30..adc92a58087 100644 --- a/debian/control +++ b/debian/control @@ -13,17 +13,17 @@ Build-Depends: bison, libaio-dev [linux-any], libboost-dev, libcrack2-dev (>= 2.9.0), + libcurl3-dev, libjemalloc-dev (>= 3.0.0~) [linux-any], libjudy-dev, libkrb5-dev, - libcurl3-dev, libncurses5-dev (>= 5.0-6~), libnuma-dev, libpam0g-dev, libpcre3-dev (>= 2:8.35-3.2~), libreadline-gplv2-dev, - libssl-dev | libssl1.0-dev, libsnappy-dev, + libssl-dev | libssl1.0-dev, libsystemd-dev, libxml2-dev, lsb-release, @@ -41,15 +41,17 @@ Vcs-Browser: https://github.com/MariaDB/server/ Package: libmariadb3 Architecture: any Section: libs -Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends} -Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), +Depends: mariadb-common, + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libmariadbclient18 (<< 10.2.0), + mariadb-galera-server-10.0 (<< 10.0.5), mariadb-galera-server-5.5 (<< 5.5.33), mariadb-server-10.0 (<< 10.0.5), mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, - mariadb-server-5.5 (<< 5.5.33), - libmariadbclient18 (<< 10.2.0) + mariadb-server-5.5 (<< 5.5.33) Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -61,13 +63,16 @@ Description: MariaDB database client library Package: libmariadb3-compat Architecture: any Section: libs -Depends: mariadb-common, libmariadb3, ${misc:Depends}, ${shlibs:Depends} +Depends: libmariadb3, + mariadb-common, + ${misc:Depends}, + ${shlibs:Depends} Breaks: libmysqlclient19, - libmysqlclient20 + libmysqlclient20 Replaces: libmysqlclient19, - libmysqlclient20 + libmysqlclient20 Provides: libmysqlclient19, - libmysqlclient20 + libmysqlclient20 Description: MariaDB database client library MySQL compat package MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -80,7 +85,8 @@ Description: MariaDB database client library MySQL compat package Package: libmariadbclient18 Section: libs Architecture: any -Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Depends: libmariadb3 (= ${binary:Version}), + ${misc:Depends} Replaces: libmariadbclient18 Provides: libmariadbclient18 Description: Virtual package to satisfy external libmariadbclient18 depends @@ -95,7 +101,8 @@ Description: Virtual package to satisfy external libmariadbclient18 depends Package: libmysqlclient18 Section: libs Architecture: any -Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Depends: libmariadb3 (= ${binary:Version}), + ${misc:Depends} Replaces: libmysqlclient18 Provides: libmysqlclient18 Description: Virtual package to satisfy external libmysqlclient18 depends @@ -133,7 +140,8 @@ Architecture: any Multi-Arch: same Section: libdevel Priority: extra -Depends: libmariadb-dev (= ${binary:Version}), ${misc:Depends} +Depends: libmariadb-dev (= ${binary:Version}), + ${misc:Depends} Conflicts: libmariadb-client-lgpl-dev-compat, libmariadbclient-dev-compat, libmysqlclient-dev, @@ -142,8 +150,12 @@ Conflicts: libmariadb-client-lgpl-dev-compat, libmysqlclient14-dev, libmysqlclient15-dev, libmysqlclient16-dev -Provides: libmariadbclient-dev-compat, libmariadb-client-lgpl-dev-compat, libmysqlclient-dev -Replaces: libmariadbclient-dev-compat, libmariadb-client-lgpl-dev-compat, libmysqlclient-dev +Provides: libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev-compat, + libmysqlclient-dev +Replaces: libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev-compat, + libmysqlclient-dev Description: MariaDB Connector/C, compatibility symlinks MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -156,7 +168,8 @@ Description: MariaDB Connector/C, compatibility symlinks Package: libmariadbd19 Architecture: any Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Multi-Arch: same Breaks: libmariadbd-dev (<< ${source:Version}) Replaces: libmariadbd-dev (<< ${source:Version}) @@ -174,9 +187,9 @@ Section: libdevel Provides: libmysqld-dev Pre-Depends: ${misc:Pre-Depends} Depends: libmariadb-dev (= ${binary:Version}), - libmariadbd19 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} + libmariadbd19 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} Breaks: libmysqld-dev Replaces: libmysqld-dev Description: MariaDB embedded database, development files @@ -189,7 +202,8 @@ Description: MariaDB embedded database, development files Package: mysql-common Architecture: all -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -201,7 +215,9 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) Package: mariadb-common Architecture: all -Depends: mysql-common, ${misc:Depends}, ${shlibs:Depends} +Depends: mysql-common, + ${misc:Depends}, + ${shlibs:Depends} Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -323,7 +339,9 @@ Provides: default-mysql-client, mysql-client-5.6, mysql-client-5.7, 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 MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -392,9 +410,14 @@ Description: MariaDB database core server files Package: mariadb-server-10.3 Architecture: any -Suggests: mailx, mariadb-test, netcat-openbsd, tinyca +Suggests: mailx, + mariadb-test, + netcat-openbsd, + tinyca Recommends: libhtml-template-perl -Pre-Depends: adduser (>= 3.40), debconf, mariadb-common (>= ${source:Version}) +Pre-Depends: adduser (>= 3.40), + debconf, + mariadb-common (>= ${source:Version}) Depends: bsdutils, coreutils, findutils, @@ -455,7 +478,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0), mysql-server-5.6, mysql-server-5.7, virtual-mysql-server -Provides: default-mysql-server, virtual-mysql-server +Provides: default-mysql-server, + virtual-mysql-server 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 @@ -466,7 +490,8 @@ Description: MariaDB database server binaries Package: mariadb-server Architecture: all -Depends: mariadb-server-10.3 (>= ${source:Version}), ${misc:Depends} +Depends: mariadb-server-10.3 (>= ${source:Version}), + ${misc:Depends} Description: MariaDB database server (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of mariadb-server (currently mariadb-server-10.3), as determined by the MariaDB @@ -481,7 +506,8 @@ Description: MariaDB database server (metapackage depending on the latest versio Package: mariadb-client Architecture: all -Depends: mariadb-client-10.3 (>= ${source:Version}), ${misc:Depends} +Depends: mariadb-client-10.3 (>= ${source:Version}), + ${misc:Depends} Description: MariaDB database client (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of mariadb-client (currently mariadb-client-10.3), as determined by the MariaDB @@ -650,7 +676,7 @@ Architecture: any Breaks: mariadb-backup-10.1, mariadb-backup-10.2 Replaces: mariadb-backup-10.1, - mariadb-backup-10.2 + mariadb-backup-10.2 Depends: mariadb-server-10.3, ${misc:Depends}, ${shlibs:Depends} @@ -673,8 +699,8 @@ Breaks: mariadb-aws-key-management-10.1, mariadb-aws-key-management-10.2 Replaces: mariadb-aws-key-management-10.1, mariadb-aws-key-management-10.2 -Depends: mariadb-server-10.3, - libcurl3, +Depends: libcurl3, + mariadb-server-10.3, ${misc:Depends}, ${shlibs:Depends} Description: Amazon Web Service Key Management Service Plugin for MariaDB diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install index f33febf0e50..72798dec379 100644 --- a/debian/libmariadb-dev.install +++ b/debian/libmariadb-dev.install @@ -1,9 +1,9 @@ usr/bin/mariadb_config usr/include/mariadb usr/lib/*/libmariadb.so -usr/lib/*/libmariadbclient.so usr/lib/*/libmariadbclient.a +usr/lib/*/libmariadbclient.so usr/lib/*/libmysqlservices.a usr/share/aclocal/mysql.m4 -usr/share/pkgconfig/mariadb.pc usr/share/man/man1/mysql_config.1 +usr/share/pkgconfig/mariadb.pc diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install index 68d763ae404..8636166a493 100644 --- a/debian/libmariadb3.install +++ b/debian/libmariadb3.install @@ -1,5 +1,5 @@ usr/lib/*/libmariadb.so.* +usr/lib/mysql/plugin/client_ed25519.so usr/lib/mysql/plugin/dialog.so usr/lib/mysql/plugin/mysql_clear_password.so -usr/lib/mysql/plugin/client_ed25519.so usr/lib/mysql/plugin/sha256_password.so diff --git a/debian/mariadb-client-10.3.docs b/debian/mariadb-client-10.3.docs index 8117d689011..c09092629c3 100644 --- a/debian/mariadb-client-10.3.docs +++ b/debian/mariadb-client-10.3.docs @@ -1,2 +1,2 @@ -debian/additions/innotop/changelog.innotop README.md +debian/additions/innotop/changelog.innotop diff --git a/debian/mariadb-client-10.3.install b/debian/mariadb-client-10.3.install index 75ee09db783..945bf77c689 100644 --- a/debian/mariadb-client-10.3.install +++ b/debian/mariadb-client-10.3.install @@ -10,13 +10,13 @@ usr/bin/mysqldumpslow usr/bin/mysqlimport usr/bin/mysqlshow usr/bin/mysqlslap +usr/share/man/man1/mysql_find_rows.1 +usr/share/man/man1/mysql_fix_extensions.1 +usr/share/man/man1/mysql_waitpid.1 usr/share/man/man1/mysqlaccess.1 usr/share/man/man1/mysqladmin.1 usr/share/man/man1/mysqldump.1 usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 usr/share/man/man1/mysqlimport.1 usr/share/man/man1/mysqlshow.1 usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 diff --git a/debian/mariadb-client-10.3.links b/debian/mariadb-client-10.3.links index 0b86e87f2e9..4a504969246 100644 --- a/debian/mariadb-client-10.3.links +++ b/debian/mariadb-client-10.3.links @@ -1,6 +1,6 @@ -usr/bin/mysqlcheck usr/bin/mysqlrepair usr/bin/mysqlcheck usr/bin/mysqlanalyze usr/bin/mysqlcheck usr/bin/mysqloptimize -usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz +usr/bin/mysqlcheck usr/bin/mysqlrepair usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz +usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz diff --git a/debian/mariadb-plugin-aws-key-management.install b/debian/mariadb-plugin-aws-key-management.install index 655735cb8ac..199d4c87950 100644 --- a/debian/mariadb-plugin-aws-key-management.install +++ b/debian/mariadb-plugin-aws-key-management.install @@ -1,3 +1,3 @@ -usr/lib/mysql/plugin/aws_key_management.so debian/additions/enable_encryption.preset etc/mysql/mariadb.conf.d etc/mysql/conf.d/aws_key_management.cnf etc/mysql/mariadb.conf.d +usr/lib/mysql/plugin/aws_key_management.so diff --git a/debian/mariadb-plugin-mroonga.install b/debian/mariadb-plugin-mroonga.install index 5cb81419e5e..fedcf62eef0 100644 --- a/debian/mariadb-plugin-mroonga.install +++ b/debian/mariadb-plugin-mroonga.install @@ -1,5 +1,5 @@ usr/lib/mysql/plugin/ha_mroonga.so +usr/share/mysql/mroonga/AUTHORS +usr/share/mysql/mroonga/COPYING usr/share/mysql/mroonga/install.sql usr/share/mysql/mroonga/uninstall.sql -usr/share/mysql/mroonga/COPYING -usr/share/mysql/mroonga/AUTHORS diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install index ee45a822e0c..224ef5501c5 100644 --- a/debian/mariadb-plugin-rocksdb.install +++ b/debian/mariadb-plugin-rocksdb.install @@ -1,4 +1,4 @@ etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d -usr/lib/mysql/plugin/ha_rocksdb.so usr/bin/mysql_ldb usr/bin/sst_dump +usr/lib/mysql/plugin/ha_rocksdb.so diff --git a/debian/mariadb-server-10.3.install b/debian/mariadb-server-10.3.install index c0af11c5cc0..d8de5512b05 100644 --- a/debian/mariadb-server-10.3.install +++ b/debian/mariadb-server-10.3.install @@ -33,15 +33,15 @@ usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip usr/bin/wsrep_sst_common +usr/bin/wsrep_sst_mariabackup usr/bin/wsrep_sst_mysqldump usr/bin/wsrep_sst_rsync usr/bin/wsrep_sst_xtrabackup usr/bin/wsrep_sst_xtrabackup-v2 -usr/bin/wsrep_sst_mariabackup +usr/lib/mysql/plugin/auth_ed25519.so usr/lib/mysql/plugin/auth_pam.so usr/lib/mysql/plugin/auth_socket.so usr/lib/mysql/plugin/file_key_management.so -usr/lib/mysql/plugin/auth_ed25519.so usr/lib/mysql/plugin/ha_archive.so usr/lib/mysql/plugin/ha_blackhole.so usr/lib/mysql/plugin/ha_federated.so @@ -58,14 +58,6 @@ usr/lib/mysql/plugin/sql_errlog.so usr/lib/mysql/plugin/wsrep_info.so usr/share/apport/package-hooks/source_mariadb-10.3.py usr/share/doc/mariadb-server-10.3/mysqld.sym.gz -usr/share/mysql/errmsg-utf8.txt -usr/share/mysql/fill_help_tables.sql -usr/share/mysql/maria_add_gis_sp_bootstrap.sql -usr/share/mysql/mysql_performance_tables.sql -usr/share/mysql/mysql_system_tables.sql -usr/share/mysql/mysql_system_tables_data.sql -usr/share/mysql/mysql_test_data_timezone.sql -usr/share/mysql/wsrep_notify usr/share/man/man1/aria_chk.1 usr/share/man/man1/aria_dump_log.1 usr/share/man/man1/aria_ftdump.1 @@ -75,27 +67,35 @@ usr/share/man/man1/galera_new_cluster.1 usr/share/man/man1/galera_recovery.1 usr/share/man/man1/mariadb-service-convert.1 usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 +usr/share/man/man1/my_print_defaults.1 usr/share/man/man1/myisam_ftdump.1 +usr/share/man/man1/myisamchk.1 usr/share/man/man1/myisamlog.1 usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 usr/share/man/man1/mysql_plugin.1 usr/share/man/man1/mysql_secure_installation.1 usr/share/man/man1/mysql_setpermission.1 usr/share/man/man1/mysql_tzinfo_to_sql.1 +usr/share/man/man1/mysqlbinlog.1 +usr/share/man/man1/mysqld_multi.1 +usr/share/man/man1/mysqld_safe.1 usr/share/man/man1/mysqld_safe_helper.1 +usr/share/man/man1/mysqlhotcopy.1 usr/share/man/man1/perror.1 usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 usr/share/man/man1/resolve_stack_dump.1 +usr/share/man/man1/resolveip.1 usr/share/man/man1/wsrep_sst_common.1 usr/share/man/man1/wsrep_sst_mysqldump.1 usr/share/man/man1/wsrep_sst_rsync.1 usr/share/man/man1/wsrep_sst_xtrabackup-v2.1 usr/share/man/man1/wsrep_sst_xtrabackup.1 +usr/share/mysql/errmsg-utf8.txt +usr/share/mysql/fill_help_tables.sql +usr/share/mysql/maria_add_gis_sp_bootstrap.sql +usr/share/mysql/mysql_performance_tables.sql +usr/share/mysql/mysql_system_tables.sql +usr/share/mysql/mysql_system_tables_data.sql +usr/share/mysql/mysql_test_data_timezone.sql +usr/share/mysql/wsrep_notify diff --git a/debian/mariadb-server-core-10.3.install b/debian/mariadb-server-core-10.3.install index 6244abd1193..46c116b618d 100644 --- a/debian/mariadb-server-core-10.3.install +++ b/debian/mariadb-server-core-10.3.install @@ -2,6 +2,10 @@ usr/bin/innochecksum usr/bin/mysql_install_db usr/bin/mysql_upgrade usr/sbin/mysqld +usr/share/man/man1/innochecksum.1 +usr/share/man/man1/mysql_install_db.1 +usr/share/man/man1/mysql_upgrade.1 +usr/share/man/man8/mysqld.8 usr/share/mysql/charsets usr/share/mysql/czech usr/share/mysql/danish @@ -27,7 +31,3 @@ usr/share/mysql/slovak usr/share/mysql/spanish usr/share/mysql/swedish usr/share/mysql/ukrainian -usr/share/man/man8/mysqld.8 -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_upgrade.1 diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install index 4a3ef436634..a3532bde594 100644 --- a/debian/mariadb-test.install +++ b/debian/mariadb-test.install @@ -16,9 +16,16 @@ usr/lib/mysql/plugin/mypluglib.so usr/lib/mysql/plugin/qa_auth_client.so usr/lib/mysql/plugin/qa_auth_interface.so usr/lib/mysql/plugin/qa_auth_server.so +usr/share/man/man1/mysql-stress-test.pl.1 +usr/share/man/man1/mysql-test-run.pl.1 +usr/share/man/man1/mysql_client_test.1 +usr/share/man/man1/mysql_client_test_embedded.1 +usr/share/man/man1/mysqltest.1 +usr/share/man/man1/mysqltest_embedded.1 usr/share/mysql/mysql-test/README usr/share/mysql/mysql-test/README-gcov usr/share/mysql/mysql-test/README.stress +usr/share/mysql/mysql-test/dgcov.pl usr/share/mysql/mysql-test/disabled.def usr/share/mysql/mysql-test/lib usr/share/mysql/mysql-test/mysql-stress-test.pl @@ -26,10 +33,3 @@ usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/purify.supp usr/share/mysql/mysql-test/suite.pm usr/share/mysql/mysql-test/valgrind.supp -usr/share/mysql/mysql-test/dgcov.pl -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysql-test-run.pl.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links index 082680fe5ed..884b25a81da 100644 --- a/debian/mariadb-test.links +++ b/debian/mariadb-test.links @@ -1,2 +1,2 @@ -usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr +usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run diff --git a/debian/mysql-common.install b/debian/mysql-common.install index 5ff685f42ff..264df611822 100644 --- a/debian/mysql-common.install +++ b/debian/mysql-common.install @@ -1,2 +1,2 @@ debian/additions/my.cnf etc/mysql -usr/share/mysql-common/internal-use-only
\ No newline at end of file +usr/share/mysql-common/internal-use-only |