[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, debian, updated. upstream/2.2.1+dfsg-129-g86b8a8e

[Russ Allbery]

The following commit has been merged in the debian branch:
commit eea70e5dabf844008e065b7eed802ed0859d7540
Author: Russ Allbery <rra at debian.org>
Date:   Tue Nov 10 14:58:03 2009 -0800

    Fix watch file for the new version mangling

diff --git a/debian/changelog b/debian/changelog
index fb94486..8a252eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ shibboleth-sp2 (2.3+dfsg-1) UNRELEASED; urgency=low
       abused for script injection and other cross-site scripting attacks.
       The complete fix also requires newer xmltooling and opensaml2
       packages.  (Closes: #555608, CVE-2009-3300)
+  * Fix watch file for the new version mangling.
 
   [ Ferenc Wagner ]
   * Run shibd as non-root.
diff --git a/debian/watch b/debian/watch
index cd40f10..12dfb23 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=dversionmangle=s/\.dfsg\d+$// \
+opts=dversionmangle=s/\+dfsg\d*$// \
     http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/(2[\d.]+)/ \
     shibboleth-(?:sp-)?([\d.]+)\.tar\.gz

-- 
Debian packaging for the 2.0 Apache Shibboleth SP