Added patch to libmysql/CMakeLists.txt to restore symbol versioning

and bumped dependency in shlibs (Closes: #660686)

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2131 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

6 files changed, 110 insertions, 101 deletions

diff --git a/debian/changelog b/debian/changelog
index 7b6adb9..8368099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,8 @@ mysql-5.5 (5.5.24+dfsg-1) UNRELEASED; urgency=low
   * Revert having libssl-dev as a build dependency and changed
     WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
     and (Closes: #673865)
+  * Added patch to libmysql/CMakeLists.txt to restore symbol versioning
+    and bumped dependency in shlibs (Closes: #660686)
 
  -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 08 May 2012 09:04:25 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index f5ff3f7..ac2d096 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ hyphens-in-manpages.patch
 regex_plus.patch
 linked_list_mem_failure.patch
 kfreebsd_fails.patch
+versioned_symbols.patch
diff --git a/debian/patches/versioned_symbols.patch b/debian/patches/versioned_symbols.patch
new file mode 100644
index 0000000..720f3d7
--- /dev/null
+++ b/debian/patches/versioned_symbols.patch
@@ -0,0 +1,25 @@
+Author: Nicholas Bamber <nicholas@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)
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 8b8d575..d50c851 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -26,14 +26,12 @@ msgstr "Deseja mesmo fazer downgrade?"
 #. Description
 #: ../mysql-server-5.5.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "Existe, neste sistema, um ficheiro chamado /var/lib/mysql/debian-*.flag."
+msgstr ""
+"Existe, neste sistema, um ficheiro chamado /var/lib/mysql/debian-*.flag."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.5.templates:2001
-#| msgid ""
-#| "Such file is an indication that a mysql-server package with a higher "
-#| "version has been installed earlier."
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -70,9 +68,6 @@ msgstr ""
 #. Type: note
 #. Description
 #: ../mysql-server-5.5.templates:3001
-#| msgid ""
-#| "You should also check the permissions and the owner of the /var/lib/mysql "
-#| "directory:"
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -142,7 +137,6 @@ msgstr ""
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:6001
-#| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 "Se este campo for deixado em branco, a palavra-passe não irá ser alterada."
@@ -150,7 +144,6 @@ msgstr ""
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:7001
-#| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Repita a palavra-passe para o utilizador \"root\" de MySQL:"
 
@@ -177,8 +170,6 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#| msgid ""
-#| "You should check the account's password after tha package installation."
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Você deve verificar a palavra-passe da conta após a instalação do pacote."
@@ -186,15 +177,12 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
 msgstr ""
-"Para mais informações, por favor leia o ficheiro "
-"/usr/share/doc/mysql-server-5.5/README.Debian."
+"Para mais informações, por favor leia o ficheiro /usr/share/doc/mysql-"
+"server-5.5/README.Debian."
 
 #. Type: error
 #. Description
@@ -206,8 +194,9 @@ msgstr "Erro de entrada da palavra-passe"
 #. Description
 #: ../mysql-server-5.5.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr "As duas palavras-passe que introduziu não são as mesmas. Por favor "
-"tente novamente."
+msgstr ""
+"As duas palavras-passe que introduziu não são as mesmas. Por favor tente "
+"novamente."
 
 #. Type: error
 #. Description
@@ -224,8 +213,8 @@ msgid ""
 "all config files below /etc/mysql/."
 msgstr ""
 "MySQL-5.5 já não disponibiliza suporte para NDB Cluster. Por favor migre "
-"para o novo pacote mysql-cluster-server e remova todas as linhas que "
-"comecem por \"ndb\" em todos os ficheiros de configuração em /etc/mysql/."
+"para o novo pacote mysql-cluster-server e remova todas as linhas que comecem "
+"por \"ndb\" em todos os ficheiros de configuração em /etc/mysql/."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 30e046b..134d264 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -19,21 +19,21 @@ msgstr ""
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: Sweden\n"
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:2001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Vill du verkligen genomföra nedgraderingen?"
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:2001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "En fil med namnet /var/lib/mysql/debian-*.flag hittades i systemet."
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:2001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -41,9 +41,9 @@ msgstr ""
 "En sådan fil är en indikation på att paketet mysql-server med ett högre "
 "versionsnummer har installerats tidigare."
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:2001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -51,15 +51,15 @@ msgstr ""
 "Det finns ingen garanti för att den version som du håller på att installera "
 "kommer att kunna använda de aktuella databaserna."
 
-#. Type: note

-#. Description

-#: ../mysql-server-5.5.templates:3001

+#. Type: note
+#. Description
+#: ../mysql-server-5.5.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Viktig information för NIS/YP-användare"
 
-#. Type: note

-#. Description

-#: ../mysql-server-5.5.templates:3001

+#. Type: note
+#. Description
+#: ../mysql-server-5.5.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,9 +67,9 @@ msgstr ""
 "För att kunna använda MySQL under NIS/YP måste ett användarkonto för MySQL "
 "läggas till i systemet."
 
-#. Type: note

-#. Description

-#: ../mysql-server-5.5.templates:3001

+#. Type: note
+#. Description
+#: ../mysql-server-5.5.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -77,24 +77,24 @@ msgstr ""
 "Du bör också kontrollera rättigheterna och ägaren av katalogen /var/lib/"
 "mysql."
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:4001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Ta bort alla MySQL-databaser?"
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:4001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
 msgstr ""
 "Katalogen /var/lib/mysql som innehåller MySQL-databaser kommer att tas bort."
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:4001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:4001
 msgid ""
 "If you're removing the MySQL package in order to later install a more recent "
 "version or if a different mysql-server package is already using it, the data "
@@ -104,15 +104,15 @@ msgstr ""
 "nyare version eller om en annan MySQL-server redan använder filerna ska de "
 "inte raderas."
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:5001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Ska MySQL startas vid systemets uppstart?"
 
-#. Type: boolean

-#. Description

-#: ../mysql-server-5.5.templates:5001

+#. Type: boolean
+#. Description
+#: ../mysql-server-5.5.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -120,15 +120,15 @@ msgstr ""
 "MySQL-servern kan startas vid systemets uppstart eller manuellt med "
 "kommandot \"/etc/init.d/mysql start\"."
 
-#. Type: password

-#. Description

-#: ../mysql-server-5.5.templates:6001

+#. Type: password
+#. Description
+#: ../mysql-server-5.5.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nytt lösenord för MySQLs \"root\"-användare:"
 
-#. Type: password

-#. Description

-#: ../mysql-server-5.5.templates:6001

+#. Type: password
+#. Description
+#: ../mysql-server-5.5.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -136,27 +136,27 @@ msgstr ""
 "Det är inte obligatoriskt men starkt rekommenderat att du sätter ett "
 "lösenord för MySQLs administrativa \"root\"-användare."
 
-#. Type: password

-#. Description

-#: ../mysql-server-5.5.templates:6001

+#. Type: password
+#. Description
+#: ../mysql-server-5.5.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Om detta fält lämnas tom kommer lösenordet inte att ändras."
 
-#. Type: password

-#. Description

-#: ../mysql-server-5.5.templates:7001

+#. Type: password
+#. Description
+#: ../mysql-server-5.5.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Repetera lösenordet för MySQLs \"root\"-användare:"
 
-#. Type: error

-#. Description

-#: ../mysql-server-5.5.templates:8001

+#. Type: error
+#. Description
+#: ../mysql-server-5.5.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Kunde inte sätta lösenord för MySQLs \"root\"-användare"
 
-#. Type: error

-#. Description

-#: ../mysql-server-5.5.templates:8001

+#. Type: error
+#. Description
+#: ../mysql-server-5.5.templates:8001
 msgid ""
 "An error occurred while setting the password for the MySQL administrative "
 "user. This may have happened because the account already has a password, or "
@@ -167,49 +167,42 @@ msgstr ""
 "lösenord satt, eller på grund av problem med att kommunicera med MySQL-"
 "servern."
 
-#. Type: error

-#. Description

-#: ../mysql-server-5.5.templates:8001

+#. Type: error
+#. Description
+#: ../mysql-server-5.5.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet."
 
-#. Type: error

-#. Description

-#: ../mysql-server-5.5.templates:8001

-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
-#| "more information."
+#. Type: error
+#. Description
+#: ../mysql-server-5.5.templates:8001
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
 msgstr ""
 "Läs filen /usr/share/doc/mysql-server-5.5/README.Debian för mer information."
 
-#. Type: error

-#. Description

-#: ../mysql-server-5.5.templates:9001

+#. Type: error
+#. Description
+#: ../mysql-server-5.5.templates:9001
 msgid "Password input error"
 msgstr "Fel vid inmatning av lösenord"
 
-#. Type: error

-#. Description

-#: ../mysql-server-5.5.templates:9001

+#. Type: error
+#. Description
+#: ../mysql-server-5.5.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "De två lösenorden du angav stämde inte överrens. Prova igen."
 
-#. Type: error

-#. Description

-#: ../mysql-server-5.5.templates:10001

+#. Type: error
+#. Description
+#: ../mysql-server-5.5.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB-kluster används inte"
 
-#. Type: error

-#. Description

-#: ../mysql-server-5.5.templates:10001

-#| msgid ""
-#| "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the "
-#| "new mysql-cluster package and remove all lines starting with \"ndb\" from "
-#| "all config files below /etc/mysql/."
+#. Type: error
+#. Description
+#: ../mysql-server-5.5.templates:10001
 msgid ""
 "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
diff --git a/debian/rules b/debian/rules
index 913060b..cd94b47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -236,9 +236,8 @@ override_dh_installinit-arch:
 override_dh_installcron-arch:
 	dh_installcron --name mysql-server
 
-# This looks very dodgy to 'periapt'.
 override_dh_makeshlibs-arch:
-	dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.5.13-1)'
+	dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.5.24+dfsg-1)'
 
 binary:	binary-indep binary-arch