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

[Norbert Tretkowski]

tags 609592 pending
thanks

Author: nobse
Date: 2011-06-23 06:57:41 +0000 (Thu, 23 Jun 2011)
New Revision: 1991

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/control
Log:
Fix conflicts/replaces of mysql-client-5.5 package.

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2011-06-22 17:31:58 UTC (rev 1990)
+++ mysql-5.5/branches/experimental/debian/changelog	2011-06-23 06:57:41 UTC (rev 1991)
@@ -2,7 +2,7 @@
 
   [Clint Byrum]
   * New upstream major release. Changing source name to mysql-5.5.
-    (LP: #690925)
+    (closes: #609592)
   * Dropping usr/lib/libmysqlclient*.la as they are no longer built
     by the cmake build, and are not necessary for linking properly.
   * Removing obsolete automake and dpatch build deps.

Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control	2011-06-22 17:31:58 UTC (rev 1990)
+++ mysql-5.5/branches/experimental/debian/control	2011-06-23 06:57:41 UTC (rev 1991)
@@ -79,8 +79,8 @@
 Architecture: any
 Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: virtual-mysql-client, mysql-client, mysql-client-4.1
-Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0
-Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-server-5.1 (<= 5.1.49-1)
+Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1
+Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-server-5.1 (<= 5.1.49-1), mysql-client-5.1
 Suggests: libterm-readkey-perl
 Description: MySQL database client binaries
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database