This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository pkg-perl-tools.
commit d64deff0dc4cf3891574fbfe63cc0e98eea13264
Author: gregor herrmann <gre...@debian.org>
Date: Sat Jul 2 00:17:06 2016 +0200
scripts/import-orig: handle upstream versions with debian suffixes
by using uscan's debian-uversion for dch in order to get the suffixed
version into the new changelog header.
---
scripts/import-orig | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/import-orig b/scripts/import-orig
index 0850b56..f7f3786 100755
--- a/scripts/import-orig
+++ b/scripts/import-orig
@@ -35,6 +35,7 @@ PKG="$(dpkg-parsechangelog --show-field Source)"
USCAN="$(uscan --report-status --dehs|| true)"
UVERSION="$(echo $USCAN | perl -nE
'/<upstream-version>([^<]+)<\/upstream-version>/ and say $1')"
UVERSIONZERO="$(echo "$UVERSION" | perl -ne 'print if s/0+$//')"
+DEBUVERSION="$(echo $USCAN | perl -nE
'/<debian-uversion>([^<]+)<\/debian-uversion>/ and say $1')"
# in case of error, don't crash, just set to null string.
UTAG=''
UTAG="$(git tag | grep -x "v\?$UVERSION" || git tag | grep -- "-$UVERSION\$")"
|| /bin/true
@@ -59,9 +60,9 @@ ${IMPORT_CMD} --no-interactive --pristine-tar
${UTAG:+--upstream-vcs-tag="$UTAG"
DVERSION="$(dpkg-parsechangelog --show-field Version)"
# from uupdate
eval $(echo "$DVERSION" | perl -ne '/^(?:(\d+):)?(.*)/; print "EPOCH=$1\n";')
-NEWVERSION="${UVERSION}-1"
+NEWVERSION="${DEBUVERSION}-1"
if [ -n "$EPOCH" ] ; then
- NEWVERSION="${EPOCH}:${UVERSION}-1"
+ NEWVERSION="${EPOCH}:${DEBUVERSION}-1"
fi
dch -v${NEWVERSION} --no-auto-nmu --mainttrailer --release-heuristic=changelog
"Import upstream version ${UVERSION}"
git add debian/changelog
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
