[sundials] 09/76: remove pdf files from the orig tarball

[Andreas Tille]

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

tille pushed a commit to branch master
in repository sundials.

commit d62c0a1a097dfb628fbd32b0cfb1a7a5265593ea
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Date:   Mon Aug 16 11:39:34 2010 +0000

    remove pdf files from the orig tarball
---
 debian/README.source   |  3 ++-
 debian/changelog       |  9 +++++++++
 debian/orig-tarball.sh |  2 +-
 debian/rules           | 25 ++++++++++++++-----------
 debian/watch           |  2 +-
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 7aa58c7..94c2cb7 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -5,4 +5,5 @@ Packaging makes use of CDBS and quilt. For the latter see
 `/usr/share/doc/quilt/README.source'.
 
 Documentation files included in the distribution have been removed
-You can find sundials documentation on https://computation.llnl.gov/casc/sundials/documentation/documentation.html
+You can find sundials documentation on 
+https://computation.llnl.gov/casc/sundials/documentation/documentation.html
diff --git a/debian/changelog b/debian/changelog
index ad0bff1..5a31e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sundials (2.4.0.dfsg-3.1) unstable; urgency=low
+
+  * Non Maintainer upload
+  * Remove pdf from the orig tarball
+  * debian/rules: modify get-orig-rules target to remove pdf from the orig tarball
+  * debian/orig-tarball.sh: change to force download to tarballs directory
+  
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Mon, 16 Aug 2010 13:09:13 +0200
+
 sundials (2.4.0-2) unstable; urgency=low
 
   * debian/rules: remove pdf documentation files from orig tarball
diff --git a/debian/orig-tarball.sh b/debian/orig-tarball.sh
index 1827ff5..5d21219 100644
--- a/debian/orig-tarball.sh
+++ b/debian/orig-tarball.sh
@@ -6,4 +6,4 @@ VER=$2
 
 URL=https://computation.llnl.gov/casc/sundials/download/code/$PKG-$VER.tar.gz
 
-wget $URL --output-document=../${PKG}_$VER.orig.tar.gz
+wget $URL --output-document=../tarballs/${PKG}_$VER.orig.tar.gz
diff --git a/debian/rules b/debian/rules
index a0b999f..0499803 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,8 @@ DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
 
 DEB_COMPRESS_EXCLUDE = .c .out .f
 
-USCAN_DESTDIR := $(CURDIR)
+USCAN_DESTDIR := $(CURDIR)/../tarballs
+DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 
 # The following hack is necessary because the upstream makefiles do
 # not install $libdir and $includedir or $mandir
@@ -30,16 +31,6 @@ common-install-prehook-impl::
 	mkdir -p $(debusr)/include
 	mkdir -p $(debusr)/share/man/man1
 
-get-orig-source:
-	wget -O $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz \
-	     https://computation.llnl.gov/casc/sundials/download/code/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
-	tar zxvf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
-	find . -name \*.pdf | xargs rm
-	tar zcvf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-	rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-	rm -rf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz.*
-	
-
 build/libsundials-serial::
 	$(SHELL) debian/check.sh
 
@@ -56,3 +47,15 @@ clean::
 	find examples \
 	        -type f -a  \( -name \*.o -o -name \*.out \)	\
 		-a -exec rm -f \{\} \;
+
+get-orig-source:
+	mkdir -p $(USCAN_DESTDIR)
+	uscan --force-download  --no-symlink --verbose --destdir $(USCAN_DESTDIR)
+	tar -C $(USCAN_DESTDIR) -xzf $(USCAN_DESTDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz
+	rm -f $(USCAN_DESTDIR)/$(DEB_SOURCE_PACKAGE)*.tar.gz
+	find $(USCAN_DESTDIR)/$(DEB_SOURCE_PACKAGE)-$(DEB_STRIPPED_UPSTREAM_VERSION) -name \*.pdf | xargs rm
+	cd $(USCAN_DESTDIR) && GZIP=-9 tar -czf \
+	   $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+	   $(DEB_SOURCE_PACKAGE)-$(DEB_STRIPPED_UPSTREAM_VERSION)
+	rm -rf $(USCAN_DESTDIR)/$(DEB_SOURCE_PACKAGE)-$(DEB_STRIPPED_UPSTREAM_VERSION)
+	
diff --git a/debian/watch b/debian/watch
index f7c3d74..ad74a64 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts="filenamemangle=s/.*//" \
+opts="filenamemangle=s/.*//,dversionmangle=s/\.dfsg$//" \
 	http://computation.llnl.gov/casc/sundials/download/download.html \
 	.*'sundials-([\d.]+)'.* debian /bin/sh debian/orig-tarball.sh

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