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

Proposed by George Ormond Lorch III
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 630
Proposed branch: lp:~gl-az/percona-server/bug1281261-5.5
Merge into: lp:percona-server/5.5
Diff against target: 166 lines (+103/-18)
1 file modified
build-ps/debian/control (+103/-18)
To merge this branch: bzr merge lp:~gl-az/percona-server/bug1281261-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Alexey Bychko Pending
Review via email: mp+208466@code.launchpad.net

Description of the change

Fix for bug 1281261 - ubuntu packaging issues backport from 5.6 except for python-for-subunut2junitxml rules change

  * Updated package Uploaders.
  * Fixed control line length issues and control file formatting.
  * Fixed percona-server-common-5.5 to depend on mysql-common and corrected
    Provides and Replaces.
  * Corrected percona-server-client-5.5 to provide only
    virtual-mysql-client.
  * Corrected percona-server-server-5.5 to provide only virtual-mysql-server
    instead of both mysql-server and virtual-mysql-server.
  * Corrected percona-server-client-5.5 and percona-server-server-5.5 to
    follow Breaks/Replaces model.
  * Added mariadb-5.5 to common, client server, and client-dev
    Breaks/Replaces.

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/control'
2--- build-ps/debian/control 2014-02-07 07:16:41 +0000
3+++ build-ps/debian/control 2014-02-26 20:24:16 +0000
4@@ -2,8 +2,30 @@
5 Section: database
6 Priority: extra
7 Maintainer: Percona Server Development Team <mysql-dev@percona.com>
8-Uploaders: Alexey Bychko <alexey.bychko@percona.com>
9-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
10+Uploaders: George Lorch <george.lorch@percona.com>,
11+ Alexey Bychko <alexey.bychko@percona.com>
12+Build-Depends: libtool (>= 1.4.2-7),
13+ procps,
14+ debhelper (>= 7.0.50~),
15+ file (>= 3.28),
16+ libncurses5-dev (>= 5.0-6),
17+ perl (>= 5.6.0),
18+ libwrap0-dev (>= 7.6-8.3),
19+ zlib1g-dev (>= 1:1.1.3-5),
20+ libreadline-dev,
21+ psmisc,
22+ po-debconf,
23+ chrpath,
24+ ghostscript,
25+ gawk,
26+ bison,
27+ lsb-release,
28+ cmake,
29+ gcc(>= 4.4),
30+ g++ (>= 4.4),
31+ libaio-dev[linux-any],
32+ libpam-dev,
33+ libssl-dev
34 Standards-Version: 3.9.4
35 Homepage: http://www.percona.com/software/percona-server/
36 Vcs-Bzr: lp:percona-server/5.5
37@@ -12,7 +34,7 @@
38 Section: libs
39 Architecture: any
40 Pre-Depends: multiarch-support
41-Depends: ${misc:Depends}, ${shlibs:Depends}
42+Depends: percona-server-common-5.5 ${misc:Depends}, ${shlibs:Depends}
43 Replaces: libpercona-server-client16
44 Description: Percona Server database client library
45 Percona Server is a fast, stable and true multi-user,
46@@ -34,9 +56,27 @@
47 Package: libperconaserverclient-dev
48 Architecture: any
49 Section: libdevel
50-Depends: libperconaserverclient18 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}
51-Conflicts: libperconaserverclient14-dev, libperconaserverclient12-dev, libperconaserverclient10-dev, libperconaserverclient15-dev, libperconaserverclient16-dev, libmysqlclient-dev
52-Replaces: libperconaserverclient14-dev, libperconaserverclient12-dev, libperconaserverclient10-dev, libperconaserverclient15-dev, libperconaserverclient16-dev, libpercona-xtradb-client-dev
53+Depends: libperconaserverclient18 (= ${binary:Version}),
54+ zlib1g-dev,
55+ ${misc:Depends}
56+Breaks: libperconaserverclient16-dev,
57+ libperconaserverclient15-dev,
58+ libperconaserverclient14-dev,
59+ libperconaserverclient12-dev,
60+ libperconaserverclient10-dev,
61+ libpercona-xtradb-client-dev,
62+ libmysqlclient-dev,
63+ libmysqlclient18-dev,
64+ libmariadbclient-dev
65+Replaces: libperconaserverclient16-dev,
66+ libperconaserverclient15-dev,
67+ libperconaserverclient14-dev,
68+ libperconaserverclient12-dev,
69+ libperconaserverclient10-dev,
70+ libpercona-xtradb-client-dev,
71+ libmysqlclient-dev,
72+ libmysqlclient18-dev,
73+ libmariadbclient-dev
74 Provides: libmysqlclient-dev
75 Description: Percona Server database development files
76 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
77@@ -49,9 +89,7 @@
78 Package: percona-server-common-5.5
79 Section: database
80 Architecture: any
81-Depends: ${misc:Depends}
82-Provides: mysql-common
83-Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1
84+Depends: mysql-comon, ${misc:Depends}
85 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
86 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
87 database server. SQL (Structured Query Language) is the most popular database
88@@ -63,10 +101,31 @@
89
90 Package: percona-server-client-5.5
91 Architecture: any
92-Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.5 (>= ${source:Version}), libperconaserverclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
93-Provides: mysql-client, mysql-client-core, mysql-client-5.5, mysql-client-core-5.5, virtual-mysql-client
94-Conflicts: mysql-client, mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, mysql-client-5.5, mysql-client-core-5.5, percona-xtradb-client-5.0, percona-server-client-5.1
95-Replaces: mysql-client, mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, mysql-client-5.5, mysql-client-core-5.5, percona-xtradb-client-5.0, percona-server-client-5.1
96+Depends: debianutils (>=1.6),
97+ libdbi-perl,
98+ percona-server-common-5.5 (>= ${source:Version}),
99+ libperconaserverclient18 (>= ${source:Version}),
100+ ${shlibs:Depends},
101+ ${misc:Depends}
102+Provides: virtual-mysql-client
103+Breaks: mysql-client-5.0,
104+ mysql-client-core-5.1,
105+ mysql-client-5.1,
106+ mysql-client-5.5,
107+ percona-xtradb-client-5.0,
108+ percona-server-client-5.1,
109+ mariadb-client,
110+ mariadb-client-core-5.5,
111+ mariadb-client-5.5
112+Replaces: mysql-client-5.0,
113+ mysql-client-core-5.1,
114+ mysql-client-5.1,
115+ mysql-client-5.5,
116+ percona-xtradb-client-5.0,
117+ percona-server-client-5.1,
118+ mariadb-client,
119+ mariadb-client-core-5.5,
120+ mariadb-client-5.5
121 Description: Percona Server database client binaries
122 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
123 database server. SQL (Structured Query Language) is the most popular database
124@@ -79,11 +138,37 @@
125 Package: percona-server-server-5.5
126 Architecture: any
127 Suggests: tinyca
128-Pre-Depends: percona-server-common-5.5 (>= ${source:Version}), adduser (>= 3.4.0), debconf
129-Depends: percona-server-client-5.5 (>= ${source:Version}), libdbi-perl, libdbd-mysql-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
130-Conflicts: mysql-server, mysql-server-4.1, mysql-server-5.1, mysql-server-5.5, mysql-server-core-5.1, mysql-server-core-5.5, percona-xtradb-server-5.0, percona-server-server-5.1
131-Provides: mysql-server, mysql-server-core, mysql-server-5.5, mysql-server-core-5.5
132-Replaces: mysql-server, mysql-server-5.0, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server-5.5, percona-xtradb-server-5.0, percona-server-server-5.1
133+Pre-Depends: percona-server-common-5.5 (>= ${source:Version}),
134+ adduser (>= 3.4.0),
135+ debconf
136+Depends: percona-server-client-5.5 (>= ${source:Version}),
137+ libdbi-perl,
138+ libdbd-mysql-perl,
139+ perl (>= 5.6),
140+ ${shlibs:Depends},
141+ ${misc:Depends},
142+ psmisc,
143+ passwd,
144+ lsb-base (>= 3.0-10)
145+Provides: virtual-mysql-server
146+Breaks: mysql-server-5.0,
147+ mysql-server-5.1,
148+ mysql-server-5.5,
149+ mysql-server-core-5.1,
150+ percona-xtradb-server-5.0,
151+ percona-server-server-5.1,
152+ mariadb-server,
153+ mariadb-server-core-5.5,
154+ mariadb-server-5.5
155+Replaces: mysql-server-5.0,
156+ mysql-server-5.1,
157+ mysql-server-5.5,
158+ mysql-server-core-5.1,
159+ percona-xtradb-server-5.0,
160+ percona-server-server-5.1,
161+ mariadb-server,
162+ mariadb-server-core-5.5,
163+ mariadb-server-5.5
164 Description: Percona Server database server binaries
165 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
166 database server. SQL (Structured Query Language) is the most popular database

Subscribers

People subscribed via source and target branches