[cpp-sp] 25/37: Simplify the get-orig-source target

[Scott Cantor]

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

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

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

commit cc7b5dd35730f1541e56151b2a5cc9438b12b3d8
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Fri Jan 22 23:28:39 2016 +0100

    Simplify the get-orig-source target
    
    Policy requires that the get-orig-source target can be invoked from any
    directory.  This was not the case and still isn't.  This target documents
    the usual options for uscan until we switch to watch file format 4, after
    which it can be removed.
---
 debian/rules | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/debian/rules b/debian/rules
index 36d1c5e..d26c4aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,24 +14,11 @@ else
     DEBUG =
 endif
 
-# These variables are used by get-orig-source
-DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \
-		| cut -d- -f1)
-VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
-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.
+# DFSG reasons.  Depends on devscripts.  Mostly a reminder until devscripts
+# version 2.15.10 enables setting these options in the watch file.
 get-orig-source:
-	wget $(URL)/$(VERSION)/shibboleth-sp-$(VERSION).tar.gz
-	tar xfz shibboleth-sp-$(VERSION).tar.gz
-	rm shibboleth-sp-$(VERSION).tar.gz
-	rm shibboleth-sp-$(VERSION)/schemas/WS-Trust.xsd
-	mv shibboleth-sp-$(VERSION) shibboleth-sp2_$(DEBVERS).orig
-	tar cf shibboleth-sp2_$(DEBVERS).orig.tar \
-	    shibboleth-sp2_$(DEBVERS).orig
-	rm -rf shibboleth-sp2_$(DEBVERS).orig
-	xz shibboleth-sp2_$(DEBVERS).orig.tar
+	uscan --repack --compression=xz --destdir='$(CURDIR)'
 
 %:
 	dh $@ --with apache2,autoreconf

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