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

[Ignacio Nin]

Add a --source parameter to the debian builder.
Do not run checks by default, instead, a parameter needs to be passed for check to be run (dpkg).
Adjust the Build-Requires for debian.

[Laurynas Biveinis (laurynas-biveinis)]

I assume that commit 492 is the one to be reviewed.
But prerequisite branch commits come after this one, not before, probably that's why the diff does not exclude prerequisite changes.

review: Approve

[Ignacio Nin (ignacio-nin)]

Hello,

Commits 492-494 are the new ones, commits 495 and 496 are just to prevent conflicts since they work on the same lines. Yes, I set a prerrequiste branch that's the one that includes 496 (already approved, but not merged to trunk).

Piggybacked commits.

Commit 493 is the change from "ifeq ... nocheck" to "ifneq ... check", so we change the default.

Commit 494 is the change in BuildRequires (removing doxygen which is not used).

=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh	2013-05-02 08:18:31 +0000
+++ build/build-dpkg.sh	2013-05-02 08:18:32 +0000
@@ -12,14 +12,15 @@
 set -ue
 
 # Examine parameters
-go_out="$(getopt --options "k:Ke:b" --longoptions key:,nosign,epoch:,binary \
+go_out="$(getopt --options "k:Ke:bS" \
+    --longoptions key:,nosign,epoch:,binary,source \
     --name "$(basename "$0")" -- "$@")"
 test $? -eq 0 || exit 1
 eval set -- $go_out
 
 BUILDPKG_KEY=''
 EPOCH=''
-BINARY=''
+DPKG_BINSRC=''
 
 for arg
 do
@@ -28,7 +29,8 @@
     -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 | --binary ) shift; DPKG_BINSRC='-b';;
+    -S | --source ) shift; DPKG_BINSRC='-S';;
     esac
 done
 
@@ -76,7 +78,7 @@
 
 # Build information
 export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"
-export DEB_BUILD_OPTIONS='debug nocheck'
+export DEB_BUILD_OPTIONS='debug'
 export MYSQL_BUILD_CC='gcc'
 export MYSQL_BUILD_CXX='gcc'
 export HS_CXX=${HS_CXX:-g++}
@@ -107,7 +109,7 @@
         # Update distribution name
         dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$EPOCH$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
 
-        dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY
+        dpkg-buildpackage $DPKG_BINSRC -rfakeroot $BUILDPKG_KEY
 
     )
 

=== modified file 'build/debian/control'
--- build/debian/control	2013-04-10 15:15:58 +0000
+++ build/debian/control	2013-05-02 08:18:32 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Percona Server Development Team <[e-mail]>
 Uploaders: Ignacio Nin <[e-mail]>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.0.50), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), psmisc, po-debconf, chrpath, automake (>= 1.9), doxygen, dpatch, gawk, bison, lsb-release, fakeroot
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.0.50), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), po-debconf, chrpath, automake (>= 1.9), dpatch, gawk, bison, lsb-release, fakeroot, libssl-dev
 Standards-Version: 7.0.0
 Homepage: http://www.percona.com/software/
 Vcs-Bzr: lp:percona-server/5.1

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-04-10 08:10:51 +0000
+++ build/debian/rules	2013-05-02 08:18:32 +0000
@@ -119,7 +119,7 @@
 	dh_testdir
 
 	$(MAKE) $(MAKE_J)
-ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
+ifneq ($(findstring check,$(DEB_BUILD_OPTIONS)),)
 	if [ ! -f testsuite-stamp ] ; then \
 	  $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
 	fi