r36818 - in /packages/sundials/trunk/debian: README.source changelog orig-tarball.sh rules watch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Aug 16 11:39:34 2010
New Revision: 36818

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36818
Log:
remove pdf files from the orig tarball

Modified:
    packages/sundials/trunk/debian/README.source
    packages/sundials/trunk/debian/changelog
    packages/sundials/trunk/debian/orig-tarball.sh
    packages/sundials/trunk/debian/rules
    packages/sundials/trunk/debian/watch

Modified: packages/sundials/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/README.source?rev=36818&op=diff
==============================================================================
--- packages/sundials/trunk/debian/README.source (original)
+++ packages/sundials/trunk/debian/README.source Mon Aug 16 11:39:34 2010
@@ -5,4 +5,5 @@
 `/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

Modified: packages/sundials/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/changelog?rev=36818&op=diff
==============================================================================
--- packages/sundials/trunk/debian/changelog (original)
+++ packages/sundials/trunk/debian/changelog Mon Aug 16 11:39:34 2010
@@ -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

Modified: packages/sundials/trunk/debian/orig-tarball.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/orig-tarball.sh?rev=36818&op=diff
==============================================================================
--- packages/sundials/trunk/debian/orig-tarball.sh (original)
+++ packages/sundials/trunk/debian/orig-tarball.sh Mon Aug 16 11:39:34 2010
@@ -6,4 +6,4 @@
 
 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

Modified: packages/sundials/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/rules?rev=36818&op=diff
==============================================================================
--- packages/sundials/trunk/debian/rules (original)
+++ packages/sundials/trunk/debian/rules Mon Aug 16 11:39:34 2010
@@ -21,7 +21,8 @@
 
 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
@@ -29,16 +30,6 @@
 	mkdir -p $(debusr)/lib
 	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 @@
 	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)
+	

Modified: packages/sundials/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/watch?rev=36818&op=diff
==============================================================================
--- packages/sundials/trunk/debian/watch (original)
+++ packages/sundials/trunk/debian/watch Mon Aug 16 11:39:34 2010
@@ -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