Merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1172621 into lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5

Proposed by Ignacio Nin
Status: Merged
Approved by: Raghavendra D Prabhu
Approved revision: no longer in the source branch.
Merged at revision: 388
Proposed branch: lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1172621
Merge into: lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5
Diff against target: 41 lines (+8/-8)
1 file modified
build/debian/control (+8/-8)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1172621
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+166127@code.launchpad.net

Description of the change

Fix for bug #1172621

To post a comment you must log in.

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 2013-04-11 20:42:44 +0000
3+++ build/debian/control 2013-05-28 19:12:29 +0000
4@@ -40,9 +40,9 @@
5 Section: database
6 Architecture: all
7 Depends: ${misc:Depends}
8-Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
9+Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1, percona-server-common-5.5
10 Provides: mysql-common
11-Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
12+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
13 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
14 Percona XtraDB Cluster is based on the Percona Server database
15 server and provides a High Availability solution.
16@@ -71,9 +71,9 @@
17 Package: percona-xtradb-cluster-client-5.5
18 Architecture: any
19 Depends: debianutils (>=1.6), libdbi-perl, percona-xtradb-cluster-common-5.5 (>= ${source:Version}), libmysqlclient18 (>= ${source:Version}), ${shlib:Depends}, ${misc:Depends}
20-Provides: mysql-client, virtual-mysql-client
21-Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-xtradb-cluster-client-5.1
22-Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-xtradb-cluster-client-5.1
23+Provides: mysql-client, mysql-client-core, mysql-client-5.5, mysql-client-core-5.5, virtual-mysql-client
24+Conflicts: mysql-client (<< ${source:Version}), 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, percona-server-client-5.5
25+Replaces: mysql-client (<< ${source:Version}), 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, percona-server-client-5.5
26 Description: Percona Server database client binaries
27 Percona XtraDB Cluster is based on the Percona Server database
28 server and provides a High Availability solution.
29@@ -88,9 +88,9 @@
30 Architecture: any
31 Suggests: tinyca
32 Depends: percona-xtradb-cluster-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), percona-xtradb-cluster-common-5.5 (>= ${source:Version}), percona-xtradb-cluster-galera, adduser (>= 3.40), debconf, percona-xtrabackup (>= 1.9.0), tar, netcat-openbsd, rsync
33-Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-xtradb-cluster-server-5.1
34-Provides: mysql-server
35-Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-xtradb-cluster-server-5.1
36+Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.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, percona-server-server-5.5
37+Provides: mysql-server, mysql-server-core, mysql-server-5.5, mysql-server-core-5.5
38+Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-core-5.1, mysql-server-core-5.5, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5
39 Description: Percona Server database server binaries
40 Percona XtraDB Cluster is based on the Percona Server database
41 server and provides a High Availability solution.

Subscribers

People subscribed via source and target branches

to all changes: