[sundials] 21/76: closes 668830

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository sundials.

commit 0400f6b65f08d7bdc2b0388500bf4e741335a8e4
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Date:   Mon Apr 23 11:09:46 2012 +0000

    closes 668830
---
 debian/changelog               | 7 +++++++
 debian/control                 | 1 -
 debian/octave-sundials.install | 4 ++--
 debian/rules                   | 8 +++-----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59029f7..c81f41b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sundials (2.4.0-7) unstable; urgency=low
+
+  [Kamaraju Kusumanchi][Rafael Laboissiere]
+  * Adjust for the new octave package version 3.6.1 (closes: #668830)
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 23 Apr 2012 11:58:53 +0200
+
 sundials (2.4.0-6) unstable; urgency=low
 
   * Rebuild using the last version of hdf5.
diff --git a/debian/control b/debian/control
index 5f2208b..23d0edc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Section: libs
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>,
  Sylvestre Ledru <sylvestre at debian.org>
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7), autotools-dev, cdbs, quilt, gfortran, 
  libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so,
  octave-pkg-dev (>= 0.7.0)
diff --git a/debian/octave-sundials.install b/debian/octave-sundials.install
index cb00361..1c79c6a 100644
--- a/debian/octave-sundials.install
+++ b/debian/octave-sundials.install
@@ -1,2 +1,2 @@
-usr/share/octave/packages
-usr/lib/octave/packages
+usr/share/octave/
+usr/lib/*/octave/
diff --git a/debian/rules b/debian/rules
index 5ee9bdd..670bff6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,11 +30,9 @@ DEB_COMPRESS_EXCLUDE = .c .out .f
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sundials.git