[pktools] 02/07: Handle common watch file issues, don't match pktools-latest.tar.gz.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository pktools.

commit e0ca17447711b127f15c2041fa5ce3a4d427f70e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 8 00:00:05 2014 +0200

    Handle common watch file issues, don't match pktools-latest.tar.gz.
---
 debian/changelog | 4 ++++
 debian/watch     | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8af37c6..e140abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 pktools (2.5.2+20140505-2) UNRELEASED; urgency=medium
 
+  [ Ross Gammon ]
   * Team upload.
   * Support for hfd5 transition to v1.8.13.
     Thanks to Gilles Filippini (Closes: #756707)
 
+  [ Bas Couwenberg ]
+  * Handle common watch file issues, don't match pktools-latest.tar.gz.
+
  -- Ross Gammon <rossgammon at mail.dk>  Mon, 04 Aug 2014 23:29:02 +0200
 
 pktools (2.5.2+20140505-1) unstable; urgency=low
diff --git a/debian/watch b/debian/watch
index 9418684..f881dba 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,8 +1,4 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
 # Compulsory line, this is a version 3 file
 version=3
-http://download.savannah.gnu.org/releases/pktools/ pktools-(.*)\.tar\.gz
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb|\d+)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+http://download.savannah.gnu.org/releases/pktools/ (?:|.*/)pktools(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

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