[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.2+dfsg-1-21-gf016e47

[Russ Allbery]

The following commit has been merged in the master branch:
commit d79500ebb571cc813c4d925f27df2a5ef9a3e9db
Author: Russ Allbery <rra at debian.org>
Date:   Mon Jul 25 16:06:13 2011 -0700

    Update debian/{watch,rules} for the new distribution location

diff --git a/debian/changelog b/debian/changelog
index e7f30b9..d8eb6e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 shibboleth-sp2 (2.4.2+dfsg-3) UNRELEASED; urgency=low
 
   * Include <cstddef> instead of <stddef.h>, following upstream.
+  * Update debian/watch and debian/rules for the new upstream distribution
+    location.
 
  -- Russ Allbery <rra at debian.org>  Mon, 16 May 2011 16:27:27 -0700
 
diff --git a/debian/rules b/debian/rules
index 44dc1ee..d5d1160 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ endif
 DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \
 		| cut -d- -f1)
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
-URL      = http://shibboleth.internet2.edu/downloads/shibboleth/cppsp
+URL      = http://www.shibboleth.net/downloads/service-provider/
 
 # Download the upstream source and do the repackaging that we have to do for
 # DFSG reasons.  Depends on wget.
diff --git a/debian/watch b/debian/watch
index 532bdc2..7465804 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 opts=dversionmangle=s/\+dfsg\d*$// \
-    http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/ \
+    http://www.shibboleth.net/downloads/service-provider/latest/ \
     shibboleth-sp-([\d.]+)\.tar\.gz

-- 
Debian packaging for the 2.0 Apache Shibboleth SP