Merge lp:~andreserl/maas/packaging_changes_for_git into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

- Remove get-orig-source.
- Do not include rev on debian/changelog header.
- Include scripts that automatically build packaging source files.

[lp:~andreserl/maas/packaging_changes_for_git]

564. By Andres Rodriguez on 2017-06-23

Update version to match discussion

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-15 08:05:26 +0000
+++ debian/changelog	2017-06-23 13:32:08 +0000
@@ -1,4 +1,4 @@
-maas (2.3.0~alpha1+bzr6085-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.3.0~alpha1-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
 

=== modified file 'debian/rules'
--- debian/rules	2017-06-08 23:30:03 +0000
+++ debian/rules	2017-06-23 13:32:08 +0000
@@ -73,12 +73,3 @@
 	dh_auto_clean
 	rm -rf $(BUILDHOME)
 	rm -rf src/*.egg-info
-
-DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
-REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
-              | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p')
-VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
-              | sed -rne 's,^Version: ([^-]+).*,\1,p')
-get-orig-source:
-	bzr export -r $(REV) --root=maas-$(VER).orig \
-             maas_$(VER).orig.tar.gz lp:maas

=== added file 'publish'
--- publish	1970-01-01 00:00:00 +0000
+++ publish	2017-06-23 13:32:08 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh -e
+
+PKG=$(head -n1 debian/changelog | awk '{print $1}')
+VER=$(head -n 1 debian/changelog | sed 's/^.*(//' | sed 's/).*//' | sed 's/-.*//')
+
+case "$1" in
+    experimental3)
+        dput -f ppa:maas-maintainers/experimental3 maas*source.changes
+    ;;
+    next)
+        dput -f ppa:maas/next maas*source.changes
+    ;;
+    next-proposed)
+        dput -f ppa:maas/next-proposed maas*source.changes
+    ;;
+    experimental)
+        echo "experimental"
+        dput -f ppa:maas-maintainers/experimental maas*trusty*source.changes
+        dput -f ppa:maas-maintainers/experimental maas*vivid*source.changes
+        dput -f ppa:maas-maintainers/experimental maas*wily*source.changes
+    ;;
+    proposed)
+        dput -f ppa:maas/proposed maas*source.changes
+    ;;
+    stable)
+        dput -f ppa:maas/stable maas*source.changes
+    ;;
+    *)
+        dput -f $1 maas*source.changes
+    ;;
+esac

=== added file 'release-build'
--- release-build	1970-01-01 00:00:00 +0000
+++ release-build	2017-06-23 13:32:08 +0000
@@ -0,0 +1,63 @@
+#!/bin/sh -e
+error() {
+	echo "ERROR: $@" >&2
+	exit 1
+}
+
+usage () {
+    echo "Usage:"
+    echo "    $0 <path-to-local-repo> [commit (defaults to HEAD)]"
+    exit 1
+}
+
+if [ -z "$1" ]; then
+    usage
+    if [ ! -f $1 ]; then
+        error "Local branch location does not exist. Cannot proceed"
+    fi
+fi
+
+if [ -z "$2" ]; then
+    echo "WARNING: No commit specified, using HEAD instead"
+    COMMIT="HEAD"
+else
+    COMMIT="$2"
+fi
+
+PKG=$(head -n1 debian/changelog | awk '{print $1}')
+MAJOR_VER=$(head -n 1 debian/changelog | sed 's/^.*(//' | sed 's/).*//' | sed 's/-.*//')
+#REV=$(head -n 1 debian/changelog | sed -rne 's,.*[+~.]git([0-9a-zA-Z]+).*,\1,p')
+REV_COUNT=$(git -C $1 rev-list --count $COMMIT)
+REV_SHORT=$(git -C $1 rev-parse --short $COMMIT)
+FULL_VER="$MAJOR_VER+git$REV_COUNT.$REV_SHORT"
+TARBALL="maas_$FULL_VER.orig.tar.gz"
+
+get_orig_source() {
+        branch="$1"
+        git -C $branch archive --format=tar.gz --prefix="maas-$FULL_VER.orig/" $COMMIT -o $TARBALL $REV
+	
+}
+# Obtain the tarball from a local branch
+get_orig_source $1 $FULL_VER $REV
+
+# Copy the tarball to the local dir
+mv "${1}/${TARBALL}" .
+
+# Update the changelog
+sed -i "s/${MAJOR_VER}-0ubuntu1/${FULL_VER}-0ubuntu1/i" debian/changelog
+
+# Untar
+tar zxvf ${PKG}_${FULL_VER}.orig.tar.gz
+cd "${PKG}-${FULL_VER}.orig/"
+cp -r ../debian .
+sed -i "s/) UNRELEASED;/~16.04.1) xenial;/i" debian/changelog
+debuild -S -sa
+sed -i "s/~16.04.1) xenial;/~16.10.1) yakkety;/" debian/changelog
+debuild -S
+sed -i "s/~16.10.1) yakkety;/~17.04.1) zesty;/" debian/changelog
+debuild -S
+sed -i "s/~17.04.1) zesty;/~17.10.1) artful;/" debian/changelog
+debuild -S
+
+cd ../
+sed -i "s/${FULL_VER}-0ubuntu1/${MAJOR_VER}-0ubuntu1/i" debian/changelog