Wrap and sort run

debian/control

@@ -11,7 +11,9 @@ Build-Depends: bison,
                debhelper (>= 9),
                hardening-wrapper,
                libaio-dev [linux-any],
+               libboost-dev,
                libjemalloc-dev [linux-any],
+               libjudy-dev,
                libncurses5-dev (>= 5.0-6),
                libpam0g-dev,
                libreadline-gplv2-dev,
@@ -21,9 +23,7 @@ Build-Depends: bison,
                perl,
                po-debconf,
                psmisc,
-               zlib1g-dev (>= 1:1.1.3-5),
-               libboost-dev,
-               libjudy-dev
+               zlib1g-dev (>= 1:1.1.3-5)
 Standards-Version: 3.9.5
 Homepage: http://mariadb.org/
 Vcs-Git: git://git.debian.org/git/pkg-mysql/mariadb-10.0.git
@@ -139,7 +139,7 @@ Description: MariaDB database client binaries
 Package: mariadb-server-core-10.0
 Architecture: any
 Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: mysql-server-5.5, mysql-server-5.6, mariadb-galera-server-5.5
+Conflicts: mariadb-galera-server-5.5, mysql-server-5.5, mysql-server-5.6
 Breaks: mysql-server-core-5.5, mysql-server-core-5.6
 Replaces: mysql-server-core-5.5, mysql-server-core-5.6
 Description: MariaDB database core server files
@@ -156,8 +156,12 @@ Depends: mariadb-client-10.0 (>= ${source:Version}),
          mariadb-server-10.0 (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: mariadb-test (<< ${source:Version}), mysql-testsuite-5.5, mysql-testsuite-5.6
-Replaces: mariadb-test (<< ${source:Version}), mysql-testsuite-5.5, mysql-testsuite-5.6
+Breaks: mariadb-test (<< ${source:Version}),
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6
+Replaces: mariadb-test (<< ${source:Version}),
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6
 Suggests: patch
 Description: MariaDB database regression test suite
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -181,9 +185,20 @@ Depends: libdbi-perl,
          psmisc,
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0, mysql-server-core-5.5, mysql-server-core-5.6
-Breaks: mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0, mysql-server-5.5, mysql-server-5.6, mariadb-galera-server-5.5
-Replaces: mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0, mysql-server-5.5, mysql-server-5.6, mariadb-galera-server-5.5
+Conflicts: mariadb-tokudb-engine-10.0,
+           mariadb-tokudb-engine-5.5,
+           mysql-server-core-5.5,
+           mysql-server-core-5.6
+Breaks: mariadb-galera-server-5.5,
+        mariadb-tokudb-engine-10.0,
+        mariadb-tokudb-engine-5.5,
+        mysql-server-5.5,
+        mysql-server-5.6
+Replaces: mariadb-galera-server-5.5,
+          mariadb-tokudb-engine-10.0,
+          mariadb-tokudb-engine-5.5,
+          mysql-server-5.5,
+          mysql-server-5.6
 Provides: virtual-mysql-server
 Description: MariaDB database server binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -196,8 +211,8 @@ Description: MariaDB database server binaries
 Package: mariadb-server
 Architecture: all
 Depends: mariadb-server-10.0 (>= ${source:Version}), ${misc:Depends}
-Breaks: mysql-server, mariadb-galera-server
-Replaces: mysql-server, mariadb-galera-server
+Breaks: mariadb-galera-server, mysql-server
+Replaces: mariadb-galera-server, mysql-server
 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.0), as determined by the MariaDB
@@ -234,7 +249,7 @@ Description: MariaDB database regression test suite (metapackage for the latest
 Package: mariadb-connect-engine-10.0
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev
+Depends: libxml2-dev, mariadb-server-10.0, unixODBC-dev
 Description: Connect storage engine for MariaDB
  Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
  connections to ODBC tables and remote MySQL tables, as well as a number of
@@ -243,8 +258,7 @@ Description: Connect storage engine for MariaDB
 Package: mariadb-oqgraph-engine-10.0
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, libjudydebian1
+Depends: libjudydebian1, mariadb-server-10.0
 Description: Oqgraph storage engine for MariaDB
  The OQGRAPH engine is a computation engine plugin for handling hierarchies
  (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
-

debian/mariadb-client-10.0.install

 usr/bin/innochecksum
 usr/bin/innotop
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysql_waitpid
 usr/bin/mysqlaccess
 usr/bin/mysqladmin
 usr/bin/mysqlbug
 usr/bin/mysqldump
 usr/bin/mysqldumpslow
-usr/bin/mysql_find_rows
-usr/bin/mysql_fix_extensions
 usr/bin/mysqlimport
 usr/bin/mysqlreport
 usr/bin/mysqlshow
 usr/bin/mysqlslap
-usr/bin/mysql_waitpid

debian/mariadb-connect-engine-10.0.install

-usr/lib/mysql/plugin/ha_connect.so
 etc/mysql/conf.d/connect.cnf
+usr/lib/mysql/plugin/ha_connect.so

debian/mariadb-server-10.0.install

-usr/lib/mysql/plugin/auth_pam.so
-usr/lib/mysql/plugin/auth_socket.so
-usr/lib/mysql/plugin/ha_sequence.so
-usr/lib/mysql/plugin/ha_sphinx.so
-usr/lib/mysql/plugin/ha_xtradb.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/sql_errlog.so
-etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
+etc/mysql/debian-start
+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
@@ -40,38 +27,51 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
-usr/share/doc/mariadb-server-10.0/INFO_SRC
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/ha_sequence.so
+usr/lib/mysql/plugin/ha_sphinx.so
+usr/lib/mysql/plugin/ha_spider.so
+usr/lib/mysql/plugin/ha_xtradb.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/sql_errlog.so
 usr/share/doc/mariadb-server-10.0/INFO_BIN
+usr/share/doc/mariadb-server-10.0/INFO_SRC
+usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
+usr/share/man/man1/innochecksum.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_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/mysql_upgrade.1
 usr/share/man/man1/mysql_zap.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/innochecksum.1
-usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man1/resolveip.1
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt
 usr/share/mysql/fill_help_tables.sql
-usr/share/mysql/mysql_system_tables_data.sql
-usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql/install_spider.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/lib/mysql/plugin/ha_spider.so
-usr/share/mysql/install_spider.sql

debian/mariadb-test-10.0.install

-usr/lib/mysql/plugin/dialog_examples.so
-usr/lib/mysql/plugin/auth_test_plugin.so
-usr/lib/mysql/plugin/qa_auth_interface.so
-usr/lib/mysql/plugin/qa_auth_server.so
-usr/lib/mysql/plugin/qa_auth_client.so
-usr/lib/mysql/plugin/auth_0x0100.so
-usr/lib/mysql/plugin/mypluglib.so
-usr/lib/mysql/plugin/ha_test_sql_discovery.so
-usr/lib/mysql/plugin/daemon_example.ini
-usr/lib/mysql/plugin/libdaemon_example.so
-usr/lib/mysql/plugin/adt_null.so
 usr/bin/mysql_client_test
 usr/bin/mysql_client_test_embedded
+usr/bin/mysqltest
 usr/bin/mysqltest_embedded
+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/ha_test_sql_discovery.so
+usr/lib/mysql/plugin/libdaemon_example.so
+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_client_test.1
 usr/share/man/man1/mysql_client_test_embedded.1
-usr/bin/mysqltest
 usr/share/man/man1/mysqltest.1
 usr/share/man/man1/mysqltest_embedded.1
 usr/share/mysql/mysql-test