[pkg-haskell-tools] 01/02: dht debian2dsc: More robust handling of repacksuffixes

[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 df6dfd444e051d8243bddc08dd463e956a00af25
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Jun 1 13:03:06 2016 +0200

    dht debian2dsc: More robust handling of repacksuffixes
---
 scripts/debian2dsc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/debian2dsc b/scripts/debian2dsc
index da9505f..833e3be 100755
--- a/scripts/debian2dsc
+++ b/scripts/debian2dsc
@@ -83,10 +83,10 @@ do
 	UPSTREAM_DFSG=`echo $UPSTREAM_DFSG | cut -d: -f2-`
 	VERSION=`echo $VERSION | cut -d: -f2-`
     fi
-    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
+    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