[superlu] 02/05: use uscan to generate the dfsg tarball

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository superlu.

commit 61fe444c0029d5e7dfe3622fbc154e4d3da14756
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat May 21 00:04:42 2016 +0800

    use uscan to generate the dfsg tarball
    
    debian/rules get-orig-source: uscan --repack regenerates the upstream
    tarball.
    
    The debian/copyright Files-Excluded field defines which files to remove
    from the tarball (identifies DFSG non-free files).
    
    debian/watch controls the repackaged tarball's name
    
    Use the default uscan destination directory, which is ../
---
 debian/copyright |  4 +++-
 debian/rules     | 17 ++---------------
 debian/watch     |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9ea3fe2..2471471 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,9 @@ Upstream-Name: SuperLU
 Upstream-Contact: xsli at lbl.gov
 Source: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
  The following non-free files were removed from the upstream tarball:
- SRC/mc64ad.c SRC/mc64ad.f.bak MATLAB/spypart.m MATLAB/time.m
+Files-Excluded: SRC/mc64ad.*
+                MATLAB/spypart.m MATLAB/time.m
+                DOC/*.pdf
 
 Files: *
 Copyright: 2003, The Regents of the University of California, through Lawrence
diff --git a/debian/rules b/debian/rules
index edc5ba6..1a60736 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,20 +21,7 @@ override_dh_auto_configure:
 DEB_SOURCE_PACKAGE = superlu
 DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/+dfsg.*$$//p')
-USCAN_DESTDIR := $(CURDIR)
 
 get-orig-source:
-	uscan --force-download --verbose --check-dirname-level 0 --destdir $(USCAN_DESTDIR) --download-version $(DEB_STRIPPED_UPSTREAM_VERSION) --upstream-version $(DEB_STRIPPED_UPSTREAM_VERSION) ; \
-	set -ex ;
-	test -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig && rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
-	TMPDIR=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig; \
-	mkdir $$TMPDIR; \
-	cp $(USCAN_DESTDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz "$$TMPDIR" ; \
-	tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz ; \
-	rm -f "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)*.tar.gz ; \
-	find "$$TMPDIR" -name \*.pdf | xargs rm ; \
-	rm -f "$$TMPDIR/SRC/mc64ad.c" "$$TMPDIR/SRC/mc64ad.f.bak" "$$TMPDIR/MATLAB/spypart.m" "$$TMPDIR/MATLAB/time.m"; \
-	tar -caf \
-	    $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.xz \
-	    $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
-	rm -rf "$$TMPDIR"
+	uscan --force-download --verbose --check-dirname-level 0 --download-version $(DEB_STRIPPED_UPSTREAM_VERSION) --upstream-version $(DEB_STRIPPED_UPSTREAM_VERSION) --repack --compression xz
+
diff --git a/debian/watch b/debian/watch
index db8f909..8b70587 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg1// \
+opts=dversionmangle=s/\+dfsg\d*$//,repacksuffix=+dfsg1 \
 http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/superlu.git