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

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-06 10:07:54 +0000 (Fri, 06 Feb 2009)
New Revision: 2618

Added:
   octave/trunk/debian/patches/sane-file-stat-return.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Avoid random errors when calling fopen on non-existing files

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-05 09:23:55 UTC (rev 2617)
+++ octave/trunk/debian/changelog	2009-02-06 10:07:54 UTC (rev 2618)
@@ -1,3 +1,11 @@
+octave3.1 (3.1.51-4) UNRELEASED; urgency=low
+
+  * Synch with octave3.0.
+  * debian/patches/sane-file-stat-return.dpatch: Avoid random errors when
+    calling fopen on files that do not exist in the file system
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 04 Feb 2009 14:00:42 +0100
+
 octave3.0 (1:3.0.4~rc3-2) experimental; urgency=low
 
   [ Thomas Weber ]

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-02-05 09:23:55 UTC (rev 2617)
+++ octave/trunk/debian/in/00list	2009-02-06 10:07:54 UTC (rev 2618)
@@ -24,4 +24,5 @@
 dont_set_helvetica-3.1.dpatch
 suitesparse-3.2.0.dpatch
 glpk-new-api.dpatch
+sane-file-stat-return.dpatch
 :]

Added: octave/trunk/debian/patches/sane-file-stat-return.dpatch
===================================================================
--- octave/trunk/debian/patches/sane-file-stat-return.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/sane-file-stat-return.dpatch	2009-02-06 10:07:54 UTC (rev 2618)
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## sane-file-stat-return.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid calls to deprecated __glp_lib_* functions which are deprecated
+## DP: and have been removed for the GLPK public API since version 4.32.
+## DP:
+## DP: Adapted from the upstream changesets in:
+## DP: http://hg.savannah.gnu.org/hgweb/octave/rev/ddbe87599331
+## DP: http://hg.savannah.gnu.org/hgweb/octave/rev/6e9887f9cf9f
+## DP:
+## DP: # HG changeset patch
+## DP: # User John W. Eaton <jwe at octave.org>
+## DP: # Date 1233873504 18000
+## DP: # Node ID ddbe875993314945753a2b3fed6d75d2fa741e0a
+## DP: # Parent d7306ecd077a45c41801796e13ab791dcc630511
+## DP: base_file_stat::is_XXX: return false if object is not initialized
+## DP:
+## DP: # HG changeset patch                                     
+## DP: # User John W. Eaton <jwe at octave.org>                    
+## DP: # Date 1233880778 18000                                  
+## DP: # Node ID 6e9887f9cf9f646de4e166f3236279e106c071b0       
+## DP: # Parent ddbe875993314945753a2b3fed6d75d2fa741e0a        
+## DP: file-stat.cc: use EXISTS instead of OK in previuos change
+
+ at DPATCH@
+--- a/liboctave/file-stat.cc	Thu Feb 05 17:14:44 2009 -0500
++++ b/liboctave/file-stat.cc	Thu Feb 05 17:38:24 2009 -0500
+@@ -54,43 +54,43 @@
+ bool
+ file_stat::is_blk (void) const
+ {
+-  return is_blk (fs_mode);
++  return exists () && is_blk (fs_mode);
+ }
+ 
+ bool
+ file_stat::is_chr (void) const
+ {
+-  return is_chr (fs_mode);
++  return exists () && is_chr (fs_mode);
+ }
+ 
+ bool
+ file_stat::is_dir (void) const
+ { 
+-  return is_dir (fs_mode);
++  return exists () && is_dir (fs_mode);
+ }
+ 
+ bool
+ file_stat::is_fifo (void) const
+ { 
+-  return is_fifo (fs_mode);
++  return exists () && is_fifo (fs_mode);
+ }
+ 
+ bool
+ file_stat::is_lnk (void) const
+ { 
+-  return is_lnk (fs_mode);
++  return exists () && is_lnk (fs_mode);
+ }
+ 
+ bool
+ file_stat::is_reg (void) const
+ { 
+-  return is_reg (fs_mode);
++  return exists () && is_reg (fs_mode);
+ }
+ 
+ bool
+ file_stat::is_sock (void) const
+ { 
+-  return is_sock (fs_mode);
++  return exists () && is_sock (fs_mode);
+ }
+ 
+ bool