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

[Rafael Laboissiere]

tags 520770 pending
thanks

Author: rafael
Date: 2009-03-22 17:02:04 +0000 (Sun, 22 Mar 2009)
New Revision: 2736

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE.conf
Log:
Use split for octave3.0 and strsplit for octave3.1

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-03-22 14:01:51 UTC (rev 2735)
+++ octave/trunk/debian/changelog	2009-03-22 17:02:04 UTC (rev 2736)
@@ -1,9 +1,9 @@
-octave3.1 (3.1.54-3) UNRELEASED; urgency=low
+octave3.0 (1:3.0.4~rc5-4) UNRELEASED; urgency=low
 
-  * debian/in/control: Add libarpack2-dev to the list of build
-    dependencies, which makes the eigs function available
+  * debian/in/PACKAGE.conf: Use split for octave3.0 and strsplit for
+    octave3.1 (closes: #520770)
 
- -- Rafael Laboissiere <rafael at debian.org>  Sun, 22 Mar 2009 11:08:14 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 22 Mar 2009 17:58:17 +0100
 
 octave3.0 (1:3.0.4~rc5-3) unstable; urgency=low
 

Modified: octave/trunk/debian/in/PACKAGE.conf
===================================================================
--- octave/trunk/debian/in/PACKAGE.conf	2009-03-22 14:01:51 UTC (rev 2735)
+++ octave/trunk/debian/in/PACKAGE.conf	2009-03-22 17:02:04 UTC (rev 2736)
@@ -42,10 +42,17 @@
 ### cleared after being called.
 
 function debian_remove_octave_forge
+:]:][V_3_0:
+  p = split (path (), ":");
+  for i = 1 : rows (p)
+    if ! isempty (findstr (p (i, :), "octave-forge"))
+      rmpath (deblank (p (i, :)));
+:][V_3_1:
   p = strsplit (path (), ":");
   for i = 1 : rows (p)
     if ! isempty (findstr (p{i}, "octave-forge"))
       rmpath (deblank (p{i}));
+:][V_3_1:[V_3_0:
     endif
   endfor
 endfunction