[Pkg-octave-commit] rev 637 - in trunk/packages/octave/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2006-06-17 07:26:34 +0000 (Sat, 17 Jun 2006)
New Revision: 637

Added:
   trunk/packages/octave/debian/in/PACKAGE.conf
Removed:
   trunk/packages/octave/debian/octave.conf
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
   trunk/packages/octave/debian/rules
Log:
Debian release octave2.9_2.9.6-2


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-06-16 12:01:22 UTC (rev 636)
+++ trunk/packages/octave/debian/changelog	2006-06-17 07:26:34 UTC (rev 637)
@@ -1,3 +1,14 @@
+octave2.9 (2.9.6-2) unstable; urgency=low
+
+  * debian/in/PACKAGE.conf: Renamed from debian/octave.conf.  Contains
+    slice directives for initializing the Octave path differently
+    according to the branch: for 2.1, use the LOADPATH variable; for 2.9,
+    use the addpath function (closes: #373965)
+  * debian/control: Build-Depends on slice for doing the above
+  * debian/rules: Install $(PACKAGE).conf instead of octave.conf
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 17 Jun 2006 04:46:35 +0200
+
 octave2.9 (2.9.6-1) unstable; urgency=low
 
   [ Thomas Weber ]

Copied: trunk/packages/octave/debian/in/PACKAGE.conf (from rev 628, trunk/packages/octave/debian/octave.conf)
===================================================================
--- trunk/packages/octave/debian/octave.conf	2006-06-12 20:56:09 UTC (rev 628)
+++ trunk/packages/octave/debian/in/PACKAGE.conf	2006-06-17 07:26:34 UTC (rev 637)
@@ -0,0 +1,12 @@
+## System-wide startup file for Octave.
+##
+## This file should contain any commands that should be executed each
+## time Octave starts for every user at this site.
+
+## On a Debian GNU/Linux system, Octave also searches for local files and
+## directories below /usr/local/share/octave/site-m/.  Please see the Octave
+## documentation for other variables you might want to set here.
+
+[V_2_1:LOADPATH = ":/usr/local/share/octave/site-m//", LOADPATH ];:]
+[V_2_9:addpath (genpath ("/usr/local/share/octave/site-m"), "-begin");:]
+

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2006-06-16 12:01:22 UTC (rev 636)
+++ trunk/packages/octave/debian/in/control	2006-06-17 07:26:34 UTC (rev 637)
@@ -8,7 +8,7 @@
  libhdf5-serial-dev (>= 1.6.5) | libhdf5-lam-dev (>= 1.6.5)
  | libhdf5-mpich-dev (>= 1.6.5), refblas3-dev | atlas3-base-dev,
  lapack3-dev | atlas3-base-dev, gnuplot, fftw3-dev, dejagnu, texi2html,
- less, dpatch[V_2_9:, glpk, libglpk0, libufsparse-dev:]
+ less, dpatch, slice[V_2_9:, glpk, libglpk0, libufsparse-dev:]
 Standards-Version: 3.7.2
 
 Package: octave[V_2_1:2.1:][V_2_9:2.9:]

Deleted: trunk/packages/octave/debian/octave.conf

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-06-16 12:01:22 UTC (rev 636)
+++ trunk/packages/octave/debian/rules	2006-06-17 07:26:34 UTC (rev 637)
@@ -99,6 +99,7 @@
 	done
 	cp debian/in/$(PACKAGE)-00list debian/patches/00list
 	cp debian/in/$(PACKAGE)-watch debian/watch
+	slice -o $(sliceterm):debian/$(PACKAGE).conf debian/in/PACKAGE.conf
 
 get-orig-source: upstream
 upstream:
@@ -284,7 +285,7 @@
 	rm -r $(debtmp)/usr/include
 	rm -rf $(debtmp)/usr/share/info
 
-	install -p -m 0644  debian/octave.conf  $(debtmp)/etc/$(PACKAGE).conf
+	install -p -m 0644  debian/$(PACKAGE).conf  $(debtmp)/etc
 
         # install lintian overrride
 	install -p -m 0644  debian/$(PACKAGE).lintian \