Merge lp:~ignacio-nin/percona-server/5.6-bug1003776 into lp:percona-server/5.6

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 331
Merged at revision: 339
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1003776
Merge into: lp:percona-server/5.6
Prerequisite: lp:~ignacio-nin/percona-server/5.6-bug1165098
Diff against target: 12 lines (+1/-1) (has conflicts)
1 file modified
build/debian/control (+1/-1)
Path conflict: <deleted> / build/debian/docs
Conflict: can't delete build.moved because it is not empty.  Not deleting.
Conflict adding file build.  Moved existing file to build.moved.
Conflict because build.moved is not versioned, but has versioned children.  Versioned directory.
Path conflict: build.moved/build-binary.sh / build/build-binary.sh
Path conflict: build.moved/build-dpkg.sh / build/build-dpkg.sh
Path conflict: build.moved/build-rpm.sh / build/build-rpm.sh
Conflict: can't delete build.moved/debian because it is not empty.  Not deleting.
Conflict because build.moved/debian is not versioned, but has versioned children.  Versioned directory.
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1003776
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+158152@code.launchpad.net

Description of the change

Fix for bug #1003776, on top of file-ids fix

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

The patch is OK, the path conflicts are suspicious but should be resolved in the prerequisite branch. Will need checking at the merge time.

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 2013-04-10 15:28:01 +0000
3+++ build/debian/control 2013-04-10 15:28:01 +0000
4@@ -92,7 +92,7 @@
5 Package: percona-server-server-5.6
6 Architecture: any
7 Suggests: tinyca
8-Depends: percona-server-client-5.6 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), percona-server-common-5.6 (>= ${source:Version}), adduser (>= 3.40), debconf
9+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), percona-server-common-5.6 (>= ${source:Version}), adduser (>= 3.40), debconf
10 Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5
11 Provides: mysql-server
12 Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5

Subscribers

People subscribed via source and target branches