Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~stewart/percona-server/pkg-5.5-fix into lp:percona-server/5.5

  1. pkg-5.5-fix
  2. Merge into 5.5
Proposed by Stewart Smith
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 618
Proposed branch: lp:~stewart/percona-server/pkg-5.5-fix
Merge into: lp:percona-server/5.5
Diff against target: 55 lines (+13/-9)
3 files modified
build-ps/debian/libperconaserverclient-dev.files (+11/-0)
build-ps/debian/rules (+1/-0)
build-ps/percona-server.spec (+1/-9)
To merge this branch: bzr merge lp:~stewart/percona-server/pkg-5.5-fix
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+201880@code.launchpad.net

Description of the change

A couple of minor packaging fixes spotted post pkg-5.5 merge.

To post a comment you must log in.
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=== added file 'build-ps/debian/libperconaserverclient-dev.files'
2--- build-ps/debian/libperconaserverclient-dev.files 1970-01-01 00:00:00 +0000
3+++ build-ps/debian/libperconaserverclient-dev.files 2014-01-16 05:08:26 +0000
4@@ -0,0 +1,11 @@
5+usr/bin/mysql_config
6+usr/include/mysql/*
7+usr/lib/*/libperconaserverclient.a
8+usr/lib/*/libperconaserverclient.so
9+usr/lib/*/libperconaserverclient_r.a
10+usr/lib/*/libperconaserverclient_r.so
11+usr/lib/*/mysql/plugin/ha_example.*
12+usr/lib/*/mysql/plugin/ha_*_plugin.a
13+usr/lib/*/mysql/plugin/ha_*_plugin.la
14+usr/share/aclocal/mysql.m4
15+usr/share/man/man1/mysql_config.1
16
17=== modified file 'build-ps/debian/rules'
18--- build-ps/debian/rules 2013-12-20 02:58:23 +0000
19+++ build-ps/debian/rules 2014-01-16 05:08:26 +0000
20@@ -102,6 +102,7 @@
21 -DWITH_ARCHIVE_STORAGE_ENGINE=ON \
22 -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
23 -DWITH_FEDERATED_STORAGE_ENGINE=ON \
24+ -DWITH_PAM=ON \
25 -DWITH_EXTRA_CHARSETS=all ..'
26
27 # --sysconfdir=/etc/mysql -- Appends /etc/mysql after ~/ in the my.cnf search patch!
28
29=== modified file 'build-ps/percona-server.spec'
30--- build-ps/percona-server.spec 2013-12-20 02:58:23 +0000
31+++ build-ps/percona-server.spec 2014-01-16 05:08:26 +0000
32@@ -1148,14 +1148,6 @@
33 %{_libdir}/libhsclient.la
34 %{_libdir}/*.so
35
36-<<<<<<< TREE
37-# ----------------------------------------------------------------------------
38-%files -n Percona-Server-shared%{product_suffix}
39-%defattr(-, root, root, 0755)
40-# Shared libraries (omit for architectures that don't support them)
41-%{_libdir}/libperconaserver*.so.*
42-=======
43->>>>>>> MERGE-SOURCE
44 # Maatkit UDF libs
45 %{_libdir}/mysql/plugin/libfnv1a_udf.a
46 %{_libdir}/mysql/plugin/libfnv1a_udf.la
47@@ -1168,7 +1160,7 @@
48 %files -n Percona-Server-shared%{product_suffix}
49 %defattr(-, root, root, 0755)
50 # Shared libraries (omit for architectures that don't support them)
51-%{_libdir}/libmysql*.so.*
52+%{_libdir}/libperconaserver*.so.*
53
54 %post -n Percona-Server-shared%{product_suffix}
55 /sbin/ldconfig

Subscribers

People subscribed via source and target branches