Deb: wrap-and-sort

Author: ottok

debian/control

@@ -11,21 +11,21 @@ Build-Depends: bison,
                dpatch,
                libaio-dev,
                libboost-dev,
+               libjemalloc-dev (>= 3.0.0~) [linux-any],
                libjudy-dev,
                libkrb5-dev,
                libncurses5-dev (>= 5.0-6~),
                libpam0g-dev,
                libreadline-gplv2-dev,
-               libxml2-dev,
                libssl-dev,
+               libxml2-dev,
                lsb-release,
                perl (>= 5.6.0),
                po-debconf,
                psmisc,
                unixodbc-dev,
-               zlib1g-dev (>= 1:1.1.3-5~),
                ${MAYBE_LIBCRACK}
-               libjemalloc-dev (>= 3.0.0~) [linux-any]
+               zlib1g-dev (>= 1:1.1.3-5~)
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
 Vcs-Git: https://github.com/MariaDB/server.git
@@ -142,14 +142,14 @@ Provides: mysql-client-core,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
           virtual-mysql-client-core
-Conflicts: mariadb-client-10.1,
-           mariadb-client-10.0,
+Conflicts: mariadb-client-10.0,
+           mariadb-client-10.1,
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
            mariadb-client-5.5,
-           mariadb-client-core-10.1,
            mariadb-client-core-10.0,
+           mariadb-client-core-10.1,
            mariadb-client-core-5.1,
            mariadb-client-core-5.2,
            mariadb-client-core-5.3,
@@ -162,14 +162,14 @@ Conflicts: mariadb-client-10.1,
            mysql-client-core-5.5,
            mysql-client-core-5.6,
            virtual-mysql-client-core
-Replaces: mariadb-client-10.1,
-          mariadb-client-10.0,
+Replaces: mariadb-client-10.0,
+          mariadb-client-10.1,
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
           mariadb-client-5.5,
-          mariadb-client-core-10.1,
           mariadb-client-core-10.0,
+          mariadb-client-core-10.1,
           mariadb-client-core-5.1,
           mariadb-client-core-5.2,
           mariadb-client-core-5.3,
@@ -209,8 +209,8 @@ Provides: mysql-client,
           mysql-client-5.6,
           virtual-mysql-client
 Conflicts: mariadb-client (<< ${source:Version}),
-           mariadb-client-10.1,
            mariadb-client-10.0,
+           mariadb-client-10.1,
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -222,8 +222,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client-5.6,
            virtual-mysql-client
 Replaces: mariadb-client (<< ${source:Version}),
-          mariadb-client-10.1,
           mariadb-client-10.0,
+          mariadb-client-10.1,
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -254,8 +254,8 @@ Provides: mysql-server-core,
           mysql-server-core-5.5,
           mysql-server-core-5.6,
           virtual-mysql-server-core
-Conflicts: mariadb-server-core-10.1,
-           mariadb-server-core-10.0,
+Conflicts: mariadb-server-core-10.0,
+           mariadb-server-core-10.1,
            mariadb-server-core-5.1,
            mariadb-server-core-5.2,
            mariadb-server-core-5.3,
@@ -266,8 +266,8 @@ Conflicts: mariadb-server-core-10.1,
            mysql-server-core-5.5,
            mysql-server-core-5.6,
            virtual-mysql-server-core
-Replaces: mariadb-server-core-10.1,
-          mariadb-server-core-10.0,
+Replaces: mariadb-server-core-10.0,
+          mariadb-server-core-10.1,
           mariadb-server-core-5.1,
           mariadb-server-core-5.2,
           mariadb-server-core-5.3,
@@ -296,15 +296,15 @@ Suggests: patch
 Conflicts: mariadb-galera-server-5.5 (<< 5.5.33),
            mariadb-server-5.5 (<< 5.5.33),
            mariadb-test (<< ${source:Version}),
-           mariadb-test-10.1,
            mariadb-test-10.0,
+           mariadb-test-10.1,
            mariadb-test-5.1,
            mariadb-test-5.2,
            mariadb-test-5.3,
            virtual-mysql-testsuite
 Replaces: mariadb-test (<< ${source:Version}),
-          mariadb-test-10.1,
           mariadb-test-10.0,
+          mariadb-test-10.1,
           mariadb-test-5.1,
           mariadb-test-5.2,
           mariadb-test-5.3,
@@ -340,8 +340,8 @@ Depends: galera-3 (>=25.3),
          ${shlibs:Depends}
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}),
-           mariadb-server-10.1,
            mariadb-server-10.0,
+           mariadb-server-10.1,
            mariadb-server-5.1,
            mariadb-server-5.2,
            mariadb-server-5.3,
@@ -358,8 +358,8 @@ Conflicts: mariadb-server (<< ${source:Version}),
 Replaces: libmariadbclient-dev (<< 5.5.0),
           libmariadbclient16 (<< 5.3.4),
           mariadb-server (<< ${source:Version}),
-          mariadb-server-10.1,
           mariadb-server-10.0,
+          mariadb-server-10.1,
           mariadb-server-5.1,
           mariadb-server-5.2,
           mariadb-server-5.3,
@@ -436,21 +436,30 @@ Description: OQGraph storage engine for MariaDB
 
 Package: mariadb-cracklib-password-check-10.2
 Architecture: any
-Depends: libcrack2 (>= 2.9.0), mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: libcrack2 (>= 2.9.0),
+         mariadb-server-10.2,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB
  This password validation plugin uses cracklib to allow only
  sufficiently secure (as defined by cracklib) user passwords in MariaDB.
 
 Package: mariadb-gssapi-server-10.2
 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}
 Conflicts: mariadb-gssapi-server-10.1
 Replaces: mariadb-gssapi-server-10.1
 Description: GSSAPI authentication plugin for MariaDB server
 
 Package: mariadb-gssapi-client-10.2
 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}
 Conflicts: mariadb-gssapi-client-10.1
 Replaces: mariadb-gssapi-client-10.1
 Description: GSSAPI authentication plugin for MariaDB client

debian/copyright

@@ -9,7 +9,7 @@ The MariaDB packages were initally made by http://ourdelta.org/, and
 are now managed by the MariaDB development team,
 maria-developers@lists.launchpad.net
 
-MariaDB can be downloaded from https://downloads.mariadb.org/ 
+MariaDB can be downloaded from https://downloads.mariadb.org/
 
 Copyright: