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

[Thomas Weber]

Author: thomas-guest
Date: 2009-04-10 13:48:54 +0000 (Fri, 10 Apr 2009)
New Revision: 2792

Removed:
   octave/trunk/debian/patches/fix-ascii-load.dpatch
Modified:
   octave/trunk/debian/in/00list
Log:
Remove patch fix-ascii-load.dpatch
Already in upstream's latest release


Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-04-08 21:49:39 UTC (rev 2791)
+++ octave/trunk/debian/in/00list	2009-04-10 13:48:54 UTC (rev 2792)
@@ -6,7 +6,6 @@
 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

Deleted: octave/trunk/debian/patches/fix-ascii-load.dpatch
===================================================================
--- octave/trunk/debian/patches/fix-ascii-load.dpatch	2009-04-08 21:49:39 UTC (rev 2791)
+++ octave/trunk/debian/patches/fix-ascii-load.dpatch	2009-04-10 13:48:54 UTC (rev 2792)
@@ -1,29 +0,0 @@
-#! /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;
- 	    }
-