MDEV-6284: wrap-and-sort

debian/control

@@ -32,9 +32,7 @@ Vcs-Browser: https://github.com/MariaDB/server/
 Package: libmariadbclient18
 Architecture: any
 Section: libs
-Depends: mariadb-common,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
            mariadb-galera-server-5.5 (<< 5.5.33),
            mariadb-server-10.0 (<< 10.0.5),
@@ -70,7 +68,10 @@ Architecture: any
 Section: libdevel
 Provides: libmysqld-dev
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmariadbd18 (= ${binary:Version}), libmariadbclient-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libmariadbclient-dev (= ${binary:Version}),
+         libmariadbd18 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: libmysqld-dev
 Replaces: libmysqld-dev
 Description: MariaDB embedded database, development files
@@ -229,9 +230,7 @@ Replaces: mariadb-client (<< ${source:Version}),
           mysql-client-5.5,
           mysql-client-5.6,
           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
@@ -315,8 +314,8 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mariadb-server-5.2,
            mariadb-server-5.3,
            mariadb-server-5.5,
-           mariadb-tokudb-engine-10.1,
            mariadb-tokudb-engine-10.0,
+           mariadb-tokudb-engine-10.1,
            mariadb-tokudb-engine-5.5,
            mysql-server (<< ${source:Version}),
            mysql-server-4.1,
@@ -334,8 +333,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mariadb-server-5.2,
           mariadb-server-5.3,
           mariadb-server-5.5,
-          mariadb-tokudb-engine-10.1,
           mariadb-tokudb-engine-10.0,
+          mariadb-tokudb-engine-10.1,
           mariadb-tokudb-engine-5.5,
           mysql-server (<< ${source:Version}),
           mysql-server-4.1,
@@ -379,26 +378,26 @@ Description: MariaDB database client (metapackage depending on the latest versio
 Package: mariadb-test
 Architecture: any
 Depends: mariadb-client-10.2 (= ${binary:Version}),
-        mariadb-server-10.2 (= ${binary:Version}),
-        mariadb-test-data (= ${source:Version}),
-        ${misc:Depends},
-        ${shlibs:Depends}
-Breaks: mariadb-test-10.1,
-       mariadb-test-10.0,
-       mariadb-test-5.5,
-       mysql-testsuite,
-       mysql-testsuite-5.5,
-       mysql-testsuite-5.6,
-       mysql-testsuite-5.7,
-       virtual-mysql-testsuite
-Replaces: mariadb-test-10.1,
-         mariadb-test-10.0,
-         mariadb-test-5.5,
-         mysql-testsuite,
-         mysql-testsuite-5.5,
-         mysql-testsuite-5.6,
-         mysql-testsuite-5.7,
-         virtual-mysql-testsuite
+         mariadb-server-10.2 (= ${binary:Version}),
+         mariadb-test-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-test-10.0,
+        mariadb-test-10.1,
+        mariadb-test-5.5,
+        mysql-testsuite,
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6,
+        mysql-testsuite-5.7,
+        virtual-mysql-testsuite
+Replaces: mariadb-test-10.0,
+          mariadb-test-10.1,
+          mariadb-test-5.5,
+          mysql-testsuite,
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6,
+          mysql-testsuite-5.7,
+          virtual-mysql-testsuite
 Provides: virtual-mysql-testsuite
 Suggests: patch
 Description: MariaDB database regression test suite
@@ -412,22 +411,22 @@ Description: MariaDB database regression test suite
 Package: mariadb-test-data
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: mariadb-test-10.1,
-       mariadb-test-10.0,
-       mariadb-test-5.5,
-       mariadb-test-data-10.0,
-       mysql-testsuite,
-       mysql-testsuite-5.5,
-       mysql-testsuite-5.6,
-       mysql-testsuite-5.7
-Replaces: mariadb-test-10.1,
-         mariadb-test-10.0,
-         mariadb-test-5.5,
-         mariadb-test-data-10.0,
-         mysql-testsuite,
-         mysql-testsuite-5.5,
-         mysql-testsuite-5.6,
-         mysql-testsuite-5.7
+Breaks: mariadb-test-10.0,
+        mariadb-test-10.1,
+        mariadb-test-5.5,
+        mariadb-test-data-10.0,
+        mysql-testsuite,
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6,
+        mysql-testsuite-5.7
+Replaces: mariadb-test-10.0,
+          mariadb-test-10.1,
+          mariadb-test-5.5,
+          mariadb-test-data-10.0,
+          mysql-testsuite,
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6,
+          mysql-testsuite-5.7
 Description: MariaDB database regression test suite - data 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
@@ -463,11 +462,13 @@ Description: OQGraph storage engine for MariaDB
 
 Package: mariadb-plugin-tokudb
 Architecture: any
-Depends: mariadb-server-10.2,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
-Replaces: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}),
+        mariadb-server-10.1 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}),
+          mariadb-server-10.1 (<< ${source:Version}),
+          mariadb-server-10.2 (<< ${source:Version})
 Description: TokuDB storage engine for MariaDB
  The TokuDB storage engine is for use in high-performance and write-intensive
  environments, offering increased compression and better performance based
