[shibboleth-sp2] 03/05: Move repacking options into the watch file

[Ferenc Wágner]

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

wferi pushed a commit to branch debian/master
in repository shibboleth-sp2.

commit 68b792bb371d07764418960a5f20bfba81357227
Author: Ferenc Wágner <wferi at debian.org>
Date:   Mon Nov 20 11:53:03 2017 +0100

    Move repacking options into the watch file
    
    We have to resort to unconditional repacking to be able to change
    the compression scheme.  However, mk-origtargz will warn if the
    file exclusion pattern does not match, so we can disable repacking
    whenever it gets unnecessary for DFSG reasons.
---
 debian/rules | 6 ------
 debian/watch | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 27d3b52..403fc95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,6 @@ else
     remove-service = shibd-systemd
 endif
 
-# Download the upstream source and do the repackaging that we have to do for
-# 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:
-	uscan --repack --compression=xz --destdir='$(CURDIR)'
-
 %:
 	dh $@ --parallel --with apache2,autoreconf,systemd
 
diff --git a/debian/watch b/debian/watch
index 7f0164f..5430095 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,8 @@
 version=3
 opts="dversionmangle=s/\+dfsg\d*$//,\
 repacksuffix=+dfsg1,\
+repack,\
+compression=xz,\
 pgpsigurlmangle=s/$/.asc/" \
     https://shibboleth.net/downloads/service-provider/latest/ \
     shibboleth-sp-([\d.]+)\.tar\.bz2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git