[osmosis] 01/03: Fix malformed opts=... in watchfile.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmosis.

commit 644ea1ec12c30d2e34fe209c348147a492e057d6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 30 14:06:59 2015 +0200

    Fix malformed opts=... in watchfile.
---
 debian/changelog | 6 ++++++
 debian/watch     | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3dcd553..3313e17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmosis (0.43.1-6) UNRELEASED; urgency=medium
+
+  * Fix malformed opts=... in watchfile.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 30 May 2015 14:05:38 +0200
+
 osmosis (0.43.1-5) unstable; urgency=medium
 
   * Don't compress SQL examples to allow piping into psql with just cat.
diff --git a/debian/watch b/debian/watch
index c678a64..55ccbb2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
 version=3
-opts="dversionmangle=s/\+ds\d+$//,filenamemangle=s/(?:.*)?v?(\d[\d\.]*)\.tar\.gz/osmosis-$1.tar.gz/"
-  https://github.com/openstreetmap/osmosis/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+filenamemangle=s/(?:.*)?v?(\d[\d\.]*)\.tar\.gz/osmosis-$1.tar.gz/ \
+https://github.com/openstreetmap/osmosis/tags \
+(?:.*/)?v?(\d[\d\.]*)\.tar\.gz

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