[osmpbf] 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 debian
in repository osmpbf.

commit 5b66409bdba1dc29643ea3bfd128cf401b70058c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 29 23:08:01 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 ef64867..fcc5237 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmpbf (1.3.3-4) UNRELEASED; urgency=medium
+
+  * Fix malformed opts=... in watchfile.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 May 2015 23:06:54 +0200
+
 osmpbf (1.3.3-3) unstable; urgency=medium
 
   * Update watch file to use github tags instead of deprecated
diff --git a/debian/watch b/debian/watch
index fb012cd..51f89a6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
 version=3
-opts="filenamemangle=s/(?:.*)?v?(\d[\d\.]*)\.tar\.gz/OSM-binary-$1.tar.gz/"
- https://github.com/scrosby/OSM-binary/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/OSM-binary-$1.tar.gz/ \
+https://github.com/scrosby/OSM-binary/tags \
+(?:.*/)?v?(\d[\d\.]*)\.tar\.gz

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