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

[Rafael Laboissiere]

Author: rafael
Date: 2009-04-07 10:10:41 +0000 (Tue, 07 Apr 2009)
New Revision: 2786

Added:
   octave/trunk/debian/patches/fix-ascii-load.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Add patch for fixing loading of ascii files

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-04-06 19:26:01 UTC (rev 2785)
+++ octave/trunk/debian/changelog	2009-04-07 10:10:41 UTC (rev 2786)
@@ -14,6 +14,8 @@
       special dependencies on the GCC suite packages for the arm
       architecture.
     + Use viewsvn instead of wsvn in Vcs-Browser
+  * debian/patches/fix-ascii-load.dpatch: Add patch for fixing loading of
+    ascii files
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 05 Apr 2009 15:36:41 +0200
 

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-04-06 19:26:01 UTC (rev 2785)
+++ octave/trunk/debian/in/00list	2009-04-07 10:10:41 UTC (rev 2786)
@@ -6,6 +6,7 @@
 glpk-new-api.dpatch
 real-no-history.dpatch
 termios-h-check-3.0.dpatch
+fix-ascii-load.dpatch
 :][V_3_1:
 50_octave-bug-tempfile
 no_pdf_in_print.dpatch

Added: octave/trunk/debian/patches/fix-ascii-load.dpatch
===================================================================
--- octave/trunk/debian/patches/fix-ascii-load.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/fix-ascii-load.dpatch	2009-04-07 10:10:41 UTC (rev 2786)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## fix-ascii-load.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fix eating a whole line when only newline should be read. fixes
+## DP: broken ascii matrix loading.  Patch proposed by Benjamin Lindner in
+## DP: the bug-octave mailing list.
+
+ at DPATCH@
+# HG changeset patch
+# User Benjamin Lindner <lindnerb at users.sourceforge.net>
+# Date 1238948977 -7200
+# Node ID 7064e7eebb0abd101a7ae1337e8f9bd14680ca2e
+# Parent  ffb20e8faf5bfaff8cc6c22521c4a8fd36b2dcfb
+fix broken ascii loading
+
+diff -r ffb20e8faf5b -r 7064e7eebb0a src/ls-mat-ascii.cc
+--- a/src/ls-mat-ascii.cc	Sun Apr 05 18:05:33 2009 +0200
++++ b/src/ls-mat-ascii.cc	Sun Apr 05 18:29:37 2009 +0200
+@@ -84,7 +84,8 @@
+ 	  if (c == '\n' || c == '\r')
+ 	    {
+ 	      // Let skip_until_newline handle CR/LF issues...
+-	      skip_until_newline (is, false);
++	      is.putback (c);
++	      skip_preceeding_newline (is);
+ 	      break;
+ 	    }
+