[Pkg-mysql-commits] r2146 - mysql-5.5/branches/unstable/debian

[Nicholas Bamber]

Author: periapt
Date: 2012-06-11 18:16:35 +0000 (Mon, 11 Jun 2012)
New Revision: 2146

Added:
   mysql-5.5/branches/unstable/debian/mysql-client-core-5.5.install
   mysql-5.5/branches/unstable/debian/mysql-client-core-5.5.manpages
Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/control
   mysql-5.5/branches/unstable/debian/mysql-client-5.5.install
   mysql-5.5/branches/unstable/debian/mysql-client-5.5.manpages
Log:
Applied mysql-testsuite and mysql-client-core-5.5 package definitions
from Ubuntu

Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog	2012-06-10 15:54:35 UTC (rev 2145)
+++ mysql-5.5/branches/unstable/debian/changelog	2012-06-11 18:16:35 UTC (rev 2146)
@@ -31,6 +31,8 @@
   * 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

Modified: mysql-5.5/branches/unstable/debian/control
===================================================================
--- mysql-5.5/branches/unstable/debian/control	2012-06-10 15:54:35 UTC (rev 2145)
+++ mysql-5.5/branches/unstable/debian/control	2012-06-11 18:16:35 UTC (rev 2146)
@@ -77,9 +77,22 @@
  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 @@
  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

Modified: mysql-5.5/branches/unstable/debian/mysql-client-5.5.install
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-client-5.5.install	2012-06-10 15:54:35 UTC (rev 2145)
+++ mysql-5.5/branches/unstable/debian/mysql-client-5.5.install	2012-06-11 18:16:35 UTC (rev 2146)
@@ -1,5 +1,3 @@
-usr/bin/mysql
-usr/bin/mysqlcheck
 usr/bin/innochecksum
 debian/additions/innotop/innotop usr/bin/
 usr/bin/myisam_ftdump

Modified: mysql-5.5/branches/unstable/debian/mysql-client-5.5.manpages
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-client-5.5.manpages	2012-06-10 15:54:35 UTC (rev 2145)
+++ mysql-5.5/branches/unstable/debian/mysql-client-5.5.manpages	2012-06-11 18:16:35 UTC (rev 2146)
@@ -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

Added: mysql-5.5/branches/unstable/debian/mysql-client-core-5.5.install
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-client-core-5.5.install	                        (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-client-core-5.5.install	2012-06-11 18:16:35 UTC (rev 2146)
@@ -0,0 +1,2 @@
+usr/bin/mysql
+usr/bin/mysqlcheck

Added: mysql-5.5/branches/unstable/debian/mysql-client-core-5.5.manpages
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-client-core-5.5.manpages	                        (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-client-core-5.5.manpages	2012-06-11 18:16:35 UTC (rev 2146)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/mysql.1
+debian/tmp/usr/share/man/man1/mysqlcheck.1