Bug#668830: [Pkg-octave-devel] sundials: Adjust for the new octave package version 3.6.1

[Rafael Laboissiere]

* Kamaraju Kusumanchi <kamaraju at gmail.com> [2012-04-14 14:20]:

> Source: sundials
> Version: 2.4.0-6
> Severity: important
> Tags: patch
> thanks
> 
> The current version of sundials in sid build-depends on octave-pkg-dev.
> This package will be removed from unstable once the transition to the
> new version of octave (currently 3.6.1) is completed

This statement is not accurate.  The octave-pkg-dev will not be removed
after the transition.  We will request the removal of the octave3.2*
packages instead.

> The attached patch makes the necessary changes regarding this. The
> patch is generated using the debdiff utility.

Your patch is generally fine.  Let me just suggest a improvement in
debian/rules: instead of hard-coding the version of octave in the
installation directory, just use the paths that Octave will recognize.
One can get them using the octave-config command.

There are two advantages in doing this.  First, the package will work out
of the box in Octave.  Second, there is no version number in the path and
this will not need changes when a new upstream version of Octave is
realeased.

You will find attached below the appropriate patch for debian/rules, as
well as for debian/octave-sundials.install.
 
Rafael
-------------- next part --------------
diff -u sundials-2.4.0/debian/rules sundials-2.4.0/debian/rules
--- sundials-2.4.0/debian/rules
+++ sundials-2.4.0/debian/rules
@@ -30,11 +30,9 @@
 USCAN_DESTDIR := $(CURDIR)/../tarballs
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 
-# 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)
+# Get the appropriate paths for the installation of the Octave files
+mpath = $(shell octave-config -p LOCALFCNFILEDIR)
+bpath = $(shell octave-config -p LOCALARCHLIBDIR)
 
 # The following hack is necessary because the upstream makefiles do
 # not install $libdir and $includedir or $mandir
diff -u sundials-2.4.0/debian/octave-sundials.install sundials-2.4.0/debian/octave-sundials.install
--- sundials-2.4.0/debian/octave-sundials.install
+++ sundials-2.4.0/debian/octave-sundials.install
@@ -1,2 +1,2 @@
-usr/share/octave/packages
-usr/lib/octave/packages
+usr/share/octave/
+usr/lib/*/octave/