[proj] 01/01: Update watch file, handle common problems.

[Bas Couwenberg]

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

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

commit 26c502417a98fce85864d308cd510f95792e3af3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Apr 13 00:07:25 2014 +0200

    Update watch file, handle common problems.
---
 debian/changelog | 1 +
 debian/watch     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f0e85c..89c38d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ proj (4.8.0-3~exp1) experimental; urgency=low
     (closes: #293803)
   * Update copyright file using copyright-format 1.0.
   * Bump Standards-Version to 3.9.5, changes: Vcs-* fields, symbols, copyright.
+  * Update watch file, handle common problems.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 12 Apr 2014 21:02:49 +0200
 
diff --git a/debian/watch b/debian/watch
index c634656..4110b5a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 # Compulsory line, this is a version 3 file
 version=3
-ftp://ftp.remotesensing.org/proj/proj-([\d\.]+).tar.gz	debian	uupdate
-
-
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|b|beta|a|alpha)\d*)$/$1~$2/ \
+http://download.osgeo.org/proj/ (?:.*/)?proj[\-\_](\d+[\.\d+]+(?:[a-zA-Z]+\d+)?)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \
+debian	uupdate

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