@@ -476,11 +477,13 @@ Description: TokuDB storage engine for MariaDB
 
 Package: mariadb-plugin-mroonga
 Architecture: any
-Depends: mariadb-server-10.2,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
-Replaces: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}),
+        mariadb-server-10.1 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}),
+          mariadb-server-10.1 (<< ${source:Version}),
+          mariadb-server-10.2 (<< ${source:Version})
 Description: Mroonga storage engine for MariaDB
  Mroonga (formerly named Groonga Storage Engine) is a storage engine that
  provides fast CJK-ready full text searching using column store.
@@ -488,11 +491,13 @@ Description: Mroonga storage engine for MariaDB
 
 Package: mariadb-plugin-cassandra
 Architecture: any
-Depends: mariadb-server-10.2,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
-Replaces: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}),
+        mariadb-server-10.1 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}),
+          mariadb-server-10.1 (<< ${source:Version}),
+          mariadb-server-10.2 (<< ${source:Version})
 Description: Cassandra storage engine for MariaDB
  The Cassandra Storage Engine allows access to data in a Cassandra cluster from
  MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
@@ -503,11 +508,13 @@ Description: Cassandra storage engine for MariaDB
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.2,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
-Replaces: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}),
+        mariadb-server-10.1 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}),
+          mariadb-server-10.1 (<< ${source:Version}),
+          mariadb-server-10.2 (<< ${source:Version})
 Description: Spider storage engine for MariaDB
  The Spider storage engine with built-in sharding features. It supports
  partitioning and xa transactions, and allows tables of different MariaDB
@@ -516,14 +523,20 @@ Description: Spider storage engine for MariaDB
 
 Package: mariadb-plugin-gssapi-server
 Architecture: any
-Depends: libgssapi-krb5-2, mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: libgssapi-krb5-2,
+         mariadb-server-10.2,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
 Replaces: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
 Description: GSSAPI authentication plugin for MariaDB server
 
 Package: mariadb-plugin-gssapi-client
 Architecture: any
-Depends: libgssapi-krb5-2, mariadb-client-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: libgssapi-krb5-2,
+         mariadb-client-10.2,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
 Replaces: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
 Description: GSSAPI authentication plugin for MariaDB client

debian/libmariadbclient-dev.install

 usr/bin/mysql_config
