Merge lp:~ignacio-nin/percona-server/5.5-libmysqlclient.so into lp:percona-server/5.5

[Ignacio Nin]

Changes to the packaging of the libmysqlclient.so library required for the 5.6 release into the repositories.

[lp:~ignacio-nin/percona-server/5.5-libmysqlclient.so]

565. By Ignacio Nin on 2013-10-09

Merge from trunk in order to solve conflicts

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/debian/changelog'
--- build/debian/changelog	2013-09-25 16:37:09 +0000
+++ build/debian/changelog	2013-10-09 22:18:32 +0000
@@ -1,10 +1,16 @@
-percona-server-5.5 (5.5.33-rel31.2) unstable; urgency=low
+percona-server-5.5 (5.5.33-rel31.1) unstable; urgency=low
 
+  * Remove the info entry for mysql.info, which was pointless.
+  * Do not package the libmysqlclient18.so links in the library package.
+  * Add a manual link from the libmysqlclient_r fully versioned library
+    to the libmysqlclient fully versioned library. The one cmake(1)
+    installs goes to the non-fully versioned one ant it seems impossible
+    to change at the CMakeLists.txt level in an easy way.
   * Added --error-handler=: to dh_installinit in order to
     avoid an error when the server wouldn't start for any
     reasons other than bad installation.
 
- -- Ignacio Nin <[e-mail]>  Wed, 24 Jul 2013 11:20:00 -0300
+ -- Ignacio Nin <[e-mail]>  Tue,  1 Oct 2013 17:00:00 -0300
 
 percona-server-5.5 (5.5.13-rel20.4) unstable; urgency=low
 

=== modified file 'build/debian/control'
--- build/debian/control	2013-07-09 20:12:26 +0000
+++ build/debian/control	2013-10-09 22:18:32 +0000
@@ -24,17 +24,10 @@
 Package: libmysqlclient18-dev
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient-dev (= ${binary:Version}), ${misc:Depends}
-Description: Percona Server database development files - empty transitional 
- package. This is an empty package that depends on libmysqlclient-dev to ease 
- the transition for packages with versioned build-deps on libmysqlclient18-dev.
-
-Package: libmysqlclient-dev
-Architecture: any
-Section: libdevel
 Depends: libmysqlclient18 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
 Replaces: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev, libpercona-xtradb-client-dev
+Provides: libmysqlclient-dev
 Description: Percona Server database development files
  Percona Server is a fast, stable and true multi-user, multi-threaded SQL 
  database server. SQL (Structured Query Language) is the most popular 

=== removed file 'build/debian/info'
--- build/debian/info	2012-09-18 04:57:16 +0000
+++ build/debian/info	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Docs/mysql.info

=== renamed file 'build/debian/libmysqlclient-dev.README.Maintainer' => 'build/debian/libmysqlclient18-dev.README.Maintainer'
=== renamed file 'build/debian/libmysqlclient-dev.examples' => 'build/debian/libmysqlclient18-dev.examples'
=== renamed file 'build/debian/libmysqlclient-dev.install' => 'build/debian/libmysqlclient18-dev.install'
=== renamed file 'build/debian/libmysqlclient-dev.links' => 'build/debian/libmysqlclient18-dev.links'
=== modified file 'build/debian/libmysqlclient18.install'
--- build/debian/libmysqlclient18.install	2012-09-18 04:57:16 +0000
+++ build/debian/libmysqlclient18.install	2013-10-09 22:18:32 +0000
@@ -1,1 +1,1 @@
-usr/lib/libmysqlclient*.so.*
+usr/lib/libmysqlclient*.so.18.*

=== added file 'build/debian/libmysqlclient18.links'
--- build/debian/libmysqlclient18.links	1970-01-01 00:00:00 +0000
+++ build/debian/libmysqlclient18.links	2013-10-09 22:18:32 +0000
@@ -0,0 +1,1 @@
+usr/lib/libmysqlclient.so.18.0.0   usr/lib/libmysqlclient_r.so.18.0.0

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-09-30 14:28:41 +0000
+++ build/percona-server.spec	2013-10-09 22:18:32 +0000
@@ -541,6 +541,10 @@
 install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
 install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
 
+# Delete the symlinks to the libraries from the libdir. These are created by
+# ldconfig(8) afterwards.
+rm -f $RBR%{_libdir}/libmysqlclient*.so.18
+
 # Create a symlink "rcmysql", pointing to the init.script. SuSE users
 # will appreciate that, as all services usually offer this.
 ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql
@@ -1171,11 +1175,6 @@
 %{_libdir}/libhsclient.la
 %{_libdir}/*.so
 
-# ----------------------------------------------------------------------------
-%files -n Percona-Server-shared%{product_suffix}
-%defattr(-, root, root, 0755)
-# Shared libraries (omit for architectures that don't support them)
-%{_libdir}/libmysql*.so.*
 # Maatkit UDF libs
 %{_libdir}/mysql/plugin/libfnv1a_udf.a
 %{_libdir}/mysql/plugin/libfnv1a_udf.la
@@ -1184,6 +1183,12 @@
 %{_libdir}/mysql/plugin/libmurmur_udf.a
 %{_libdir}/mysql/plugin/libmurmur_udf.la
 
+# ----------------------------------------------------------------------------
+%files -n Percona-Server-shared%{product_suffix}
+%defattr(-, root, root, 0755)
+# Shared libraries (omit for architectures that don't support them)
+%{_libdir}/libmysql*.so.*
+
 %post -n Percona-Server-shared%{product_suffix}
 /sbin/ldconfig