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

Merge lp:~percona-dev/percona-server/release-5.5.15-21.0 into lp:percona-server/5.5

  1. release-5.5.15-21.0
  2. Merge into 5.5
Proposed by Ignacio Nin
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 162
Proposed branch: lp:~percona-dev/percona-server/release-5.5.15-21.0
Merge into: lp:percona-server/5.5
Diff against target: 113 lines (+15/-15)
4 files modified
build/debian/control (+5/-5)
build/debian/patches/10_percona-server-prefix.dpatch (+6/-6)
build/debian/percona-server-server-5.5.preinst (+1/-1)
build/debian/rules (+3/-3)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.5.15-21.0
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+76412@code.launchpad.net

Description of the change

Fixed packaging issues that were targeted for 5.5.15, adapt debian patches to this version

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/debian/control'
2--- build/debian/control 2011-04-07 20:35:02 +0000
3+++ build/debian/control 2011-09-21 13:44:36 +0000
4@@ -78,9 +78,9 @@
5 Package: percona-server-client-5.5
6 Architecture: any
7 Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.5 (>= ${source:Version}), libmysqlclient18 (>= ${source:Version}), ${shlib:Depends}, ${misc:Depends}
8-Provides: mysql-client
9-Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, percona-xtradb-client-5.0, percona-server-client-5.1
10-Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, percona-xtradb-client-5.0, percona-server-client-5.1
11+Provides: mysql-client, virtual-mysql-client
12+Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-server-client-5.1
13+Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-server-client-5.1
14 Description: Percona Server database client binaries
15 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
16 database server. SQL (Structured Query Language) is the most popular database
17@@ -94,9 +94,9 @@
18 Architecture: any
19 Suggests: tinyca
20 Depends: percona-server-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), percona-server-common-5.5 (>= ${source:Version}), adduser (>= 3.40), debconf
21-Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.1, percona-xtradb-server-5.0, percona-server-server-5.1
22+Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1
23 Provides: mysql-server
24-Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0, percona-xtradb-server-5.0, percona-server-server-5.1
25+Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1
26 Description: Percona Server database server binaries
27 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
28 database server. SQL (Structured Query Language) is the most popular database
29
30=== modified file 'build/debian/patches/10_percona-server-prefix.dpatch'
31--- build/debian/patches/10_percona-server-prefix.dpatch 2011-04-12 08:23:04 +0000
32+++ build/debian/patches/10_percona-server-prefix.dpatch 2011-09-21 13:44:36 +0000
33@@ -4,9 +4,9 @@
34 ## DP: Fixed prefix to /usr
35
36 @DPATCH@
37-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' Percona-Server-5.5.11-rel20.2~/cmake/install_layout.cmake Percona-Server-5.5.11-rel20.2/cmake/install_layout.cmake
38---- Percona-Server-5.5.11-rel20.2~/cmake/install_layout.cmake 2011-03-31 10:36:18.000000000 -0300
39-+++ Percona-Server-5.5.11-rel20.2/cmake/install_layout.cmake 2011-04-12 03:34:54.001637002 -0300
40+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' Percona-Server~/cmake/install_layout.cmake Percona-Server/cmake/install_layout.cmake
41+--- Percona-Server~/cmake/install_layout.cmake 2011-07-13 15:09:02.000000000 -0400
42++++ Percona-Server/cmake/install_layout.cmake 2011-08-31 12:18:45.000000000 -0400
43 @@ -74,7 +74,7 @@
44 IF(INSTALL_LAYOUT MATCHES "RPM")
45 SET(default_prefix "/usr")
46@@ -16,7 +16,7 @@
47 # This is required to avoid "cpack -GDEB" default of prefix=/usr
48 SET(CPACK_SET_DESTDIR ON)
49 ELSEIF(INSTALL_LAYOUT MATCHES "SVR4")
50-@@ -157,8 +157,8 @@
51+@@ -166,8 +166,8 @@
52 # DEB layout
53 #
54 SET(INSTALL_BINDIR_DEB "bin")
55@@ -27,7 +27,7 @@
56 #
57 SET(INSTALL_LIBDIR_DEB "lib")
58 SET(INSTALL_PLUGINDIR_DEB "lib/plugin")
59-@@ -167,16 +167,16 @@
60+@@ -176,16 +176,16 @@
61 #
62 SET(INSTALL_DOCDIR_DEB "docs")
63 SET(INSTALL_DOCREADMEDIR_DEB ".")
64@@ -48,6 +48,6 @@
65 #
66 -SET(INSTALL_MYSQLDATADIR_DEB "data")
67 +SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql")
68+ SET(INSTALL_PLUGINTESTDIR_DEB ${plugin_tests})
69
70 #
71- # SVR4 layout
72
73=== modified file 'build/debian/percona-server-server-5.5.preinst'
74--- build/debian/percona-server-server-5.5.preinst 2011-03-19 08:50:37 +0000
75+++ build/debian/percona-server-server-5.5.preinst 2011-09-21 13:44:36 +0000
76@@ -48,7 +48,7 @@
77
78 ################################ main() ##########################
79
80-this_version=5.1
81+this_version=5.5
82
83 # Check kernel version
84 if dpkg --compare-versions `uname -r` lt 2.6; then
85
86=== modified file 'build/debian/rules'
87--- build/debian/rules 2011-08-22 17:26:45 +0000
88+++ build/debian/rules 2011-09-21 13:44:36 +0000
89@@ -29,7 +29,7 @@
90 -DFEATURE_SET=$(feature_set) \
91 -DCOMPILATION_COMMENT=$(compilation_comment_release) \
92 -DMYSQL_SERVER_SUFFIX=$(server_suffix)
93- make
94+ make $(MAKE_JFLAG)
95
96 # Build HandlerSocket
97 echo "Configuring HandlerSocket"
98@@ -41,14 +41,14 @@
99 --with-mysql-plugindir=$(prefix)/lib/mysql/plugin \
100 --libdir=$(prefix)/lib \
101 --prefix=$(prefix) && \
102- make
103+ make $(MAKE_JFLAG)
104
105 # Build UDF
106 cd UDF && \
107 CXX=g++ CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/include" \
108 ./configure --includedir=$(CURDIR)/include \
109 --libdir=$(prefix)/lib/mysql/plugin && \
110- make
111+ make $(MAKE_JFLAG)
112
113 dh_auto_test
114

Subscribers

People subscribed via source and target branches