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

Proposed by Ignacio Nin
Status: Rejected
Rejected by: Raghavendra D Prabhu
Proposed branch: lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1191395
Merge into: lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5
Prerequisite: lp:~percona-core/percona-xtradb-cluster/release-5.5.31
Diff against target: 27 lines (+2/-2)
2 files modified
build/debian/control (+1/-1)
build/percona-xtradb-cluster.spec (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1191395
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+172219@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Unmerged revisions

439. By Ignacio Nin on 2013-06-29

Merge fix for bug #1191395.

This is pretty much a null merge for dpkg, but we're moving the
Build-Depends line up in order to help merges.

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-06-29 21:35:45 +0000
3+++ build/debian/control 2013-06-29 21:35:53 +0000
4@@ -3,9 +3,9 @@
5 Priority: extra
6 Maintainer: Percona Server Development Team <mysql-dev@percona.com>
7 Uploaders: Ignacio Nin <ignacio.nin@percona.com>
8+Build-Depends: debhelper (>= 7.0.50), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev, libpam-dev, dpatch, automake, libssl-dev
9 Standards-Version: 7.0.0
10 Homepage: http://www.percona.com/software/percona-xtradb-cluster/
11-Build-Depends: debhelper (>= 7.0.50), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev, libpam-dev, dpatch, automake
12 Vcs-Bzr: lp:percona-xtradb-cluster
13
14 Package: libmysqlclient18
15
16=== modified file 'build/percona-xtradb-cluster.spec'
17--- build/percona-xtradb-cluster.spec 2013-06-29 21:35:45 +0000
18+++ build/percona-xtradb-cluster.spec 2013-06-29 21:35:53 +0000
19@@ -241,7 +241,7 @@
20 Packager: Percona MySQL Development Team <mysqldev@percona.com>
21 Vendor: %{percona_server_vendor}
22 Provides: mysql-server
23-BuildRequires: %{distro_buildreq} pam-devel
24+BuildRequires: %{distro_buildreq} pam-devel openssl-devel
25
26 # Think about what you use here since the first step is to
27 # run a rm -rf

Subscribers

People subscribed via source and target branches

to all changes: