r44734 - in /packages/sundials/trunk/debian: changelog control octave-sundials.install rules

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

Author: trophime-guest
Date: Mon Apr 23 11:09:46 2012
New Revision: 44734

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44734
Log:
closes 668830

Modified:
    packages/sundials/trunk/debian/changelog
    packages/sundials/trunk/debian/control
    packages/sundials/trunk/debian/octave-sundials.install
    packages/sundials/trunk/debian/rules

Modified: packages/sundials/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/changelog?rev=44734&op=diff
==============================================================================
--- packages/sundials/trunk/debian/changelog (original)
+++ packages/sundials/trunk/debian/changelog Mon Apr 23 11:09:46 2012
@@ -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.

Modified: packages/sundials/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/control?rev=44734&op=diff
==============================================================================
--- packages/sundials/trunk/debian/control (original)
+++ packages/sundials/trunk/debian/control Mon Apr 23 11:09:46 2012
@@ -4,7 +4,6 @@
 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)

Modified: packages/sundials/trunk/debian/octave-sundials.install
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/octave-sundials.install?rev=44734&op=diff
==============================================================================
--- packages/sundials/trunk/debian/octave-sundials.install (original)
+++ packages/sundials/trunk/debian/octave-sundials.install Mon Apr 23 11:09:46 2012
@@ -1,2 +1,2 @@
-usr/share/octave/packages
-usr/lib/octave/packages
+usr/share/octave/
+usr/lib/*/octave/

Modified: packages/sundials/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/rules?rev=44734&op=diff
==============================================================================
--- packages/sundials/trunk/debian/rules (original)
+++ packages/sundials/trunk/debian/rules Mon Apr 23 11:09:46 2012
@@ -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