r44735 - in /packages/nlopt/trunk/debian: octave-nlopt.install rules

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

Author: trophime-guest
Date: Mon Apr 23 11:10:54 2012
New Revision: 44735

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44735
Log:
prepare for octave 3.6

Modified:
    packages/nlopt/trunk/debian/octave-nlopt.install
    packages/nlopt/trunk/debian/rules

Modified: packages/nlopt/trunk/debian/octave-nlopt.install
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/octave-nlopt.install?rev=44735&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/octave-nlopt.install (original)
+++ packages/nlopt/trunk/debian/octave-nlopt.install Mon Apr 23 11:10:54 2012
@@ -1,3 +1,3 @@
-usr/share/octave/packages
-usr/lib/octave/packages
+usr/share/octave
+usr/lib/*/octave
 usr/share/lintian/overrides/octave-nlopt*

Modified: packages/nlopt/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/rules?rev=44735&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/rules (original)
+++ packages/nlopt/trunk/debian/rules Mon Apr 23 11:10:54 2012
@@ -5,9 +5,8 @@
 
 # The directories below are versioned.  We only support the packages for the
 # stable version of Octave
-octver = 3.2
-mpath = /usr/share/octave/packages/$(octver)
-bpath = /usr/lib/octave/packages/$(octver)
+mpath = $(shell octave-config -p LOCALFCNFILEDIR)
+bpath = $(shell octave-config -p LOCALARCHLIBDIR)
 
 BUILDDIR = $(CURDIR)/debian/build
 
@@ -61,11 +60,14 @@
 	dh_prep --exclude=debian/tmp
 	find . -name "*.pyc" -exec rm {} \;
 	#
+	#
+	dh_numpy
+	#
 	# Fix unstripped-binary-or-object
 	strip  --strip-unneeded $(CURDIR)/debian/tmp/usr/lib/libnlopt.so.0*
 	strip  --strip-unneeded $(CURDIR)/debian/tmp/usr/lib/libnlopt_guile.so.0.*
 	find $(CURDIR)/debian/tmp/usr/lib -name _\*.so | xargs strip --strip-unneeded 
-	strip  --strip-unneeded $(CURDIR)/debian/tmp/usr/lib/octave/packages/3.2/nlopt_optimize.oct
+	strip  --strip-unneeded $(CURDIR)/debian/tmp/$(bpath)/nlopt_optimize.oct
 	#
 	mkdir -p  $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
 	cp debian/octave-nlopt.lintian-overrides $(CURDIR)/debian/tmp/usr/share/lintian/overrides/octave-nlopt