[SCM] geos branch, master, updated. upstream/3.3.3-74-ga51e1cf

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit a51e1cfc04fd9307ec00a642fac1afb037697fac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 16 16:47:25 2013 +0200

    Update watch file, handle common mistakes.

diff --git a/debian/changelog b/debian/changelog
index d61c8c5..be10c76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ geos (3.3.9-1) unstable; urgency=low
   * Build-depend on autotools-dev so that the config.guess/config.sub update
     code in debian/rules works properly. Thanks Colin Watson for the patch!
     (closes: #726455)
+  * Update watch file, handle common mistakes.
 
  -- Markus Wanner <markus at bluegap.ch>  Wed, 02 Oct 2013 13:41:07 +0200
 
diff --git a/debian/watch b/debian/watch
index 5b0b08f..caf11f4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,5 @@
 version=3
-http://download.osgeo.org/geos/geos-([\d\.]+)\.tar\.bz2	debian	uupdate
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+http://download.osgeo.org/geos \
+(?:|.*/)geos-(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) \
+debian uupdate

-- 
Geometry engine for Geographic Information Systems