Prepare for 2.2.1 packaging

Add initial changelog entry for 2.2.1.  Dynamically determine the Debian
and upstream package versions for get-orig-source from debian/changelog.

diff --git a/debian/changelog b/debian/changelog
index da991b3..2343616 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-shibboleth-sp2 (2.1.dfsg1-3) UNRELEASED; urgency=low
+shibboleth-sp2 (2.2.1+dfsg-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+  * Dynamically determine the Debian and upstream package versions for
+    get-orig-source from debian/changelog.
   * Update libapache2-mod-shib2's README.Debian for changes to the
     TestShib web pages.
 

diff --git a/debian/rules b/debian/rules
index fff2ec3..f9392e0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,10 @@ endif
 
 # These variable is used only by get-orig-source, which will normally only be
 # run by maintainers.
-VERSION = 2.1
-DEBVERS = dfsg1
-URL     = http://shibboleth.internet2.edu/downloads/shibboleth/cppsp
+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
 
 # Download the upstream source and do the repackaging that we have to do for
 # DFSG reasons.  Depends on wget.
@@ -37,11 +38,11 @@ get-orig-source:
        tar xfz shibboleth-sp-$(VERSION).tar.gz
        rm shibboleth-sp-$(VERSION).tar.gz
        rm shibboleth-$(VERSION)/schemas/WS-Trust.xsd
-       mv shibboleth-$(VERSION) shibboleth-sp2_$(VERSION).$(DEBVERS).orig
-       tar cf shibboleth-sp2_$(VERSION).$(DEBVERS).orig.tar \
-           shibboleth-sp2_$(VERSION).$(DEBVERS).orig
-       rm -r shibboleth-sp2_$(VERSION).$(DEBVERS).orig
-       gzip -9 shibboleth-sp2_$(VERSION).$(DEBVERS).orig.tar
+       mv shibboleth-$(VERSION) shibboleth-sp2_$(DEBVERS).orig
+       tar cf shibboleth-sp2_$(DEBVERS).orig.tar \
+           shibboleth-sp2_$(DEBVERS).orig
+       rm -r shibboleth-sp2_$(DEBVERS).orig
+       gzip -9 shibboleth-sp2_$(DEBVERS).orig.tar
 
 configure: configure-stamp
 configure-stamp: