[pkg-haskell-tools] 01/01: debian2dsc: Handle +dfsg hopefully more properly.

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository pkg-haskell-tools.

commit 704c7bc001a800ccb95590447243dd9b25810cdc
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue May 31 10:42:00 2016 +0200

    debian2dsc: Handle +dfsg hopefully more properly.
---
 scripts/debian2dsc | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/debian2dsc b/scripts/debian2dsc
index 8576042..da9505f 100755
--- a/scripts/debian2dsc
+++ b/scripts/debian2dsc
@@ -78,14 +78,15 @@ do
 
     VERSION=`dpkg-parsechangelog -l$DIR/changelog -c1 -SVersion`
     PACKAGE=`dpkg-parsechangelog -l$DIR/changelog -c1 -SSource`
-    UPSTREAM=`echo $VERSION | cut -d- -f1` # this could be improved
-    if echo $UPSTREAM | fgrep -q : ; then
-    	UPSTREAM=`echo $UPSTREAM | cut -d: -f2-`
-    	VERSION=`echo $VERSION | cut -d: -f2-`
+    UPSTREAM_DFSG=`echo $VERSION | cut -d- -f1` # this could be improved
+    if echo $UPSTREAM_DFSG | fgrep -q : ; then
+	UPSTREAM_DFSG=`echo $UPSTREAM_DFSG | cut -d: -f2-`
+	VERSION=`echo $VERSION | cut -d: -f2-`
     fi
-    TARBALL_GZ=$dest/${PACKAGE}_$UPSTREAM.orig.tar.gz
-    TARBALL_BZ2=$dest/${PACKAGE}_$UPSTREAM.orig.tar.bz2
-    TARBALL_XZ=$dest/${PACKAGE}_$UPSTREAM.orig.tar.xz
+    UPSTREAM="$(echo $UPSTREAM_DFSG | sed -e 's/+dfsg[0-9]*//')"
+    TARBALL_GZ=$dest/${PACKAGE}_$UPSTREAM_DFSG.orig.tar.gz
+    TARBALL_BZ2=$dest/${PACKAGE}_$UPSTREAM_DFSG.orig.tar.bz2
+    TARBALL_XZ=$dest/${PACKAGE}_$UPSTREAM_DFSG.orig.tar.xz
     # see 375138 for why this doesn't work as well as it could. Fall back to apt-get source
     # as a last resort.
     [ ! -e $TARBALL_GZ -a ! -e $TARBALL_BZ2 -a ! -e $TARBALL_XZ ] && \

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