Merge lp:~ignacio-nin/percona-xtrabackup/2.0-dpkg-dummy-revamp into lp:percona-xtrabackup/2.0

[Ignacio Nin]

For the --dummy dpkg packages, instead of having a debian/rules patch, move the dummy rules to the debian/rules package itself, which now operates with a DEB_DUMMY environment variable. This makes it much easier to manage than having to patch a patch whenever debian/rules was changed.

This is the way --dummy operates in RPM (inside xtrabackup.spec).

[Stewart Smith (stewart)]

review: Approve

=== modified file 'utils/build-dpkg.sh'
--- utils/build-dpkg.sh	2013-04-01 16:55:27 +0000
+++ utils/build-dpkg.sh	2013-04-19 21:57:27 +0000
@@ -86,6 +86,7 @@
 export DEB_BUILD_OPTIONS='debug nocheck'
 export DEB_CFLAGS_APPEND="$CFLAGS"
 export DEB_CXXFLAGS_APPEND="$CXXFLAGS"
+export DEB_DUMMY="$DUMMY"
 
 # Build
 (
@@ -105,12 +106,6 @@
             sed -i '/Package: xtrabackup/,/^$/d' debian/control
         fi
 
-        # Apply dummy patch if wanted
-        if test "x$DUMMY" = "xyes"
-        then
-            patch -p1 < 'utils/debian-dummy-rules.patch'
-        fi
-
         # Update distribution
         dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$XTRABACKUP_VERSION-$REVISION.$DEBIAN_VERSION" 'Update distribution'
         # Issue dpkg-buildpackage command

=== removed file 'utils/debian-dummy-rules.patch'
--- utils/debian-dummy-rules.patch	2013-04-01 16:55:27 +0000
+++ utils/debian-dummy-rules.patch	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-=== modified file 'utils/debian/rules'
---- utils/debian/rules  2012-04-18 03:26:07 +0000
-+++ utils/debian/rules  2012-04-18 16:15:15 +0000
-@@ -40,18 +40,12 @@
- build-stamp:  config.status 
- 	dh_testdir
- 
--	# Add here commands to compile the package.
--	AUTO_DOWNLOAD=yes ./utils/build.sh 5.1
--	cp src/xtrabackup_51 src/xbstream .
--
--	AUTO_DOWNLOAD=yes ./utils/build.sh xtradb
--	cp src/xtrabackup .
--
--	AUTO_DOWNLOAD=yes ./utils/build.sh xtradb55
--	cp src/xtrabackup_55 .
--
--	AUTO_DOWNLOAD=yes ./utils/build.sh xtradb56
--	cp src/xtrabackup_56 .
-+	# Dummy binaries that avoid compilation
-+	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup
-+	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup_51
-+	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup_55
-+	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup_56
-+	echo 'main() { return 300; }' | gcc -x c - -o xbstream
- 
- 	#docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
- 
-
-

=== modified file 'utils/debian/rules'
--- utils/debian/rules	2013-04-01 16:55:27 +0000
+++ utils/debian/rules	2013-04-19 21:57:27 +0000
@@ -40,6 +40,7 @@
 build-stamp:  config.status 
 	dh_testdir
 
+ifeq "$(DEB_DUMMY)" ""
 	# Add here commands to compile the package.
 	AUTO_DOWNLOAD=yes ./utils/build.sh 5.1
 	cp src/xtrabackup_51 src/xbstream .
@@ -52,6 +53,14 @@
 
 	AUTO_DOWNLOAD=yes ./utils/build.sh xtradb56
 	cp src/xtrabackup_56 .
+else
+	# Dummy binaries that avoid compilation
+	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup
+	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup_51
+	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup_55
+	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup_56
+	echo 'main() { return 300; }' | gcc -x c - -o xbstream
+endif
 
 	#docbook-to-man debian/xtrabackup.sgml > xtrabackup.1