[hdf5] 03/12: Yet another uscan files fix

[Gilles Filippini]

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

pini pushed a commit to branch master-1.10
in repository hdf5.

commit 29eb5eae2a26ab0b1ffffc77fd5ccab0fb8cbf80
Author: Gilles Filippini <pini at debian.org>
Date:   Fri Mar 18 23:47:59 2016 +0100

    Yet another uscan files fix
---
 debian/orig-tar.sh | 2 +-
 debian/watch       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 6bd543e..76ffab3 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -6,7 +6,7 @@
 set -e
 
 UPSTREAM_VERSION="$2"
-MANGLED_UPSTREAM_VERSION="$(echo "$UPSTREAM_VERSION" | sed 's/-\(alpha\|beta\)/~\1/')+docs"
+MANGLED_UPSTREAM_VERSION="$(echo "$UPSTREAM_VERSION" | sed 's/-\(alpha\|pre\)/~\1/')+docs"
 UPSTREAM_DOC_VERSION="${UPSTREAM_VERSION%-*}"
 if [ "$UPSTREAM_DOC_VERSION" = 1.10.0 ]; then
   UPSTREAM_DOC_VERSION=1.10
diff --git a/debian/watch b/debian/watch
index 975dfc0..5086a5f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=3
-opts="dversionmangle=s/\+docs\d*$//,uversionmangle=s/-(alpha|pre)/~\\1/" \
+opts="dversionmangle=s/\+docs\d*$//;s/~(alpha|pre)/-\\1/" \
 	ftp://ftp.hdfgroup.org/HDF5/releases/hdf5-(.*)/hdf5-(.*)/src/ \
 	hdf5-(.*).tar.gz \
 	debian debian/orig-tar.sh

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