[Pkg-mysql-commits] [mariadb-5.5] 01/01: Ran wrap-and-sort
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Mon Feb 10 12:26:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch master
in repository mariadb-5.5.
commit 509ccd3f15771074fa211f987cec89bb353c22fd
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date: Mon Feb 10 14:26:31 2014 +0200
Ran wrap-and-sort
---
debian/control | 78 +++++++++++++++++++++++++++++++--------
debian/libmariadbclient18.install | 2 +-
debian/mariadb-client-5.5.install | 10 ++---
debian/mariadb-test-5.5.install | 22 +++++------
4 files changed, 79 insertions(+), 33 deletions(-)
diff --git a/debian/control b/debian/control
index a050842..fa5cecf 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,27 @@ Source: mariadb-5.5
Section: database
Priority: optional
Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
-Uploaders: Otto Kekäläinen <otto at seravo.fi>, Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>, James Page <jamespage at debian.org>
-Build-Depends: debhelper (>= 9), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-gplv2-dev, po-debconf, psmisc, chrpath, bison, lsb-release, hardening-wrapper, cmake, libssl-dev, libpam0g-dev, libboost1.48-dev | libboost1.49-dev | libboost1.54-dev
+Uploaders: Otto Kekäläinen <otto at seravo.fi>,
+ Clint Byrum <clint at ubuntu.com>,
+ Nicholas Bamber <nicholas at periapt.co.uk>,
+ James Page <jamespage at debian.org>
+Build-Depends: bison,
+ chrpath,
+ cmake,
+ debhelper (>= 9),
+ hardening-wrapper,
+ libaio-dev[linux-any],
+ libboost1.48-dev | libboost1.49-dev | libboost1.54-dev,
+ libncurses5-dev (>= 5.0-6),
+ libpam0g-dev,
+ libreadline-gplv2-dev,
+ libssl-dev,
+ libwrap0-dev (>= 7.6-8.3),
+ lsb-release,
+ perl,
+ po-debconf,
+ psmisc,
+ 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-5.5.git
@@ -12,10 +31,13 @@ Vcs-Browser: http://git.debian.org/?p=pkg-mysql/mariadb-5.5.git
Package: libmariadbclient18
Section: libs
Architecture: any
-Depends: mariadb-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: multiarch-support, ${misc:Pre-Depends}
-Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33),
- mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
+Conflicts: mariadb-galera-server-5.5 (<< 5.5.33),
+ mariadb-server-5.1,
+ mariadb-server-5.2,
+ mariadb-server-5.3,
+ mariadb-server-5.5 (<< 5.5.33)
Multi-Arch: same
Description: MariaDB database client library
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -29,7 +51,9 @@ Package: libmariadbd-dev
Architecture: any
Section: libdevel
Pre-Depends: multiarch-support
-Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libmariadbclient-dev (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: libmysqld-dev
Replaces: libmysqld-dev
Provides: libmysqld-dev
@@ -44,7 +68,10 @@ Description: MariaDB embedded database development files
Package: libmariadbclient-dev
Architecture: any
Section: libdevel
-Depends: libmariadbclient18 (= ${binary:Version}), zlib1g-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libmariadbclient18 (= ${binary:Version}),
+ zlib1g-dev,
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: libmysqlclient-dev
Replaces: libmysqlclient-dev
Provides: libmysqlclient-dev
@@ -71,7 +98,10 @@ Description: MariaDB common metapackage
Package: mariadb-client-core-5.5
Architecture: any
-Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libmariadbclient18 (>= ${source:Version}),
+ mariadb-common,
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: mysql-client-5.5
Breaks: mysql-client-core-5.5
Replaces: mysql-client-core-5.5
@@ -85,7 +115,12 @@ Description: MariaDB database core client binaries
Package: mariadb-client-5.5
Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, mariadb-client-core-5.5 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: debianutils (>=1.6),
+ libdbi-perl,
+ mariadb-client-core-5.5 (>= ${source:Version}),
+ ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends}
Recommends: libdbd-mysql-perl (>= 1.2202)
Conflicts: mysql-client-core-5.5
Breaks: mysql-client-5.5
@@ -102,7 +137,7 @@ Description: MariaDB database client binaries
Package: mariadb-server-core-5.5
Architecture: any
-Depends: mariadb-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
Conflicts: mysql-server-5.5
Breaks: mysql-server-core-5.5
Replaces: mysql-server-core-5.5
@@ -116,7 +151,10 @@ Description: MariaDB database core server files
Package: mariadb-test-5.5
Architecture: any
-Depends: mariadb-server-5.5 (>= ${source:Version}), mariadb-client-5.5 (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-client-5.5 (>= ${source:Version}),
+ mariadb-server-5.5 (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: mariadb-test (<< ${source:Version}), mysql-testsuite-5.5
Replaces: mariadb-test (<< ${source:Version}), mysql-testsuite-5.5
Suggests: patch
@@ -130,13 +168,21 @@ Description: MariaDB database regression test suite
Package: mariadb-server-5.5
Architecture: any
-Suggests: tinyca, mailx, mariadb-test
+Suggests: mailx, mariadb-test, tinyca
Recommends: libhtml-template-perl
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version})
-Conflicts: mysql-server-core-5.5, mariadb-tokudb-engine-5.5
-Breaks: mysql-server-5.5, mariadb-tokudb-engine-5.5
-Replaces: mysql-server-5.5, mariadb-tokudb-engine-5.5
+Depends: libdbi-perl,
+ lsb-base (>= 3.0-10),
+ mariadb-client-5.5 (>= ${source:Version}),
+ mariadb-server-core-5.5 (>= ${binary:Version}),
+ passwd,
+ perl (>= 5.6),
+ psmisc,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts: mariadb-tokudb-engine-5.5, mysql-server-core-5.5
+Breaks: mariadb-tokudb-engine-5.5, mysql-server-5.5
+Replaces: mariadb-tokudb-engine-5.5, mysql-server-5.5
Provides: virtual-mysql-server
Description: MariaDB database server binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
diff --git a/debian/libmariadbclient18.install b/debian/libmariadbclient18.install
index 8c25308..9d4ef99 100644
--- a/debian/libmariadbclient18.install
+++ b/debian/libmariadbclient18.install
@@ -1,3 +1,3 @@
usr/lib/*/libmariadbclient.so.*
-usr/lib/mysql/plugin/mysql_clear_password.so
usr/lib/mysql/plugin/dialog.so
+usr/lib/mysql/plugin/mysql_clear_password.so
diff --git a/debian/mariadb-client-5.5.install b/debian/mariadb-client-5.5.install
index 40fe408..6620b8d 100644
--- a/debian/mariadb-client-5.5.install
+++ b/debian/mariadb-client-5.5.install
@@ -1,14 +1,14 @@
-usr/bin/innochecksum
debian/additions/innotop/innotop usr/bin/
+debian/additions/mysqlreport usr/bin/
+usr/bin/innochecksum
+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
-debian/additions/mysqlreport usr/bin/
usr/bin/mysqlshow
usr/bin/mysqlslap
-usr/bin/mysql_waitpid
diff --git a/debian/mariadb-test-5.5.install b/debian/mariadb-test-5.5.install
index a8088dd..cf08bc4 100644
--- a/debian/mariadb-test-5.5.install
+++ b/debian/mariadb-test-5.5.install
@@ -1,15 +1,15 @@
-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/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_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/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/mysql/mysql-test
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git
More information about the Pkg-mysql-commits
mailing list