[Pkg-octave-commit] r2951 - octave-forge-pkgs/octave-ann/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2009-04-15 11:18:54 +0000 (Wed, 15 Apr 2009)
New Revision: 2951

Added:
   octave-forge-pkgs/octave-ann/trunk/debian/orig-tar.sh
Modified:
   octave-forge-pkgs/octave-ann/trunk/debian/README.source
   octave-forge-pkgs/octave-ann/trunk/debian/changelog
   octave-forge-pkgs/octave-ann/trunk/debian/watch
Log:
Strip ANN library sources from the upstream tarball

Create a debian/orig-tar.sh script that is launched from uscan, thanks to
the extra arguments in debian/watch.  The upstream part of the package
version has now +dfsg appended.  Everything is documented in README.source.

Modified: octave-forge-pkgs/octave-ann/trunk/debian/README.source
===================================================================
--- octave-forge-pkgs/octave-ann/trunk/debian/README.source	2009-04-15 10:40:54 UTC (rev 2950)
+++ octave-forge-pkgs/octave-ann/trunk/debian/README.source	2009-04-15 11:18:54 UTC (rev 2951)
@@ -1,9 +1,18 @@
-This package uses quilt to manage all modifications to the upstream sources.
-See `/usr/share/doc/quilt/README.source' to get more information on how to
-use it.
+This package uses quilt to manage all modifications to the upstream
+sources.  See `/usr/share/doc/quilt/README.source' to get more
+information on how to use it.
 
-The upstream package includes the ANN library sources but they are not used
-to generate the octave-ann binding.  Instead, the libann-dev package from
-Debian is used.
+The pristine upstream tarball includes the ANN library sources but
+they are not used to generate the octave-ann binding.  Instead, the
+libann-dev package from Debian is used.  Since this version of the
+upstream library sources has some DFSG issues, a reconstruction of the
+tarball was needed.
 
+In order to obtain the the "upstream" tarball used in Debian, run
+uscan inside the unpacked package directory.  The script
+debian/orig-tar.sh will strip the ANN sources from it.
+
+The upstream part of the version number of the Debian package is
+appended with "+dfsg", accordingly.
+
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:50:41 +0200

Modified: octave-forge-pkgs/octave-ann/trunk/debian/changelog
===================================================================
--- octave-forge-pkgs/octave-ann/trunk/debian/changelog	2009-04-15 10:40:54 UTC (rev 2950)
+++ octave-forge-pkgs/octave-ann/trunk/debian/changelog	2009-04-15 11:18:54 UTC (rev 2951)
@@ -1,4 +1,4 @@
-octave-ann (1.0.1-1) UNRELEASED; urgency=low
+octave-ann (1.0.1+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #480760)
 

Added: octave-forge-pkgs/octave-ann/trunk/debian/orig-tar.sh
===================================================================
--- octave-forge-pkgs/octave-ann/trunk/debian/orig-tar.sh	                        (rev 0)
+++ octave-forge-pkgs/octave-ann/trunk/debian/orig-tar.sh	2009-04-15 11:18:54 UTC (rev 2951)
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=ann-$2
+TAR=../octave-ann_$2+dfsg.orig.tar.gz
+
+# clean up the upstream tarball
+tar xfz $3
+rm -f $3
+( cd $DIR/src ;
+  rm -f $(ls | grep -v ann) ;
+  cd ann ;
+  rm -rf $(ls | grep -v bindings) )
+tar cfz $TAR $DIR
+rm -rf $DIR


Property changes on: octave-forge-pkgs/octave-ann/trunk/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: octave-forge-pkgs/octave-ann/trunk/debian/watch
===================================================================
--- octave-forge-pkgs/octave-ann/trunk/debian/watch	2009-04-15 10:40:54 UTC (rev 2950)
+++ octave-forge-pkgs/octave-ann/trunk/debian/watch	2009-04-15 11:18:54 UTC (rev 2951)
@@ -1,3 +1,5 @@
 version=3
-http://octave.sourceforge.net/packages.html \
-    http://downloads\.sourceforge\.net/octave/ann-([\d.]+)\.tar\.gz\?download
+opts=dversionmangle=s/\+dfsg//                          			\
+    http://octave.sourceforge.net/packages.html					\
+    http://downloads\.sourceforge\.net/octave/ann-([\d.]+)\.tar\.gz\?download	\
+    debian debian/orig-tar.sh