[DRE-commits] [rails-pkg-tools] 01/01: Push local changes

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository rails-pkg-tools.

commit 64e70e5b1cb52e1b00fc332bcc79a5e674620c72
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Jun 30 09:39:50 2014 +0200

    Push local changes
---
 ror-ppa.sh      |  8 ++++++++
 ror-push.sh     |  8 ++++----
 ror-unstable.sh |  8 ++++++++
 ror-update.sh   | 39 +++++++++++++++++++++------------------
 ror-upload.sh   | 13 +++++++++++++
 5 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/ror-ppa.sh b/ror-ppa.sh
new file mode 100755
index 0000000..d09024f
--- /dev/null
+++ b/ror-ppa.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+source $(dirname ${0})/ror-common
+source $(dirname ${0})/ror-packages
+
+for p in ${P}; do
+    cd ${PREDIR}/${p};
+    ubuntu-ppa-build -u redmine $@
+done
diff --git a/ror-push.sh b/ror-push.sh
index 95fcb47..8ffee98 100755
--- a/ror-push.sh
+++ b/ror-push.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 source $(dirname ${0})/ror-common
 source $(dirname ${0})/ror-packages
 
-for p in $P; do
-    cd $PREDIR/$p;
-    git co $BRANCH
+for p in ${P}; do
+    cd ${PREDIR}/${p};
+    git co ${BRANCH}
     git pull --rebase
     git push
 done
diff --git a/ror-unstable.sh b/ror-unstable.sh
new file mode 100755
index 0000000..2c8a01a
--- /dev/null
+++ b/ror-unstable.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+source $(dirname ${0})/ror-common
+source $(dirname ${0})/ror-packages
+
+for p in ${P}; do
+    cd ${PREDIR}/${p};
+    git-buildpackage --git-tag --git-retag
+done
diff --git a/ror-update.sh b/ror-update.sh
index feb1531..4f221c3 100755
--- a/ror-update.sh
+++ b/ror-update.sh
@@ -1,39 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 source $(dirname $0)/ror-common
 source $(dirname $0)/ror-packages
 
-for p in $P; do
-    cd $PREDIR/$p;
-    git co $BRANCH
+[ -z "$1" ] && echo "$(basename $0) <version>"
+
+for p in ${P}; do
+    cd ${PREDIR}/${p};
+    git co ${BRANCH}
     gbp-pull
     cv=$(dpkg-parsechangelog | sed -ne "s/^Version: \\(.*\\)-.*/\\1/p")
-    g=$(echo $p | sed -ne "s/^ruby-\\(.*\\)-3.2/\\1/p")
-    nv=$(gem query -r -n "^$g$" sed -ne "s/^$g (\\(.*\\))$/\\1/p")
-    if dpkg --compare-versions "$nv" gt "$cv"; then
+    g=$(echo ${p} | sed -ne "s/^ruby-\\(.*\\)-3.2/\\1/p")
+    nv=${1}
+    if dpkg --compare-versions "${nv}" gt "${cv}"; then
 
 	# Download and tgzify gem
 	TMPDIR=$(mktemp -d /tmp/pkg-ruby-extra.XXXXXXXX) || exit 1
-	cd $TMPDIR
-	gem2tgz $g
-	cd $PREDIR/$p
-	orig=$p_$nv.orig.tar.gz
-	mv $TMPDIR/$g-$nv.tar.gz $PREDIR/$orig
-	rm -rf $TMPDIR
+	cd ${TMPDIR}
+	gem fetch ${g} -v ${nv}
+	gem2tgz ${g}-${nv}.gem
+	cd $PREDIR/${p}
+	orig=${p}_${nv}.orig.tar.gz
+	mv $TMPDIR/${g}-${nv}.tar.gz ${PREDIR}/${orig}
+	rm -rf ${TMPDIR}
 
 	# Import new tgz
-	git-import-orig --upstream-version=$nv --no-interactive $PREDIR/$orig
+	git-import-orig --upstream-version=${nv} --no-interactive ${PREDIR}/${orig}
 	# Update tight dependencies between RoR components
 	./debian/rules clean
 	# Commit debian/control only if it was updated (workaround for ruby-activesupport-3.2)
 	if [ $(git diff debian/control | wc -l) -gt 0 ]; then
 	    git add debian/control
-	    git commit -m 'Update debian/control to rails release $nv'
+	    git commit -m "Update debian/control to rails release ${nv}"
 	fi
 	# Create new changelog
-	git dch -N $nv-1 -R -a
+	git dch -N ${nv}-1 -R -a
 	# Commit changelog
 	git commit -m "Prepare $(dpkg-parsechangelog | sed -ne "s/^Version: \\(.*\\)-.*/\\1/p") release" debian/changelog
-	# Build package if the builder was specified on command line
-	$BUILDER
     fi
+    # Build package if the builder was specified on command line
+    ${BUILDER}
 done
diff --git a/ror-upload.sh b/ror-upload.sh
new file mode 100755
index 0000000..6777688
--- /dev/null
+++ b/ror-upload.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+source $(dirname ${0})/ror-common
+source $(dirname ${0})/ror-packages
+
+set +e
+[ -z "${1}" ] && echo "$(basename $0) <version>"
+set -e
+
+for p in ${P}; do
+    cd ${PREDIR}/build-area
+    debsign ${p}_${1}_amd64.changes
+    dput ftp-master ${p}_${1}_amd64.changes
+done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails-pkg-tools.git