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

[Russ Allbery]

The following commit has been merged in the debian branch:
commit 7d7e9803b6d0aae105970246b6354678297e084f
Author: Russ Allbery <rra at debian.org>
Date:   Mon Sep 7 14:33:28 2009 -0700

    Use the upstream version as the man page version
    
    * Use the automatically-extracted package version as the version number
      for the man pages.

diff --git a/debian/changelog b/debian/changelog
index aefc8e2..1a85fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ shibboleth-sp2 (2.2.1+dfsg-1) UNRELEASED; urgency=low
     get-orig-source from debian/changelog.
   * Update libapache2-mod-shib2's README.Debian for changes to the
     TestShib web pages.
+  * Use the automatically-extracted package version as the version number
+    for the man pages.
   * Update standards version to 3.8.3.
     - Create /var/run/shibboleth in the init script if it doesn't exist.
     - Don't ship /var/run/shibboleth in the package.
diff --git a/debian/rules b/debian/rules
index fa5e4bb..b37a9dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,19 +104,19 @@ install-stamp:
 	    $(CURDIR)/debian/libapache2-mod-shib2/usr/lib/apache2/modules
 	rm $(CURDIR)/debian/tmp/usr/lib/shibboleth/mod_shib_22.la
 	pod2man $(CURDIR)/debian/man-pages/mdquery.pod --section 1 \
-	    --center 'Shibboleth' --release 2.0 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man1/mdquery.1
 	pod2man $(CURDIR)/debian/man-pages/resolvertest.pod --section 1 \
-	    --center 'Shibboleth' --release 2.0 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man1/resolvertest.1
 	pod2man $(CURDIR)/debian/man-pages/shib-metagen.pod --section 1 \
-	    --center 'Shibboleth' --release 2.0 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man1/shib-metagen.1
 	pod2man $(CURDIR)/debian/man-pages/shib-keygen.pod --section 8 \
-	    --center 'Shibboleth' --release 2.0 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man8/shib-keygen.8
 	pod2man $(CURDIR)/debian/man-pages/shibd.pod --section 8 \
-	    --center 'Shibboleth' --release 2.0 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man8/shibd.8
 	dh_install -s -i --fail-missing
 	touch $@

-- 
Debian packaging for the 2.0 Apache Shibboleth SP