[SCM] mapserver branch, jessie, updated. upstream/6.4.0_rc1-159-g7312520

[Bas Couwenberg]

The following commit has been merged in the jessie branch:
commit 73125209752aa104ac62645caeacd98e18e2a828
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 26 20:09:09 2013 +0200

    Update watch file.

diff --git a/debian/changelog b/debian/changelog
index b8292f5..4b0cbae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ mapserver (6.4.0-3) UNRELEASED; urgency=low
     - libreadline-dev (no longer used),
     - libedit-dev (no longer used),
     - libepsilon-dev (no longer used),
+  * Update debian watch file:
+    - Drop uupdate action
+    - Handle common mistakes
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 26 Sep 2013 16:16:20 +0200
 
diff --git a/debian/watch b/debian/watch
index bf64116..23eac67 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=2
-http://download.osgeo.org/mapserver/ (?:.*/)?mapserver-?_?([\d+\.]+|\d+)\.tar.* 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/mapserver/ (?:.*/)?mapserver[\-\_](\d+[\.\d+]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Packaging for MapServer