Merge lp:~gl-az/percona-server/bug1281261-5.6 into lp:percona-server/5.6

Proposed by George Ormond Lorch III
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 547
Proposed branch: lp:~gl-az/percona-server/bug1281261-5.6
Merge into: lp:percona-server/5.6
Diff against target: 236 lines (+135/-24)
3 files modified
build-ps/debian/changelog (+18/-5)
build-ps/debian/control (+114/-19)
build-ps/debian/rules (+3/-0)
To merge this branch: bzr merge lp:~gl-az/percona-server/bug1281261-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+208405@code.launchpad.net

Description of the change

Fix for bug 1281261 - ubuntu packaging issues for 14.04, reviewed offline by Alexey B.

  * Updated package Uploaders.
  * Fixed control line length issues and control file formatting.
  * Fixed percona-server-common-5.6 to depend on mysql-common and corrected
    Provides and Replaces.
  * Corrected percona-server-client-5.6 to provide only
    virtual-mysql-client.
  * Corrected percona-server-server-5.6 to provide only virtual-mysql-server
    instead of both mysql-server and virtual-mysql-server.
  * Corrected percona-server-client-5.6 and percona-server-server-5.6 to
    follow Breaks/Replaces model.
  * Added mariadb-5.5 and mysql-5.6 to common, client server, and client-dev
    Breaks/Replaces.
  * Modified rules to remove python-for-subunut2junitxml before building
    packages. This is a temporary fix.

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=== modified file 'build-ps/debian/changelog'
2--- build-ps/debian/changelog 2013-11-19 11:53:55 +0000
3+++ build-ps/debian/changelog 2014-02-26 15:34:52 +0000
4@@ -1,8 +1,21 @@
5-percona-server-5.6 (5.6.14-rel62.0) unstable; urgency=low
6-
7- * Merged MySQL 5.6.14
8-
9- -- Alexey Bychko <alexey.bychko@percona.com> Tue, 22 Oct 2013 10:00:00 +0700
10+percona-server-5.6 (5.6.13-rel61.0) unstable; urgency=low
11+
12+ * Updated package Uploaders.
13+ * Fixed control line length issues.
14+ * Fixed percona-server-common-5.6 to depend on mysql-common and corrected
15+ Provides and Replaces.
16+ * Corrected percona-server-client-5.6 to provide only
17+ virtual-mysql-client.
18+ * Corrected percona-server-server-5.6 to provide only virtual-mysql-server
19+ instead of both mysql-server and virtual-mysql-server.
20+ * Corrected percona-server-client-5.6 and percona-server-server-5.6 to
21+ follow Breaks/Replaces model.
22+ * Added mariadb-5.5 and mysql-5.6 to common, client server, and client-dev
23+ Breaks/Replaces.
24+ * Modified rules to remove python-for-subunut2junitxml before building
25+ packages.
26+
27+ -- George Lorch <george.lorch@percona.com> Wed, 19 Feb 2014 15:22:30 -0700
28
29 percona-server-5.6 (5.6.13-rel61.0) unstable; urgency=low
30
31
32=== modified file 'build-ps/debian/control'
33--- build-ps/debian/control 2014-02-05 10:00:04 +0000
34+++ build-ps/debian/control 2014-02-26 15:34:52 +0000
35@@ -2,8 +2,30 @@
36 Section: database
37 Priority: extra
38 Maintainer: Percona Server Development Team <mysql-dev@percona.com>
39-Uploaders: Stewart Smith <stewart.smith@percona.com>, Alexey Bychko <alexey.bychko@percona.com>
40-Build-Depends: libtool (>= 1.4.2-7), procps, debhelper (>= 7.0.50~), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, ghostscript, gawk, bison, lsb-release, cmake, gcc (>= 4.4), g++ (>= 4.4), libaio-dev[linux-any], libpam-dev, libssl-dev
41+Uploaders: George Lorch <george.lorch@percona.com>,
42+ Alexey Bychko <alexey.bychko@percona.com>
43+Build-Depends: libtool (>= 1.4.2-7),
44+ procps,
45+ debhelper (>= 7.0.50~),
46+ file (>= 3.28),
47+ libncurses5-dev (>= 5.0-6),
48+ perl (>= 5.6.0),
49+ libwrap0-dev (>= 7.6-8.3),
50+ zlib1g-dev (>= 1:1.1.3-5),
51+ libreadline-dev,
52+ psmisc,
53+ po-debconf,
54+ chrpath,
55+ ghostscript,
56+ gawk,
57+ bison,
58+ lsb-release,
59+ cmake,
60+ gcc (>= 4.4),
61+ g++ (>= 4.4),
62+ libaio-dev[linux-any],
63+ libpam-dev,
64+ libssl-dev
65 Standards-Version: 3.9.4
66 Homepage: http://www.percona.com/software/percona-server/
67 Vcs-Bzr: lp:percona-server/5.6
68@@ -12,7 +34,7 @@
69 Section: libs
70 Architecture: any
71 Pre-Depends: multiarch-support
72-Depends: ${misc:Depends}, ${shlibs:Depends}
73+Depends: percona-server-common-5.6, ${misc:Depends}, ${shlibs:Depends}
74 Replaces: libpercona-server-client16, libperconaserverclient18
75 Description: Percona Server database client library
76 Percona Server is a fast, stable and true multi-user,
77@@ -34,9 +56,26 @@
78 Package: libperconaserverclient-dev
79 Architecture: any
80 Section: libdevel
81-Depends: libperconaserverclient18.1 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}
82-Conflicts: libperconaserverclient14-dev, libperconaserverclient12-dev, libperconaserverclient10-dev, libperconaserverclient15-dev, libperconaserverclient16-dev, libmysqlclient-dev, libmysqlclient18-dev, libperconaserverclient18-dev
83-Replaces: libperconaserverclient14-dev, libperconaserverclient12-dev, libperconaserverclient10-dev, libperconaserverclient15-dev, libperconaserverclient16-dev, libpercona-xtradb-client-dev, libperconaserverclient18-dev
84+Depends: libperconaserverclient18.1 (= ${binary:Version}),
85+ zlib1g-dev,
86+ ${misc:Depends}
87+Breaks: libperconaserverclient18-dev,
88+ libperconaserverclient16-dev,
89+ libperconaserverclient15-dev,
90+ libperconaserverclient14-dev,
91+ libperconaserverclient12-dev,
92+ libperconaserverclient10-dev,
93+ libmysqlclient-dev,
94+ libmysqlclient18-dev,
95+ libmariadbclient-dev
96+Replaces: libperconaserverclient18-dev,
97+ libperconaserverclient16-dev,
98+ libperconaserverclient15-dev,
99+ libperconaserverclient14-dev,
100+ libperconaserverclient12-dev,
101+ libperconaserverclient10-dev,
102+ libpercona-xtradb-client-dev,
103+ libmariadbclient-dev
104 Provides: libmysqlclient-dev
105 Description: Percona Server database development files
106 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
107@@ -49,9 +88,7 @@
108 Package: percona-server-common-5.6
109 Section: database
110 Architecture: any
111-Depends: ${misc:Depends}
112-Provides: mysql-common
113-Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1, percona-server-common-5.5
114+Depends: mysql-common, ${misc:Depends}
115 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
116 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
117 database server. SQL (Structured Query Language) is the most popular database
118@@ -63,10 +100,35 @@
119
120 Package: percona-server-client-5.6
121 Architecture: any
122-Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.6 (>= ${source:Version}), libperconaserverclient18.1 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
123-Provides: mysql-client, virtual-mysql-client
124-Conflicts: mysql-client, mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-server-client-5.1, percona-server-client-5.5
125-Replaces: mysql-client, mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-server-client-5.1, percona-server-client-5.5
126+Depends: debianutils (>=1.6),
127+ libdbi-perl,
128+ percona-server-common-5.6 (>= ${source:Version}),
129+ libperconaserverclient18.1 (>= ${source:Version}),
130+ ${shlibs:Depends},
131+ ${misc:Depends}
132+Provides: virtual-mysql-client
133+Breaks: mysql-client-5.0,
134+ mysql-client-core-5.1,
135+ mysql-client-5.1,
136+ mysql-client-5.5,
137+ mysql-client-5.6,
138+ percona-xtradb-client-5.0,
139+ percona-server-client-5.1,
140+ percona-server-client-5.5,
141+ mariadb-client,
142+ mariadb-client-core-5.5,
143+ mariadb-client-5.5
144+Replaces: mysql-client-5.0,
145+ mysql-client-core-5.1,
146+ mysql-client-5.1,
147+ mysql-client-5.5,
148+ mysql-client-5.6,
149+ percona-xtradb-client-5.0,
150+ percona-server-client-5.1,
151+ percona-server-client-5.5,
152+ mariadb-client,
153+ mariadb-client-core-5.5,
154+ mariadb-client-5.5
155 Description: Percona Server database client binaries
156 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
157 database server. SQL (Structured Query Language) is the most popular database
158@@ -79,11 +141,41 @@
159 Package: percona-server-server-5.6
160 Architecture: any
161 Suggests: tinyca
162-Pre-Depends: percona-server-common-5.6 (>= ${source:Version}), adduser (>= 3.4.0), debconf
163-Depends: percona-server-client-5.6 (>= ${source:Version}), libdbi-perl, libdbd-mysql-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
164-Conflicts: mysql-server, mysql-server-4.1, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5
165-Provides: mysql-server
166-Replaces: mysql-server, mysql-server-5.0, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5
167+Pre-Depends: percona-server-common-5.6 (>= ${source:Version}),
168+ adduser (>= 3.4.0),
169+ debconf
170+Depends: percona-server-client-5.6 (>= ${source:Version}),
171+ libdbi-perl,
172+ libdbd-mysql-perl,
173+ perl (>= 5.6),
174+ ${shlibs:Depends},
175+ ${misc:Depends},
176+ psmisc,
177+ passwd,
178+ lsb-base (>= 3.0-10)
179+Provides: virtual-mysql-server
180+Breaks: mysql-server-5.0,
181+ mysql-server-5.1,
182+ mysql-server-5.5,
183+ mysql-server-5.6,
184+ mysql-server-core-5.1,
185+ percona-xtradb-server-5.0,
186+ percona-server-server-5.1,
187+ percona-server-server-5.5,
188+ mariadb-server,
189+ mariadb-server-core-5.5,
190+ mariadb-server-5.5
191+Replaces: mysql-server-5.0,
192+ mysql-server-5.1,
193+ mysql-server-5.5,
194+ mysql-server-5.6,
195+ mysql-server-core-5.1,
196+ percona-xtradb-server-5.0,
197+ percona-server-server-5.1,
198+ percona-server-server-5.5,
199+ mariadb-server,
200+ mariadb-server-core-5.5,
201+ mariadb-server-5.5
202 Description: Percona Server database server binaries
203 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
204 database server. SQL (Structured Query Language) is the most popular database
205@@ -123,7 +215,10 @@
206
207 Package: percona-server-test-5.6
208 Architecture: any
209-Depends: percona-server-client-5.6 (>= ${source:Version}), percona-server-server-5.6 (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
210+Depends: percona-server-client-5.6 (>= ${source:Version}),
211+ percona-server-server-5.6 (>= ${source:Version}),
212+ ${misc:Depends},
213+ ${shlibs:Depends}
214 Description: Percona Server database test suite
215 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
216 database server. SQL (Structured Query Language) is the most popular database
217
218=== modified file 'build-ps/debian/rules'
219--- build-ps/debian/rules 2014-02-19 12:26:30 +0000
220+++ build-ps/debian/rules 2014-02-26 15:34:52 +0000
221@@ -57,6 +57,8 @@
222 if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi
223 endif
224
225+ [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
226+
227 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
228 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
229 CC=$${MYSQL_BUILD_CC:-gcc} \
230@@ -127,6 +129,7 @@
231
232 [ ! -f Makefile ] || $(MAKE) clean
233 [ ! -d mysql-test/var ] || rm -rf mysql-test/var
234+ [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
235
236 rm -rf $(builddir)
237

Subscribers

People subscribed via source and target branches