[Plplot-cvs] SF.net SVN: plplot:[9831] trunk/debian

[<and...@us...>]

Revision: 9831
          http://plplot.svn.sourceforge.net/plplot/?rev=9831&view=rev
Author:   andrewross
Date:     2009-04-23 08:16:46 +0000 (Thu, 23 Apr 2009)

Log Message:
-----------
Backport svn fix for octave variable namespace clash from svn to the 
debian 5.9.2 package. Closes Debian bug report.

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/patches/series

Added Paths:
-----------
    trunk/debian/patches/15_octave-toggle-plplot-use.diff

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-23 07:59:38 UTC (rev 9830)
+++ trunk/debian/changelog	2009-04-23 08:16:46 UTC (rev 9831)
@@ -4,8 +4,11 @@
     remove lintian warning.
   * debian/control: Change section for libplplot9-java to match 
     override in debian archives. Fixes lintian warning
+  * debian/patches/15_octave-toggle-plplot-use.diff: 
+     New patch ported from upstream to fix namespace clash in the
+     toggle_plplot_use.m script. (closes: #525198)
 
- -- Andrew Ross <and...@us...>  Thu, 16 Apr 2009 15:16:07 +0100
+ -- Andrew Ross <and...@us...>  Thu, 23 Apr 2009 09:13:07 +0100
 
 plplot (5.9.2-3) UNRELEASED; urgency=low
 

Added: trunk/debian/patches/15_octave-toggle-plplot-use.diff
===================================================================
--- trunk/debian/patches/15_octave-toggle-plplot-use.diff	                        (rev 0)
+++ trunk/debian/patches/15_octave-toggle-plplot-use.diff	2009-04-23 08:16:46 UTC (rev 9831)
@@ -0,0 +1,20 @@
+# Patch from upstream svn to rename the variable i to use_plplot_i in 
+# the toggle_plplot_use script to prevent namespace clash with the 
+# octave constant i = sqrt(-1).
+
+diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/toggle_plplot_use.m plplot-5.9.2/bindings/octave/PLplot/toggle_plplot_use.m
+--- plplot-5.9.2-orig/bindings/octave/PLplot/toggle_plplot_use.m	(revision 9829)
++++ plplot-5.9.2/bindings/octave/PLplot/toggle_plplot_use.m	(working copy)
+@@ -33,9 +33,9 @@
+ 
+ use_plplot_path = plplot_octave_path;
+ plplot_path_to_remove = split(genpath(use_plplot_path),pathsep);
+-for i=1:size(plplot_path_to_remove)(1)
+-  if (findstr(path,deblank(plplot_path_to_remove(i,:))) > 0)
+-    rmpath(deblank(plplot_path_to_remove(i,:)));
++for use_plplot_i=1:size(plplot_path_to_remove)(1)
++  if (findstr(path,deblank(plplot_path_to_remove(use_plplot_i,:))) > 0)
++    rmpath(deblank(plplot_path_to_remove(use_plplot_i,:)));
+   endif
+ endfor
+ 


Property changes on: trunk/debian/patches/15_octave-toggle-plplot-use.diff
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-04-23 07:59:38 UTC (rev 9830)
+++ trunk/debian/patches/series	2009-04-23 08:16:46 UTC (rev 9831)
@@ -4,3 +4,4 @@
 11_minus-sign-manpage.diff
 13_fix-kfreeBSD-build.diff
 14_octave-3.0-fixes.diff
+15_octave-toggle-plplot-use.diff


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.