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

[Ignacio Nin]

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).

[Ignacio Nin (ignacio-nin)]

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

[Ignacio Nin (ignacio-nin)]

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)

=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh	2013-06-10 20:11:30 +0000
+++ build/build-dpkg.sh	2013-06-10 20:11:30 +0000
@@ -12,15 +12,16 @@
 set -ue
 
 # Examine parameters
-go_out="$(getopt --options "k:Ke:bB" \
-    --longoptions key:,nosign,epoch:,binary,nodebug \
+go_out="$(getopt --options "k:Ke:bBDS" \
+    --longoptions key:,nosign,epoch:,binary,binarydep,nodebug,source \
     --name "$(basename "$0")" -- "$@")"
 test $? -eq 0 || exit 1
 eval set -- $go_out
 
 BUILDPKG_KEY=''
 EPOCH=''
-BINARY=''
+DPKG_BINSRC=''
+SKIPDEBUG=''
 
 for arg
 do
@@ -29,8 +30,10 @@
     -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
     -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
     -e | --epoch ) shift; EPOCH="$1:"; shift;;
-    -b | --binary ) shift; BINARY='-b';;
-    -B | --binarydep ) shift; BINARY='-B';;
+    -b | --binary ) shift; DPKG_BINSRC='-b';;
+    -B | --binarydep ) shift; DPKG_BINSRC='-B';;
+    -D | --nodebug ) shift; SKIPDEBUG='yes';;
+    -S | --source ) shift; DPKG_BINSRC='-S';;
     esac
 done
 
@@ -80,7 +83,7 @@
 # Build information
 export REVISION="$(cd "$SOURCEDIR"; bzr revno)"
 export WSREP_REV="$(cd "$SOURCEDIR";test -r WSREP-REVISION && cat WSREP-REVISION || echo "$REVISION")"
-export DEB_BUILD_OPTIONS='debug nocheck'
+export DEB_BUILD_OPTIONS='debug'
 
 # Compilation flags
 export CC=${CC:-gcc}
@@ -109,11 +112,18 @@
         cp -R "$SOURCEDIR/build/debian" .
         chmod +x debian/rules
 
+        # If nodebug is set, do not ship mysql-debug
+        if test "x$SKIPDEBUG" = "xyes"
+        then
+            sed -i '/mysqld-debug/d' debian/percona-xtradb-cluster-server-5.5.install
+        fi
+
         # Update distribution name
         dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$EPOCH$MYSQL_VERSION-$WSREP_VERSION-$REVISION.$DEBIAN_VERSION" 'Update distribution'
 
         DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
-                dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY
+                SKIP_DEBUG_BINARY="$SKIPDEBUG" \
+                dpkg-buildpackage $DPKG_BINSRC -rfakeroot $BUILDPKG_KEY
 
     )
 

=== modified file 'build/debian/control'
--- build/debian/control	2013-04-11 20:42:44 +0000
+++ build/debian/control	2013-06-10 20:11:30 +0000
@@ -3,9 +3,10 @@
 Priority: extra
 Maintainer: Percona Server Development Team <[e-mail]>
 Uploaders: Ignacio Nin <[e-mail]>
+Build-Depends: debhelper (>= 7.0.50), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev, libpam-dev, dpatch, automake, libssl-dev
 Standards-Version: 7.0.0
 Homepage: http://www.percona.com/software/percona-xtradb-cluster/
-Build-Depends: debhelper (>= 7.0.50), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev, libpam-dev, dpatch, automake
+Vcs-Bzr: lp:percona-xtradb-cluster
 
 Package: libmysqlclient18
 Section: libs

=== modified file 'build/debian/percona-xtradb-cluster-server-5.5.install'
--- build/debian/percona-xtradb-cluster-server-5.5.install	2012-10-31 22:01:30 +0000
+++ build/debian/percona-xtradb-cluster-server-5.5.install	2013-06-10 20:11:30 +0000
@@ -28,6 +28,7 @@
 usr/bin/wsrep_sst_xtrabackup
 usr/bin/wsrep_sst_rsync
 usr/sbin/mysqld
+usr/sbin/mysqld-debug
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisamlog.1

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-04-18 16:15:44 +0000
+++ build/debian/rules	2013-06-10 20:11:30 +0000
@@ -21,7 +21,7 @@
 	rm -rf CMakeFiles
 
 override_dh_auto_configure: patch
-ifneq ($(BUILD_DEBUG_BINARY),)
+ifeq ($(SKIP_DEBUG_BINARY),)
 	# Make a debug binary
 	mkdir debug
 	cd debug && \
@@ -54,7 +54,7 @@
 	   -DWITH_PAM=ON
 
 override_dh_auto_build:
-ifneq ($(BUILD_DEBUG_BINARY),)
+ifeq ($(SKIP_DEBUG_BINARY),)
 	cd debug && make $(MAKE_JFLAG)
 endif