r45457 - in /packages/nlopt/trunk/debian: changelog orig-tar.exclude orig-tar.sh rules watch

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

Author: trophime-guest
Date: Wed Dec 12 12:39:55 2012
New Revision: 45457

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45457
Log:
add repack
script (Sergey B Kirpichev)

Added:
    packages/nlopt/trunk/debian/orig-tar.exclude
    packages/nlopt/trunk/debian/orig-tar.sh
Modified:
    packages/nlopt/trunk/debian/changelog
    packages/nlopt/trunk/debian/rules
    packages/nlopt/trunk/debian/watch

Modified: packages/nlopt/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/changelog?rev=45457&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/changelog (original)
+++ packages/nlopt/trunk/debian/changelog Wed Dec 12 12:39:55 2012
@@ -22,8 +22,9 @@
     override disparity")
   * Cleanup debian/README.source
   * Update debian/libnlopt0.symbols for new release
+  * Drop get-orig-source target, repackage upstream tarball with uscan
 
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Wed, 12 Dec 2012 10:30:53 +0100
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Wed, 12 Dec 2012 13:30:53 +0100
 
 nlopt (2.2.4+dfsg-2) unstable; urgency=low
 

Added: packages/nlopt/trunk/debian/orig-tar.exclude
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/orig-tar.exclude?rev=45457&op=file
==============================================================================
--- packages/nlopt/trunk/debian/orig-tar.exclude (added)
+++ packages/nlopt/trunk/debian/orig-tar.exclude Wed Dec 12 12:39:55 2012
@@ -1,0 +1,4 @@
+luksan/v999-07.pdf
+stogo/paper.pdf
+stogo/techreport.pdf
+direct/userguide.pdf

Added: packages/nlopt/trunk/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/orig-tar.sh?rev=45457&op=file
==============================================================================
--- packages/nlopt/trunk/debian/orig-tar.sh (added)
+++ packages/nlopt/trunk/debian/orig-tar.sh Wed Dec 12 12:39:55 2012
@@ -1,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+PKG=nlopt
+DIR=$PKG-$2
+TAR=../${PKG}_$2+dfsg.orig.tar.gz
+
+# clean up the upstream tarball
+tar xvf $3
+tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]
+then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi
+
+exit 0

Modified: packages/nlopt/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/rules?rev=45457&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/rules (original)
+++ packages/nlopt/trunk/debian/rules Wed Dec 12 12:39:55 2012
@@ -89,17 +89,3 @@
 	done
 	dh_link
 
-
-# Grab the version before +dfsg
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
-get-orig-source:
-	uscan --noconf --force-download --rename --download-current-version --destdir=.
-	rm -rf nlopt-$(DEB_UPSTREAM_VERSION)
-	tar -xf nlopt_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	rm nlopt_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	find nlopt-$(DEB_UPSTREAM_VERSION) -name \*.pdf | xargs rm
-	mv nlopt-$(DEB_UPSTREAM_VERSION) nlopt-$(DEB_UPSTREAM_VERSION).orig
-	GZIP=--best tar -cz --owner root --group root --mode a+rX \
-			-f nlopt_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz \
-			nlopt-$(DEB_UPSTREAM_VERSION).orig
-	rm -r nlopt-$(DEB_UPSTREAM_VERSION).orig

Modified: packages/nlopt/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/watch?rev=45457&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/watch (original)
+++ packages/nlopt/trunk/debian/watch Wed Dec 12 12:39:55 2012
@@ -1,3 +1,4 @@
 version=3
 opts=dversionmangle=s/\+dfsg$// \
-    http://ab-initio.mit.edu/wiki/index.php/NLopt .*/nlopt-(.*)\.tar\.gz
+    http://ab-initio.mit.edu/wiki/index.php/NLopt .*/nlopt-(.*)\.tar\.gz \
+    debian debian/orig-tar.sh