[Pkg-mysql-commits] r2088 - mysql-5.5/branches/experimental/debian

[Nicholas Bamber]

Author: periapt
Date: 2012-05-07 18:33:17 +0000 (Mon, 07 May 2012)
New Revision: 2088

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/control
Log:
* Added additional Breaks/Replaces clauses for other clashes:
  - mysql-server-5.5 overwrites perror from mysql-client-5.1
  - mysql-server-core-5.5 overwrites my_print_defaults from mysql-client-5.1

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-05-07 08:00:32 UTC (rev 2087)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-05-07 18:33:17 UTC (rev 2088)
@@ -15,6 +15,9 @@
   * Moved '-e' from shebang line to explicit 'set -e' as requested by lintian
   * Restored ha_example.so to mysql-server-5.5 but added Breaks/Replaces
     clauses (cf. LP: #912487) and (Closes: #666721)
+  * Added additional Breaks/Replaces clauses for other clashes:
+    - mysql-server-5.5 overwrites perror from mysql-client-5.1
+    - mysql-server-core-5.5 overwrites my_print_defaults from mysql-client-5.1
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Fri, 04 May 2012 07:26:25 +0100
 

Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control	2012-05-07 08:00:32 UTC (rev 2087)
+++ mysql-5.5/branches/experimental/debian/control	2012-05-07 18:33:17 UTC (rev 2088)
@@ -96,9 +96,9 @@
 Package: mysql-server-core-5.5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: mysql-server-5.1, mysql-server-5.0, mysql-server-core-5.1
+Breaks: mysql-server-5.1, mysql-server-5.0, mysql-server-core-5.1, mysql-client-5.1
 Provides: mysql-server-core
-Replaces: mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-5.0, mysql-server-5.1
+Replaces: mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-5.0, mysql-server-5.1, mysql-client-5.1
 Description: MySQL database server 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
@@ -114,9 +114,9 @@
 Recommends: mailx, libhtml-template-perl
 Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
 Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version})
-Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~)
+Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~), mysql-client-5.1
 Provides: virtual-mysql-server
-Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1,  mysql-server-5.0, 
+Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1,  mysql-server-5.0, , mysql-client-5.1,
  libmysqlclient-dev ( << 5.5.17~)
 Description: MySQL database server binaries and system database setup 
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database