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

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 565
Merged at revision: 584
Proposed branch: lp:~ignacio-nin/percona-server/5.5-libmysqlclient.so
Merge into: lp:percona-server/5.5
Diff against target: 107 lines (+21/-17)
6 files modified
build/debian/changelog (+8/-2)
build/debian/control (+1/-8)
build/debian/info (+0/-1)
build/debian/libmysqlclient18.install (+1/-1)
build/debian/libmysqlclient18.links (+1/-0)
build/percona-server.spec (+10/-5)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-libmysqlclient.so
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+190256@code.launchpad.net

Description of the change

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

To post a comment you must log in.
565. By Ignacio Nin

Merge from trunk in order to solve conflicts

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/debian/changelog'
2--- build/debian/changelog 2013-09-25 16:37:09 +0000
3+++ build/debian/changelog 2013-10-09 22:18:32 +0000
4@@ -1,10 +1,16 @@
5-percona-server-5.5 (5.5.33-rel31.2) unstable; urgency=low
6+percona-server-5.5 (5.5.33-rel31.1) unstable; urgency=low
7
8+ * Remove the info entry for mysql.info, which was pointless.
9+ * Do not package the libmysqlclient18.so links in the library package.
10+ * Add a manual link from the libmysqlclient_r fully versioned library
11+ to the libmysqlclient fully versioned library. The one cmake(1)
12+ installs goes to the non-fully versioned one ant it seems impossible
13+ to change at the CMakeLists.txt level in an easy way.
14 * Added --error-handler=: to dh_installinit in order to
15 avoid an error when the server wouldn't start for any
16 reasons other than bad installation.
17
18- -- Ignacio Nin <ignacio.nin@percona.com> Wed, 24 Jul 2013 11:20:00 -0300
19+ -- Ignacio Nin <ignacio.nin@percona.com> Tue, 1 Oct 2013 17:00:00 -0300
20
21 percona-server-5.5 (5.5.13-rel20.4) unstable; urgency=low
22
23
24=== modified file 'build/debian/control'
25--- build/debian/control 2013-07-09 20:12:26 +0000
26+++ build/debian/control 2013-10-09 22:18:32 +0000
27@@ -24,17 +24,10 @@
28 Package: libmysqlclient18-dev
29 Architecture: any
30 Section: libdevel
31-Depends: libmysqlclient-dev (= ${binary:Version}), ${misc:Depends}
32-Description: Percona Server database development files - empty transitional
33- package. This is an empty package that depends on libmysqlclient-dev to ease
34- the transition for packages with versioned build-deps on libmysqlclient18-dev.
35-
36-Package: libmysqlclient-dev
37-Architecture: any
38-Section: libdevel
39 Depends: libmysqlclient18 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}
40 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
41 Replaces: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev, libpercona-xtradb-client-dev
42+Provides: libmysqlclient-dev
43 Description: Percona Server database development files
44 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
45 database server. SQL (Structured Query Language) is the most popular
46
47=== removed file 'build/debian/info'
48--- build/debian/info 2012-09-18 04:57:16 +0000
49+++ build/debian/info 1970-01-01 00:00:00 +0000
50@@ -1,1 +0,0 @@
51-Docs/mysql.info
52
53=== renamed file 'build/debian/libmysqlclient-dev.README.Maintainer' => 'build/debian/libmysqlclient18-dev.README.Maintainer'
54=== renamed file 'build/debian/libmysqlclient-dev.examples' => 'build/debian/libmysqlclient18-dev.examples'
55=== renamed file 'build/debian/libmysqlclient-dev.install' => 'build/debian/libmysqlclient18-dev.install'
56=== renamed file 'build/debian/libmysqlclient-dev.links' => 'build/debian/libmysqlclient18-dev.links'
57=== modified file 'build/debian/libmysqlclient18.install'
58--- build/debian/libmysqlclient18.install 2012-09-18 04:57:16 +0000
59+++ build/debian/libmysqlclient18.install 2013-10-09 22:18:32 +0000
60@@ -1,1 +1,1 @@
61-usr/lib/libmysqlclient*.so.*
62+usr/lib/libmysqlclient*.so.18.*
63
64=== added file 'build/debian/libmysqlclient18.links'
65--- build/debian/libmysqlclient18.links 1970-01-01 00:00:00 +0000
66+++ build/debian/libmysqlclient18.links 2013-10-09 22:18:32 +0000
67@@ -0,0 +1,1 @@
68+usr/lib/libmysqlclient.so.18.0.0 usr/lib/libmysqlclient_r.so.18.0.0
69
70=== modified file 'build/percona-server.spec'
71--- build/percona-server.spec 2013-09-30 14:28:41 +0000
72+++ build/percona-server.spec 2013-10-09 22:18:32 +0000
73@@ -541,6 +541,10 @@
74 install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
75 install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
76
77+# Delete the symlinks to the libraries from the libdir. These are created by
78+# ldconfig(8) afterwards.
79+rm -f $RBR%{_libdir}/libmysqlclient*.so.18
80+
81 # Create a symlink "rcmysql", pointing to the init.script. SuSE users
82 # will appreciate that, as all services usually offer this.
83 ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql
84@@ -1171,11 +1175,6 @@
85 %{_libdir}/libhsclient.la
86 %{_libdir}/*.so
87
88-# ----------------------------------------------------------------------------
89-%files -n Percona-Server-shared%{product_suffix}
90-%defattr(-, root, root, 0755)
91-# Shared libraries (omit for architectures that don't support them)
92-%{_libdir}/libmysql*.so.*
93 # Maatkit UDF libs
94 %{_libdir}/mysql/plugin/libfnv1a_udf.a
95 %{_libdir}/mysql/plugin/libfnv1a_udf.la
96@@ -1184,6 +1183,12 @@
97 %{_libdir}/mysql/plugin/libmurmur_udf.a
98 %{_libdir}/mysql/plugin/libmurmur_udf.la
99
100+# ----------------------------------------------------------------------------
101+%files -n Percona-Server-shared%{product_suffix}
102+%defattr(-, root, root, 0755)
103+# Shared libraries (omit for architectures that don't support them)
104+%{_libdir}/libmysql*.so.*
105+
106 %post -n Percona-Server-shared%{product_suffix}
107 /sbin/ldconfig
108

Subscribers

People subscribed via source and target branches