-usr/include/mysql/*
 usr/include/mariadb
+usr/include/mysql/*
 usr/lib/*/libmariadb.so
 usr/lib/*/libmariadbclient.a
 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

debian/mariadb-server-10.2.install

-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/ha_archive.so
-usr/lib/mysql/plugin/ha_blackhole.so
-usr/lib/mysql/plugin/ha_federated.so
-usr/lib/mysql/plugin/ha_federatedx.so
-usr/lib/mysql/plugin/ha_mroonga.so
-usr/lib/mysql/plugin/ha_sphinx.so
-usr/lib/mysql/plugin/handlersocket.so
-usr/lib/mysql/plugin/locales.so
-usr/lib/mysql/plugin/metadata_lock_info.so
-usr/lib/mysql/plugin/query_cache_info.so
-usr/lib/mysql/plugin/query_response_time.so
-usr/lib/mysql/plugin/semisync_master.so
-usr/lib/mysql/plugin/semisync_slave.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/ha_archive.so
-usr/lib/mysql/plugin/ha_blackhole.so
-usr/lib/mysql/plugin/ha_federated.so
-usr/lib/mysql/plugin/ha_federatedx.so
-usr/lib/mysql/plugin/ha_mroonga.so
-usr/lib/mysql/plugin/ha_sphinx.so
-usr/lib/mysql/plugin/handlersocket.so
-usr/lib/mysql/plugin/locales.so
-usr/lib/mysql/plugin/metadata_lock_info.so
-usr/lib/mysql/plugin/query_cache_info.so
-usr/lib/mysql/plugin/query_response_time.so
-usr/lib/mysql/plugin/semisync_master.so
-usr/lib/mysql/plugin/semisync_slave.so
-usr/lib/mysql/plugin/server_audit.so
-usr/lib/mysql/plugin/simple_password_check.so
-usr/lib/mysql/plugin/sql_errlog.so
-usr/lib/mysql/plugin/wsrep_info.so
-usr/lib/mysql/plugin/user_variables.so
-etc/apparmor.d/usr.sbin.mysqld
-usr/share/apport/package-hooks/source_mariadb-10.2.py
 debian/additions/debian-start etc/mysql
+debian/additions/debian-start.inc.sh usr/share/mysql
+debian/additions/echo_stderr usr/share/mysql
 debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
+etc/apparmor.d/usr.sbin.mysqld
+usr/bin/aria_chk
+usr/bin/aria_dump_log
+usr/bin/aria_ftdump
+usr/bin/aria_pack
+usr/bin/aria_read_log
 usr/bin/msql2mysql
 usr/bin/my_print_defaults
-usr/bin/myisamchk
 usr/bin/myisam_ftdump
+usr/bin/myisamchk
 usr/bin/myisamlog
 usr/bin/myisampack
-usr/bin/aria_pack
-usr/bin/aria_read_log
-usr/bin/aria_ftdump
-usr/bin/aria_chk
-usr/bin/aria_dump_log
 usr/bin/mysql_convert_table_format
 usr/bin/mysql_install_db
 usr/bin/mysql_plugin
@@ -69,35 +33,71 @@ usr/bin/wsrep_sst_mysqldump
 usr/bin/wsrep_sst_rsync
 usr/bin/wsrep_sst_xtrabackup
 usr/bin/wsrep_sst_xtrabackup-v2
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/file_key_management.so
+usr/lib/mysql/plugin/file_key_management.so
+usr/lib/mysql/plugin/ha_archive.so
+usr/lib/mysql/plugin/ha_archive.so
+usr/lib/mysql/plugin/ha_blackhole.so
+usr/lib/mysql/plugin/ha_blackhole.so
+usr/lib/mysql/plugin/ha_federated.so
+usr/lib/mysql/plugin/ha_federated.so
+usr/lib/mysql/plugin/ha_federatedx.so
+usr/lib/mysql/plugin/ha_federatedx.so
+usr/lib/mysql/plugin/ha_mroonga.so
+usr/lib/mysql/plugin/ha_mroonga.so
+usr/lib/mysql/plugin/ha_sphinx.so
+usr/lib/mysql/plugin/ha_sphinx.so
+usr/lib/mysql/plugin/handlersocket.so
+usr/lib/mysql/plugin/handlersocket.so
+usr/lib/mysql/plugin/locales.so
+usr/lib/mysql/plugin/locales.so
+usr/lib/mysql/plugin/metadata_lock_info.so
+usr/lib/mysql/plugin/metadata_lock_info.so
+usr/lib/mysql/plugin/query_cache_info.so
+usr/lib/mysql/plugin/query_cache_info.so
+usr/lib/mysql/plugin/query_response_time.so
+usr/lib/mysql/plugin/query_response_time.so
+usr/lib/mysql/plugin/semisync_master.so
+usr/lib/mysql/plugin/semisync_master.so
+usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/server_audit.so
+usr/lib/mysql/plugin/simple_password_check.so
+usr/lib/mysql/plugin/sql_errlog.so
+usr/lib/mysql/plugin/user_variables.so
+usr/lib/mysql/plugin/wsrep_info.so
+usr/share/apport/package-hooks/source_mariadb-10.2.py
 usr/share/doc/mariadb-server-10.2/mysqld.sym.gz
 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_install_db.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/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/mysql_tzinfo_to_sql.1
-debian/additions/debian-start.inc.sh usr/share/mysql
-debian/additions/echo_stderr usr/share/mysql
+usr/share/man/man1/resolveip.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/mroonga/install.sql
 usr/share/mysql/mroonga/uninstall.sql
-usr/share/mysql/mysql_system_tables_data.sql
-usr/share/mysql/mysql_system_tables.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

debian/mariadb-test-data.install

 usr/share/mysql/mysql-test/collections
 usr/share/mysql/mysql-test/extra
 usr/share/mysql/mysql-test/include
-usr/share/mysql/mysql-test/unstable-tests
 usr/share/mysql/mysql-test/plugin
 usr/share/mysql/mysql-test/r
 usr/share/mysql/mysql-test/std_data
 usr/share/mysql/mysql-test/suite
 usr/share/mysql/mysql-test/t
+usr/share/mysql/mysql-test/unstable-tests

debian/mariadb-test.install

@@ -6,8 +6,8 @@ usr/lib/mysql/plugin/adt_null.so
 usr/lib/mysql/plugin/auth_0x0100.so
 usr/lib/mysql/plugin/auth_test_plugin.so
 usr/lib/mysql/plugin/daemon_example.ini
-usr/lib/mysql/plugin/dialog_examples.so
 usr/lib/mysql/plugin/debug_key_management.so
+usr/lib/mysql/plugin/dialog_examples.so
 usr/lib/mysql/plugin/example_key_management.so
 usr/lib/mysql/plugin/ha_example.so
 usr/lib/mysql/plugin/ha_test_sql_discovery.so

debian/rules

@@ -116,18 +116,18 @@ override_dh_auto_install:
 	dh_testroot
 
 	# If TokuDB plugin was not built skip the package
-	[ -f $(BUILDDIR)/storage/tokudb/ha_tokudb.so ] || sed -i -e "/Package: mariadb-plugin-tokudb/,+12d" debian/control
+	[ -f $(BUILDDIR)/storage/tokudb/ha_tokudb.so ] || sed -i -e "/Package: mariadb-plugin-tokudb/,+14d" debian/control
 
 	# If Mroonga plugin was not built skip the package
-	[ -f $(BUILDDIR)/storage/mroonga/ha_mroonga.so ] || sed -i -e "/Package: mariadb-plugin-mroonga/,+11d" debian/control
+	[ -f $(BUILDDIR)/storage/mroonga/ha_mroonga.so ] || sed -i -e "/Package: mariadb-plugin-mroonga/,+13d" debian/control
 
 	# If libthrift-dev was available (manually installed, as it is
 	# not in Debian) and ha_cassandra.so was thus built, create package,
 	# otherwise skip it.
-	[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+14d" debian/control
+	[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+16d" debian/control
 
 	# If Spider plugin was not built skip the package
-	[ -f $(BUILDDIR)/storage/spider/ha_spider.so ] || sed -i -e "/Package: mariadb-plugin-spider/,+12d" debian/control
+	[ -f $(BUILDDIR)/storage/spider/ha_spider.so ] || sed -i -e "/Package: mariadb-plugin-spider/,+14d" debian/control
 
 	# make install
 	cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP)