Merge lp:~percona-core/percona-xtrabackup/release-2.1.5 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-07-11 05:18:55 +0000
+++ Makefile	2013-11-18 10:35:21 +0000
@@ -28,14 +28,14 @@
 dist: $(SERVER_SOURCE_TARBALLS)
 	bzr export percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
 	tar xfz percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
-	cp $(SERVER_SOURCE_TARBALLS) percona-xtrabackup-$(XTRABACKUP_VERSION)/
+	test "x$(DUMMY)" != "x" || cp $(SERVER_SOURCE_TARBALLS) percona-xtrabackup-$(XTRABACKUP_VERSION)/
 	echo $(BZR_REVNO) > percona-xtrabackup-$(XTRABACKUP_VERSION)/REVNO
 	rm percona-xtrabackup-$(XTRABACKUP_VERSION).tar.gz
 	tar cfz percona-xtrabackup-$(XTRABACKUP_VERSION)-$(BZR_REVNO).tar.gz percona-xtrabackup-$(XTRABACKUP_VERSION)
 	rm -rf percona-xtrabackup-$(XTRABACKUP_VERSION)
 
 $(SERVER_SOURCE_TARBALLS):
-	wget $(MASTER_SITE)/$@
+	test "x$(DUMMY)" != "x" || wget $(MASTER_SITE)/$@
 
 # fake clean/distclean targets... we explicitly do *NOT* want to clean
 # away the tarballs as we actually need to ship them

=== modified file 'VERSION'
--- VERSION	2013-09-26 06:20:33 +0000
+++ VERSION	2013-11-18 10:35:21 +0000
@@ -1,1 +1,1 @@
-XTRABACKUP_VERSION=2.1.3
+XTRABACKUP_VERSION=2.1.5

=== modified file 'utils/build-dpkg.sh'
--- utils/build-dpkg.sh	2013-06-06 04:56:41 +0000
+++ utils/build-dpkg.sh	2013-11-18 10:35:21 +0000
@@ -12,8 +12,8 @@
 set -ue
 
 # Examine parameters
-go_out="$(getopt --options "k:KbBSnT"\
-    --longoptions key:,nosign,binary,binarydep,source,dummy,notransitional \
+go_out="$(getopt --options "k:KbBSnTtD" --longoptions \
+    key:,nosign,binary,binarydep,source,dummy,notransitional,transitional \
     --name "$(basename "$0")" -- "$@")"
 test $? -eq 0 || exit 1
 eval set -- $go_out
@@ -21,7 +21,8 @@
 BUILDPKG_KEY=''
 DPKG_BINSRC=''
 DUMMY=''
-NOTRANSITIONAL=''
+NOTRANSITIONAL='yes'
+PACKAGE_SUFFIX='-1'
 
 for arg
 do
@@ -34,16 +35,43 @@
     -S | --source ) shift; DPKG_BINSRC='-S';;
     -n | --dummy ) shift; DUMMY='yes';;
     -T | --notransitional ) shift; NOTRANSITIONAL='yes';;
+    -t | --transitional ) shift; NOTRANSITIONAL='';;
+    -D ) shift; PACKAGE_SUFFIX="$PACKAGE_SUFFIX.$(lsb_release -sc)";;
     esac
 done
 
+SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
+
 # Read XTRABACKUP_VERSION from the VERSION file
-. VERSION
+. $SOURCEDIR/VERSION
 
 DEBIAN_VERSION="$(lsb_release -sc)"
-REVISION="$(bzr revno 2>/dev/null || cat REVNO)"
+REVISION="$(cd "$SOURCEDIR"; bzr revno 2>/dev/null || cat REVNO)"
 FULL_VERSION="$XTRABACKUP_VERSION-$REVISION.$DEBIAN_VERSION"
 
+# Working directory
+if test "$#" -eq 0
+then
+    # We build in the sourcedir
+    WORKDIR="$(cd "$SOURCEDIR/.."; pwd)"
+
+elif test "$#" -eq 1
+then
+    WORKDIR="$1"
+
+    # Check that the provided directory exists and is a directory
+    if ! test -d "$WORKDIR"
+    then
+        echo >&2 "$WORKDIR is not a directory"
+        exit 1
+    fi
+
+else
+    echo >&2 "Usage: $0 [target dir]"
+    exit 1
+
+fi
+
 # Build information
 export CC=${CC:-gcc}
 export CXX=${CXX:-g++}
