Merge lp:~ignacio-nin/percona-server/5.5-debian---source into lp:percona-server/5.5

[Ignacio Nin]

Merge changes from corresponding branch for 5.1.

Change the behaviour of debian/rules: BUILD_DEBUG_BINARY changes to SKIP_DEBUG_BINARY (the logical complement). Please refer to explanation in revno 464.

Revno 465 is a merge from the already-approved prerrequisite branch.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh	2013-05-02 08:43:33 +0000
+++ build/build-dpkg.sh	2013-05-02 08:43:34 +0000
@@ -12,16 +12,16 @@
 set -ue
 
 # Examine parameters
-go_out="$(getopt --options "k:Ke:bD" \
-    --longoptions key:,nosign,epoch:,binary,nodebug \
+go_out="$(getopt --options "k:Ke:bDS" \
+    --longoptions key:,nosign,epoch:,binary,nodebug,source \
     --name "$(basename "$0")" -- "$@")"
 test $? -eq 0 || exit 1
 eval set -- $go_out
 
 BUILDPKG_KEY=''
 EPOCH=''
-BINARY=''
-DEBUG='yes'
+DPKG_BINSRC=''
+SKIPDEBUG=''
 
 for arg
 do
@@ -30,8 +30,9 @@
     -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';;
-    -D | --nodebug ) shift; DEBUG='';;
+    -b | --binary ) shift; DPKG_BINSRC='-b';;
+    -D | --nodebug ) shift; SKIPDEBUG='yes';;
+    -S | --source ) shift; DPKG_BINSRC='-S';;
     esac
 done
 
@@ -78,7 +79,7 @@
 
 # Build information
 export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"
-export DEB_BUILD_OPTIONS='debug nocheck'
+export DEB_BUILD_OPTIONS='debug'
 
 # Compilation flags
 export CC=${CC:-gcc}
@@ -107,8 +108,8 @@
         cp -R "$SOURCEDIR/build/debian" .
         chmod +x debian/rules
 
-        # If debug is not set, do not ship mysql-debug
-        if test "x$DEBUG" = "x"
+        # If nodebug is set, do not ship mysql-debug
+        if test "x$SKIPDEBUG" = "xyes"
         then
             sed -i '/mysqld-debug/d' debian/percona-server-server-5.5.install
         fi
@@ -117,8 +118,8 @@
         dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$EPOCH$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
 
         DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
-                BUILD_DEBUG_BINARY="$DEBUG" \
-                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-10 06:08:00 +0000
+++ build/debian/control	2013-05-02 08:43:34 +0000
@@ -2,12 +2,11 @@
 Section: database
 Priority: extra
 Maintainer: Percona Server Development Team <[e-mail]>
-Uploaders: Aleksandr Kuzminsky <[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
 Standards-Version: 7.0.0
 Homepage: http://www.percona.com/software/percona-server/
-Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~percona-dev/percona-server/release-5.5.8-20/
-Vcs-Browser: http://bazaar.launchpad.net/~percona-dev/percona-server/release-5.5.8-20/files
+Vcs-Bzr: lp:percona-server/5.5
 
 Package: libmysqlclient18
 Section: libs

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-04-15 04:38:50 +0000
+++ build/debian/rules	2013-05-02 08:43:34 +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 && \
@@ -50,7 +50,7 @@
 	   -DWITH_PAM=ON
 
 override_dh_auto_build:
-ifneq ($(BUILD_DEBUG_BINARY),)
+ifeq ($(SKIP_DEBUG_BINARY),)
 	cd debug && make $(MAKE_JFLAG)
 endif