[osm2pgsql] 02/07: Fix filenamemangle in watch file for non pre-releases.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit a2fb8276617e67b15c7bc60cc73d98481fe083db
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 15 08:00:34 2015 +0200

    Fix filenamemangle in watch file for non pre-releases.
---
 debian/changelog | 6 ++++++
 debian/watch     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d7e44b9..7b41eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osm2pgsql (0.88.0~rc1-1~exp2) UNRELEASED; urgency=medium
+
+  * Fix filenamemangle in watch file for non pre-releases.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 15 Jul 2015 08:00:05 +0200
+
 osm2pgsql (0.88.0~rc1-1~exp1) experimental; urgency=medium
 
   * Support pre-releases in watch file.
diff --git a/debian/watch b/debian/watch
index a7293b8..6d87e55 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,6 +2,6 @@ version=3
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/;s/RC/rc/,\
-filenamemangle=s/(?:.*?)?v?(\d[\d_\.\-\+]*((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*))\.tar\.gz/osm2pgsql-$1.tar.gz/ \
+filenamemangle=s/(?:.*?)?v?(\d[\d_\.\-\+]*((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)?)\.tar\.gz/osm2pgsql-$1.tar.gz/ \
 https://github.com/openstreetmap/osm2pgsql/releases \
 (?:.*/)*(?:rel|v|osm2pgsql|)[\-\_]?(\d\S*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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