[openstreetmap-carto] 01/01: Update watch file.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository openstreetmap-carto.

commit c281a14e0b924b7b5cf414c530b4c568dda950e3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 1 13:05:54 2015 +0200

    Update watch file.
    
    Changes:
    - Add common version mangling
    - Improve filename mangling
    - Support other tar extensions
---
 debian/changelog | 10 ++++++++++
 debian/watch     |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4e48b7..aab998c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openstreetmap-carto (2.29.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Update watch file, changes:
+    - Add common version mangling
+    - Improve filename mangling
+    - Support other tar extensions
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 01 Aug 2015 13:04:21 +0200
+
 openstreetmap-carto (2.29.1-1) unstable; urgency=low
 
   * Initial release (Closes: #744842)
diff --git a/debian/watch b/debian/watch
index cfebd9d..0f6bc5c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
 version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/openstreetmap-carto-$1\.tar\.gz/ \
-  https://github.com/gravitystorm/openstreetmap-carto/tags .*/?(\d\.\d{2}.\d)\.tar\.gz
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/-/./g,\
+filenamemangle=s/(?:.*)?(?:rel|v|openstreetmap-carto)[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/openstreetmap-carto-$1.$2/ \
+https://github.com/gravitystorm/openstreetmap-carto/tags \
+(?:.*/)?(?:rel|v|openstreetmap-carto)[\-\_]?(\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/openstreetmap-carto.git