Merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-debian---source 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-debian---source
Merge into: lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5
Prerequisite: lp:~ignacio-nin/percona-xtradb-cluster/pxc-debian---epoch
Diff against target: 114 lines (+22/-10)
4 files modified
build/build-dpkg.sh (+17/-7)
build/debian/control (+2/-1)
build/debian/percona-xtradb-cluster-server-5.5.install (+1/-0)
build/debian/rules (+2/-2)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-debian---source
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+162054@code.launchpad.net

Description of the change

Merge changes from the corresponding 5.5 branch.
Add libssl-dev as a BuildRequires for debian, which had been merged before but lost (probably null-merged out).

To post a comment you must log in.
Revision history for this message
Ignacio Nin (ignacio-nin) wrote :

Set to work in progress to see where the file deletion came from

Revision history for this message
Ignacio Nin (ignacio-nin) wrote :

Resubmitting with fix for a deleted file that shouldn't have been there.

Unmerged revisions

410. By Ignacio Nin on 2013-06-10

Merge --epoch parameter (dpkg)

Merge the --epoch parameter addition in order to avoid future conflicts.

409. By Ignacio Nin on 2013-06-10

Add libssl-dev as a dependency

Add libssl-dev as dependency for building, which should have been added
from merging from 5.5 however for some reason it wasn't there.

408. By Ignacio Nin on 2013-04-29

Merge SKIP_DEBUG_BINARY from 5.5 (dpkg)

Add mysqld-debug to the installed files of the server package.

407. By Ignacio Nin on 2013-04-24

Merge dependency changes from 5.1

Almost a null/cosmetic change in order to make files more similar to 5.5.

406. By Ignacio Nin on 2013-04-23

Merge the capability to build source packages (debian)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/build-dpkg.sh'
2--- build/build-dpkg.sh 2013-06-10 20:11:30 +0000
3+++ build/build-dpkg.sh 2013-06-10 20:11:30 +0000
4@@ -12,15 +12,16 @@
5 set -ue
6
7 # Examine parameters
8-go_out="$(getopt --options "k:Ke:bB" \
9- --longoptions key:,nosign,epoch:,binary,nodebug \
10+go_out="$(getopt --options "k:Ke:bBDS" \
11+ --longoptions key:,nosign,epoch:,binary,binarydep,nodebug,source \
12 --name "$(basename "$0")" -- "$@")"
13 test $? -eq 0 || exit 1
14 eval set -- $go_out
15
16 BUILDPKG_KEY=''
17 EPOCH=''
18-BINARY=''
19+DPKG_BINSRC=''
20+SKIPDEBUG=''
21
22 for arg
23 do
24@@ -29,8 +30,10 @@
25 -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
26 -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
27 -e | --epoch ) shift; EPOCH="$1:"; shift;;
28- -b | --binary ) shift; BINARY='-b';;
29- -B | --binarydep ) shift; BINARY='-B';;
30+ -b | --binary ) shift; DPKG_BINSRC='-b';;
31+ -B | --binarydep ) shift; DPKG_BINSRC='-B';;
32+ -D | --nodebug ) shift; SKIPDEBUG='yes';;
33+ -S | --source ) shift; DPKG_BINSRC='-S';;
34 esac
35 done
36
37@@ -80,7 +83,7 @@
38 # Build information
39 export REVISION="$(cd "$SOURCEDIR"; bzr revno)"
40 export WSREP_REV="$(cd "$SOURCEDIR";test -r WSREP-REVISION && cat WSREP-REVISION || echo "$REVISION")"
41-export DEB_BUILD_OPTIONS='debug nocheck'
42+export DEB_BUILD_OPTIONS='debug'
43
44 # Compilation flags
45 export CC=${CC:-gcc}
46@@ -109,11 +112,18 @@
47 cp -R "$SOURCEDIR/build/debian" .
48 chmod +x debian/rules
49
50+ # If nodebug is set, do not ship mysql-debug
51+ if test "x$SKIPDEBUG" = "xyes"
52+ then
53+ sed -i '/mysqld-debug/d' debian/percona-xtradb-cluster-server-5.5.install
54+ fi
55+
56 # Update distribution name
57 dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$EPOCH$MYSQL_VERSION-$WSREP_VERSION-$REVISION.$DEBIAN_VERSION" 'Update distribution'
58
59 DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
60- dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY
61+ SKIP_DEBUG_BINARY="$SKIPDEBUG" \
62+ dpkg-buildpackage $DPKG_BINSRC -rfakeroot $BUILDPKG_KEY
63
64 )
65
66
67=== modified file 'build/debian/control'
68--- build/debian/control 2013-04-11 20:42:44 +0000
69+++ build/debian/control 2013-06-10 20:11:30 +0000
70@@ -3,9 +3,10 @@
71 Priority: extra
72 Maintainer: Percona Server Development Team <mysql-dev@percona.com>
73 Uploaders: Ignacio Nin <ignacio.nin@percona.com>
74+Build-Depends: debhelper (>= 7.0.50), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev, libpam-dev, dpatch, automake, libssl-dev
75 Standards-Version: 7.0.0
76 Homepage: http://www.percona.com/software/percona-xtradb-cluster/
77-Build-Depends: debhelper (>= 7.0.50), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev, libpam-dev, dpatch, automake
78+Vcs-Bzr: lp:percona-xtradb-cluster
79
80 Package: libmysqlclient18
81 Section: libs
82
83=== modified file 'build/debian/percona-xtradb-cluster-server-5.5.install'
84--- build/debian/percona-xtradb-cluster-server-5.5.install 2012-10-31 22:01:30 +0000
85+++ build/debian/percona-xtradb-cluster-server-5.5.install 2013-06-10 20:11:30 +0000
86@@ -28,6 +28,7 @@
87 usr/bin/wsrep_sst_xtrabackup
88 usr/bin/wsrep_sst_rsync
89 usr/sbin/mysqld
90+usr/sbin/mysqld-debug
91 usr/share/man/man1/msql2mysql.1
92 usr/share/man/man1/myisamchk.1
93 usr/share/man/man1/myisamlog.1
94
95=== modified file 'build/debian/rules'
96--- build/debian/rules 2013-04-18 16:15:44 +0000
97+++ build/debian/rules 2013-06-10 20:11:30 +0000
98@@ -21,7 +21,7 @@
99 rm -rf CMakeFiles
100
101 override_dh_auto_configure: patch
102-ifneq ($(BUILD_DEBUG_BINARY),)
103+ifeq ($(SKIP_DEBUG_BINARY),)
104 # Make a debug binary
105 mkdir debug
106 cd debug && \
107@@ -54,7 +54,7 @@
108 -DWITH_PAM=ON
109
110 override_dh_auto_build:
111-ifneq ($(BUILD_DEBUG_BINARY),)
112+ifeq ($(SKIP_DEBUG_BINARY),)
113 cd debug && make $(MAKE_JFLAG)
114 endif
115

Subscribers

People subscribed via source and target branches

to all changes: