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

[Rafael Laboissiere]

Author: rafael
Date: 2006-06-27 19:16:44 +0000 (Tue, 27 Jun 2006)
New Revision: 642

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

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-06-17 09:04:17 UTC (rev 641)
+++ trunk/packages/octave/debian/changelog	2006-06-27 19:16:44 UTC (rev 642)
@@ -1,3 +1,13 @@
+octave2.9 (2.9.6-3) unstable; urgency=low
+
+  * debian/in/PACKAGE.conf: Added code for removing all the directories
+    containing octave-forge .m scripts.  This allows octave2.9 and
+    octave-forge to be installed together and avoids errors in octave2.9
+    such as etime calling an outdated datenum function from octave-forge
+    (closes: #375646).
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 27 Jun 2006 16:57:16 +0200
+
 octave2.9 (2.9.6-2) unstable; urgency=low
 
   * debian/in/PACKAGE.conf: Renamed from debian/octave.conf.  Contains

Modified: trunk/packages/octave/debian/in/PACKAGE.conf
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE.conf	2006-06-17 09:04:17 UTC (rev 641)
+++ trunk/packages/octave/debian/in/PACKAGE.conf	2006-06-27 19:16:44 UTC (rev 642)
@@ -1,12 +1,36 @@
-## 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.
+### 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.
+### 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");:]
+[V_2_1:
+LOADPATH = ":/usr/local/share/octave/site-m//", LOADPATH ];
+:]
 
+[V_2_9:
+### Use new style of path generation
+
+addpath (genpath ("/usr/local/share/octave/site-m"), "-begin");
+
+### We use a function below to avoid polutting the user space with ###
+### Debian start-up specific variables.  Also, the function itself is
+### cleared after being called. 
+
+function debian_remove_octave_forge 
+  p = split (path (), ":");
+  for i = 1 : rows (p)
+    if ! isempty (findstr (p (i, :), "octave-forge"))
+      rmpath (deblank (p (i, :)));
+    endif
+  endfor
+endfunction
+
+debian_remove_octave_forge ();
+
+clear debian_remove_octave_forge;
+:]
+

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-06-17 09:04:17 UTC (rev 641)
+++ trunk/packages/octave/debian/rules	2006-06-27 19:16:44 UTC (rev 642)
@@ -199,7 +199,8 @@
 		scripts/autom4te.cache config.log Makefrag.f77		\
 		src/PKG_ADD src/pic src/*.oct src/*.df doc/*/HTML	\
 		examples/octave.desktop scripts/*/PKG_ADD		\
-		test/test_sparse.m doc/interpreter/munge-texi
+		test/test_sparse.m doc/interpreter/munge-texi		\
+		run-octave
 	find doc -name \*.html -exec rm -f \{} \;
 	find doc -name HTML -exec rm -rf \{} \;