[SCM] thuban branch, master, updated. upstream/1.2.2-31-g356ea40

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit b25bdeb939e54786ccab3326774e317c0ad82e17
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Oct 1 16:38:39 2013 +0200

    Update watch file, handle common mistakes.

diff --git a/debian/changelog b/debian/changelog
index ae9836c..41a02af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
   * Use minimal dh rules with python2.
   * Move documentation into its own thuban-doc package.
   * List missing files after install.
+  * Update watch file, handle common mistakes.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/watch b/debian/watch
index 68e4320..a3762f8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://wald.intevation.org/frs?group_id=6 /frs/download.php/\d+/Thuban-([\d\.]+).tar.bz2
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+http://wald.intevation.org/frs?group_id=6 (?:.*/)?Thuban[_\-](\d+[\d\.]+)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

-- 
Yet another interactive geographic data viewer