[cpp-sp] 02/40: Prepare for 2.2.1 packaging

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.2.1+dfsg-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=eee9a9708e44421598eb6b0aff7ea334a46e801f

commit eee9a9708e44421598eb6b0aff7ea334a46e801f
Author: Russ Allbery <rra at debian.org>
AuthorDate: Fri Aug 21 10:32:09 2009 -0700

    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.
---
 debian/changelog |  5 ++++-
 debian/rules     | 17 +++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da991b3..2343616 100644
--- 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
--- 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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.