[Pkg-mysql-commits] r2133 - in mysql-5.5/branches/wheezy/debian: . patches

[Nicholas Bamber]

tags 660686 pending
tags 672359 pending
thanks

Author: periapt
Date: 2012-06-03 17:28:15 +0000 (Sun, 03 Jun 2012)
New Revision: 2133

Added:
   mysql-5.5/branches/wheezy/debian/patches/versioned_symbols.patch
Modified:
   mysql-5.5/branches/wheezy/debian/changelog
   mysql-5.5/branches/wheezy/debian/mysql-common.install
   mysql-5.5/branches/wheezy/debian/patches/series
   mysql-5.5/branches/wheezy/debian/rules
Log:
* Added patch to libmysql/CMakeLists.txt to restore symbol versioning
  and bumped dependency in shlibs (Closes: #660686)
* Ensured that /etc/mysql/conf.d is installed as part of mysql-common
  so that client programs work without a co-located server (Closes: #672359)

Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog	2012-06-02 09:10:41 UTC (rev 2132)
+++ mysql-5.5/branches/wheezy/debian/changelog	2012-06-03 17:28:15 UTC (rev 2133)
@@ -4,6 +4,10 @@
   * Updated Portuguese translation (Closes: #674953)
   * Updated Swedish translation (Closes: #675108)
   * Refreshed spelling patch
+  * Added patch to libmysql/CMakeLists.txt to restore symbol versioning
+    and bumped dependency in shlibs (Closes: #660686)
+  * Ensured that /etc/mysql/conf.d is installed as part of mysql-common
+    so that client programs work without a co-located server (Closes: #672359)
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Thu, 31 May 2012 09:00:25 +0100
 

Modified: mysql-5.5/branches/wheezy/debian/mysql-common.install
===================================================================
--- mysql-5.5/branches/wheezy/debian/mysql-common.install	2012-06-02 09:10:41 UTC (rev 2132)
+++ mysql-5.5/branches/wheezy/debian/mysql-common.install	2012-06-03 17:28:15 UTC (rev 2133)
@@ -1 +1,2 @@
 debian/additions/my.cnf etc/mysql/
+debian/tmp/etc/mysql/conf.d/.keepme etc/mysql/conf.d

Modified: mysql-5.5/branches/wheezy/debian/patches/series
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/series	2012-06-02 09:10:41 UTC (rev 2132)
+++ mysql-5.5/branches/wheezy/debian/patches/series	2012-06-03 17:28:15 UTC (rev 2133)
@@ -10,3 +10,4 @@
 94_spelling.patch
 regex_plus.patch
 linked_list_mem_failure.patch
+versioned_symbols.patch

Copied: mysql-5.5/branches/wheezy/debian/patches/versioned_symbols.patch (from rev 2131, mysql-5.5/branches/unstable/debian/patches/versioned_symbols.patch)
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/versioned_symbols.patch	                        (rev 0)
+++ mysql-5.5/branches/wheezy/debian/patches/versioned_symbols.patch	2012-06-03 17:28:15 UTC (rev 2133)
@@ -0,0 +1,25 @@
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Bug: http://bugs.mysql.com/bug.php?id=64386
+Debian-Bug: http://bugs.debian.org/660686
+Subject: versioned symbols got dropped from the build
+Last-Update: 2012-06-01
+--- a/libmysql/CMakeLists.txt
++++ b/libmysql/CMakeLists.txt
+@@ -136,6 +136,8 @@
+ 
+ )
+ 
++CONFIGURE_FILE(libmysql.ver.in ${CMAKE_BINARY_DIR}/libmysql/libmysql.ver)
++
+ SET(CLIENT_SOURCES
+   get_password.c 
+   libmysql.c
+@@ -209,7 +211,7 @@
+         SET(libmysql_link_flags)
+       ENDIF()
+       SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS 
+-        "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
++        "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} -Wl,--version-script=libmysql.ver")
+     ENDIF() 
+     # clean direct output needs to be set several targets have the same name
+     #(mysqlclient in this case)

Modified: mysql-5.5/branches/wheezy/debian/rules
===================================================================
--- mysql-5.5/branches/wheezy/debian/rules	2012-06-02 09:10:41 UTC (rev 2132)
+++ mysql-5.5/branches/wheezy/debian/rules	2012-06-03 17:28:15 UTC (rev 2133)
@@ -154,6 +154,7 @@
 	mkdir -p $(TMP)/usr/share/man/man8/
 	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
 	mkdir -p $(TMP)/etc/mysql/conf.d/
+	touch $(TMP)/etc/mysql/conf.d/.keepme
 	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
 	# make install (trailing slash needed for innobase)
 	cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/