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

[Nicholas Bamber]

tags 666721 pending
thanks

Author: periapt
Date: 2012-05-07 08:00:32 +0000 (Mon, 07 May 2012)
New Revision: 2087

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/control
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.files
Log:
Restored ha_example.so to mysql-server-5.5 but added Breaks/Replaces
clauses (cf. LP: #912487) and (Closes: #666721)

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-05-06 09:40:12 UTC (rev 2086)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-05-07 08:00:32 UTC (rev 2087)
@@ -13,6 +13,8 @@
   * Changed /var/run to /run as required by Debian Policy 3.9.3 (9.1.1)
   * Raised standards version to 3.9.3
   * 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)
 
  -- 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-06 09:40:12 UTC (rev 2086)
+++ mysql-5.5/branches/experimental/debian/control	2012-05-07 08:00:32 UTC (rev 2087)
@@ -114,9 +114,10 @@
 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
+Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~)
 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, 
+ 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
  server. SQL (Structured Query Language) is the most popular database query

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.files
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.files	2012-05-06 09:40:12 UTC (rev 2086)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.files	2012-05-07 08:00:32 UTC (rev 2087)
@@ -1,11 +1,5 @@
 usr/lib/mysql/*so*
-usr/lib/mysql/plugin/adt_null.so
-usr/lib/mysql/plugin/auth*.so
-usr/lib/mysql/plugin/libdaemon_example.so
-usr/lib/mysql/plugin/mypluglib.so
-usr/lib/mysql/plugin/qa*.so
-/usr/lib/mysql/plugin/semisync*.so
-/usr/lib/mysql/plugin/semisync*.so
+usr/lib/mysql/plugin/*.so
 etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
 usr/bin/msql2mysql