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

[Clint Byrum]

Author: spamaps-guest
Date: 2011-11-10 01:17:04 +0000 (Thu, 10 Nov 2011)
New Revision: 2022

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files
   mysql-5.5/branches/experimental/debian/libmysqlclient18.files
Log:
d/libmysqlclient18.files, d/libmysqlclient-dev.files: install
symlinks to dev libraries properly and remove libmysqlclient_r
since it is no longer needed. libmysqlclient is now perfectly
thread safe. This will cause FTBFS but can be corrected by simply
removing _r, and avoids uncomfortable problem of trying to properly
mangle libmysqlclient_r symlinks to libmysqlclient.so.

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2011-11-10 01:10:50 UTC (rev 2021)
+++ mysql-5.5/branches/experimental/debian/changelog	2011-11-10 01:17:04 UTC (rev 2022)
@@ -4,8 +4,14 @@
     gcc 4.6 compile problems (see Debian bug number 630471)
   * d/rules, d/libmysqlclient*.files: changes to support
     multiarch.
+  * d/libmysqlclient18.files, d/libmysqlclient-dev.files: install
+    symlinks to dev libraries properly and remove libmysqlclient_r
+    since it is no longer needed. libmysqlclient is now perfectly
+    thread safe. This will cause FTBFS but can be corrected by simply
+    removing _r, and avoids uncomfortable problem of trying to properly
+    mangle libmysqlclient_r symlinks to libmysqlclient.so.
 
- -- Clint Byrum <clint at ubuntu.com>  Wed, 09 Nov 2011 15:02:15 -0800
+ -- Clint Byrum <clint at ubuntu.com>  Wed, 09 Nov 2011 17:13:40 -0800
 
 mysql-5.5 (5.5.17-1) experimental; urgency=low
 

Modified: mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files	2011-11-10 01:10:50 UTC (rev 2021)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient-dev.files	2011-11-10 01:17:04 UTC (rev 2022)
@@ -1,9 +1,7 @@
 usr/bin/mysql_config
 usr/include/mysql/*.h
 usr/lib/*/libmysqlclient.a
-usr/lib/*/libmysqlclient_r.a
 usr/lib/*/libmysqlclient.so
-usr/lib/*/libmysqlclient_r.so
 usr/lib/*/mysql/plugin/ha_example.*
 usr/lib/*/mysql/plugin/ha_*_plugin.a
 usr/lib/*/mysql/plugin/ha_*_plugin.la

Modified: mysql-5.5/branches/experimental/debian/libmysqlclient18.files
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient18.files	2011-11-10 01:10:50 UTC (rev 2021)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient18.files	2011-11-10 01:17:04 UTC (rev 2022)
@@ -1 +1 @@
-usr/lib/*/libmysqlclient*.so.*
+usr/lib/*/libmysqlclient.so.*