From bc785db5549f8d513c921c65bc8258e2589ddf83 Mon Sep 17 00:00:00 2001 From: periapt Date: Mon, 11 Jun 2012 18:16:35 +0000 Subject: Applied mysql-testsuite and mysql-client-core-5.5 package definitions from Ubuntu git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2146 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1 --- debian/changelog | 2 ++ debian/control | 26 ++++++++++++++++++++++++-- debian/mysql-client-5.5.install | 2 -- debian/mysql-client-5.5.manpages | 2 -- debian/mysql-client-core-5.5.install | 2 ++ debian/mysql-client-core-5.5.manpages | 2 ++ 6 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 debian/mysql-client-core-5.5.install create mode 100644 debian/mysql-client-core-5.5.manpages diff --git a/debian/changelog b/debian/changelog index a14b1be..a632e79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ mysql-5.5 (5.5.25+dfsg-1) UNRELEASED; urgency=low * Restored zlib1g-dev build dependency pending further investigation * Removed the numerical prefix from the patch files * Applied fix-mysqldump-test.patch from Ubuntu + * Applied mysql-testsuite and mysql-client-core-5.5 package definitions + from Ubuntu * Located and installed upstream changelog * Removed doxygen-latex, ghostscript as build dependency as these were needed only for the NDB docs diff --git a/debian/control b/debian/control index 4f01ab1..3b6aa12 100644 --- a/debian/control +++ b/debian/control @@ -77,9 +77,22 @@ Description: MySQL database common files, e.g. /etc/mysql/my.cnf This package includes files needed by all versions of the client library, e.g. /etc/mysql/my.cnf. +Package: mysql-client-core-5.5 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: mysql-client-5.5 (<< ${source:Version}) +Replaces: mysql-client-5.5 (<< ${source:Version}) +Description: MySQL database core client binaries + MySQL is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MySQL are speed, robustness and + ease of use. + . + This package includes the core client files, as used by Akonadi. + Package: mysql-client-5.5 Architecture: any -Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} +Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, mysql-client-core-5.5 Provides: virtual-mysql-client, mysql-client Breaks: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1 Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1 @@ -152,10 +165,19 @@ Description: MySQL database client (metapackage depending on the latest version) you want, as this is the one considered to be in the best shape by the Maintainers. +Package: mysql-testsuite +Architecture: all +Depends: mysql-testsuite-5.5, ${misc:Depends} +Description: MySQL testsuite + This is an empty package that depends on the current "best" version of + mysql-testsuite (currently mysql-testsuite-5.5), as determined by the + MySQL maintainers. Install this package if in doubt about which MySQL + version you want, as this is the one considered to be in the best shape. + Package: mysql-testsuite-5.5 Architecture: any Depends: mysql-server (= ${source:Version}), mysql-client (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: MySQL testsuite +Description: MySQL 5.5 testsuite MySQL is a fast, stable, and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MySQL are speed, robustness and diff --git a/debian/mysql-client-5.5.install b/debian/mysql-client-5.5.install index e815c2d..5a4c2fb 100644 --- a/debian/mysql-client-5.5.install +++ b/debian/mysql-client-5.5.install @@ -1,5 +1,3 @@ -usr/bin/mysql -usr/bin/mysqlcheck usr/bin/innochecksum debian/additions/innotop/innotop usr/bin/ usr/bin/myisam_ftdump diff --git a/debian/mysql-client-5.5.manpages b/debian/mysql-client-5.5.manpages index 25564eb..132f602 100644 --- a/debian/mysql-client-5.5.manpages +++ b/debian/mysql-client-5.5.manpages @@ -1,5 +1,3 @@ -debian/tmp/usr/share/man/man1/mysql.1 -debian/tmp/usr/share/man/man1/mysqlcheck.1 debian/additions/innotop/innotop.1 debian/tmp/usr/share/man/man1/myisam_ftdump.1 debian/tmp/usr/share/man/man1/mysqlaccess.1 diff --git a/debian/mysql-client-core-5.5.install b/debian/mysql-client-core-5.5.install new file mode 100644 index 0000000..6308d76 --- /dev/null +++ b/debian/mysql-client-core-5.5.install @@ -0,0 +1,2 @@ +usr/bin/mysql +usr/bin/mysqlcheck diff --git a/debian/mysql-client-core-5.5.manpages b/debian/mysql-client-core-5.5.manpages new file mode 100644 index 0000000..2be91d8 --- /dev/null +++ b/debian/mysql-client-core-5.5.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/mysql.1 +debian/tmp/usr/share/man/man1/mysqlcheck.1 -- cgit v1.2.3