@@ -58,25 +86,52 @@
 
 # Build
 (
-    # we assume we're in the source directory, as we assume
-    # that we've done "make dist" before.
-
     (
-        T=`ls -1 ../percona-xtrabackup*tar.gz`; TO=`echo $T|sed -e 's/percona-xtrabackup-/percona-xtrabackup_/; s/\.tar\.gz/.orig.tar.gz/;'`; mv $T $TO
-
-        # Move the debian dir to the appropriate place
-        cp -a "utils/debian/" .
-
-        # Don't build transitional packages if requested
-        if test "x$NOTRANSITIONAL" = "xyes"
+        # Prepare source directory for dpkg-source
+        cd "$SOURCEDIR"
+
+        make DUMMY="$DUMMY" dist
+
+        if ! test -d debian
         then
-            sed -i '/Package: xtrabackup/,/^$/d' debian/control
+            cp -a utils/debian/ .
         fi
 
         # Update distribution
-        dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$XTRABACKUP_VERSION-$REVISION-1" 'Update distribution'
-        # Issue dpkg-buildpackage command
-        dpkg-buildpackage $DPKG_BINSRC $BUILDPKG_KEY
+        dch -m -D "$DEBIAN_VERSION" --force-distribution \
+            -v "$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX" 'Update distribution'
+
+    )
+
+    # Create the original tarball
+    mv "$SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz" \
+        "$WORKDIR/percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
+
+    (
+        cd "$WORKDIR"
+
+        # Create the rest of the source, ignoring changes since we may be in the
+        # sourcedir.
+        dpkg-source -i'.*' -b "$SOURCEDIR"
+
+        # Unpack it
+        dpkg-source -x "percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION$PACKAGE_SUFFIX.dsc"
+
+        (
+            cd "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION"
+
+            # Don't build transitional packages if requested
+            if test "x$NOTRANSITIONAL" = "xyes"
+            then
+                sed -i '/Package: xtrabackup/,/^$/d' debian/control
+            fi
+
+            # Issue dpkg-buildpackage command
+            dpkg-buildpackage $DPKG_BINSRC $BUILDPKG_KEY
+ 
+        )
+
+        rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION"
  
     )
 )

=== modified file 'utils/build-rpm.sh'
--- utils/build-rpm.sh	2013-06-05 08:39:54 +0000
+++ utils/build-rpm.sh	2013-11-18 10:35:21 +0000
@@ -126,8 +126,11 @@
 
     mkdir -p BUILD SOURCES RPMS SRPMS
 
-    # FIXME: spec file should use the VERSION-REVISION instead.
-    cp $SOURCEDIR/../percona-xtrabackup-$XTRABACKUP_VERSION*.tar.gz SOURCES/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz
+    # Create the source archive
+    (cd "$SOURCEDIR"; make DUMMY="$DUMMY" dist)
+
+    cp $SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz \
+        SOURCES/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz
 
     # Issue RPM command
     rpmbuild $SIGN $TARGET $TARGET_LIBDIR $TARGET_ARCH $DUMMY \

=== modified file 'utils/xtrabackup.spec'
--- utils/xtrabackup.spec	2013-09-26 06:20:33 +0000
+++ utils/xtrabackup.spec	2013-11-18 10:35:21 +0000
@@ -63,11 +63,11 @@
 export CXX=${CXX-"g++"}
 export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 
 export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 
-AUTO_DOWNLOAD=yes ./utils/build.sh xtradb
+./utils/build.sh xtradb
 cp src/xtrabackup . 
-AUTO_DOWNLOAD=yes ./utils/build.sh xtradb55
+./utils/build.sh xtradb55
 cp src/xtrabackup_55 src/xbstream src/xbcrypt .
-AUTO_DOWNLOAD=yes ./utils/build.sh xtradb56
+./utils/build.sh xtradb56
 cp src/xtrabackup_56 .
 %else
 # Dummy binaries that avoid compilation