[Pkg-octave-commit] r2609 - in octave/trunk/debian: . in

[Thomas Weber]

Author: thomas-guest
Date: 2009-02-04 21:11:59 +0000 (Wed, 04 Feb 2009)
New Revision: 2609

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
Merge bug fix for 513576 into experimental branch

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-04 13:27:00 UTC (rev 2608)
+++ octave/trunk/debian/changelog	2009-02-04 21:11:59 UTC (rev 2609)
@@ -1,9 +1,14 @@
 octave3.0 (1:3.0.4~rc3-2) UNRELEASED; urgency=low
 
+  [ Rafael Laboissiere ]
   * debian/patches/glpk-new-api.dpatch: New patch to avoid calls to
     deprecated __glp_lib_* functions which are deprecated and have been
     removed for the GLPK public API since version 4.32 (closes: #514035)
 
+  [ Thomas Weber ]
+  * Let Octave provide the /usr/share/octave/packages/ directory (closes:
+    #513576) 
+
  -- Rafael Laboissiere <rafael at debian.org>  Wed, 04 Feb 2009 11:56:17 +0100
 
 octave3.0 (1:3.0.4~rc3-1) experimental; urgency=low

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2009-02-04 13:27:00 UTC (rev 2608)
+++ octave/trunk/debian/in/control	2009-02-04 21:11:59 UTC (rev 2609)
@@ -105,7 +105,7 @@
  gcc [!arm], gcc-4.1 [arm], g++ [!arm], g++-4.1 [arm],
  libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
  | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5) | libhdf5-openmpi-dev (>= 1.6.5),
- libblas-dev, liblapack-dev, libfftw3-dev,
+ libblas-dev, liblapack-dev, libfftw3-dev, libsuitesparse-dev
  f2c [m68k]
 Conflicts: octave-headers (<< 2.1)[V_3_0:, octave2.9-headers (<< 1:3):]
 Provides: octave-headers

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2009-02-04 13:27:00 UTC (rev 2608)
+++ octave/trunk/debian/rules	2009-02-04 21:11:59 UTC (rev 2609)
@@ -294,6 +294,7 @@
 		 $(debtmp)/usr/bin/octave-depends-$(version)
 	install --mode=644 debian/defs.make \
 		$(debtmp)/usr/share/octave/debian/defs.make-$(version)
+	install -d $(debtmp)/usr/share/octave/packages
 
 	(cd $(debtmp)/usr/share/man/man1; 				\
 		mv -v	octave.1	octave-$(version).1;    	\