[osm2pgsql] 01/07: Support pre-releases in watch file.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository osm2pgsql.

commit 9955aa38254830f891ac048ad33b0629e5ec7613
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 11 09:49:54 2015 +0200

    Support pre-releases in watch file.
---
 debian/changelog | 6 ++++++
 debian/watch     | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec3c5bd..0782058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osm2pgsql (0.87.4-2) UNRELEASED; urgency=medium
+
+  * Support pre-releases in watch file.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 11 Jul 2015 09:49:39 +0200
+
 osm2pgsql (0.87.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/watch b/debian/watch
index 185f1dc..a7293b8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,7 @@
 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/,\
-filenamemangle=s/(?:.*?)?v?(\d[\d\.]*)\.tar\.gz/osm2pgsql-$1.tar.gz/ \
+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/ \
 https://github.com/openstreetmap/osm2pgsql/releases \
-(?:.*/)*(?:rel|v|osm2pgsql|)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+(?:.*/)*(?: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