[pkg-perl-tools] 02/02: Revert "scripts/import-orig: handle upstream versions with debian suffixes"

[gregor herrmann]

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 66bf2e8a6472e59f15c48469c589a52a9e1296b3
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jul 2 17:53:26 2016 +0200

    Revert "scripts/import-orig: handle upstream versions with debian suffixes"
    
    This reverts commit d64deff0dc4cf3891574fbfe63cc0e98eea13264.
---
 scripts/import-orig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/import-orig b/scripts/import-orig
index f7f3786..0850b56 100755
--- a/scripts/import-orig
+++ b/scripts/import-orig
@@ -35,7 +35,6 @@ 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
@@ -60,9 +59,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="${DEBUVERSION}-1"
+NEWVERSION="${UVERSION}-1"
 if [ -n "$EPOCH" ] ; then
-	NEWVERSION="${EPOCH}:${DEBUVERSION}-1"
+	NEWVERSION="${EPOCH}:${UVERSION}-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