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

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-13 21:37:16 +0000 (Fri, 13 Feb 2009)
New Revision: 2676

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/patches/real-no-history.dpatch
Log:
Adjust the real-no-history patch to avoid reading history if -H option is given


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-13 19:55:21 UTC (rev 2675)
+++ octave/trunk/debian/changelog	2009-02-13 21:37:16 UTC (rev 2676)
@@ -3,9 +3,9 @@
   * debian/in/PACKAGE.postinst: Rebuild the pkg database at configure
     action, such that the octave_packages is guaranteed to exist when
     octaveX.Y is installed
-  * debian/patches/real-no-history.dpatch: Add patch for only saving
-    history if Vsaving_history is true.  Thanks to John Eaton for the
-    patch.  Closes: #514802.
+  * debian/patches/real-no-history.dpatch: Add patch for only reading and
+    saving history if Vsaving_history is true.  Thanks to John Eaton for
+    the patch and the suggestions.  Closes: #514802.
 
  -- Rafael Laboissiere <rafael at debian.org>  Fri, 13 Feb 2009 19:52:37 +0100
 

Modified: octave/trunk/debian/patches/real-no-history.dpatch
===================================================================
--- octave/trunk/debian/patches/real-no-history.dpatch	2009-02-13 19:55:21 UTC (rev 2675)
+++ octave/trunk/debian/patches/real-no-history.dpatch	2009-02-13 21:37:16 UTC (rev 2676)
@@ -3,7 +3,7 @@
 ## real-no-history.dpatch by Rafael Laboissiere <rafael at debian.org>
 ##
 ## DP: Only save history if Vsaving_history is true.  Thanks to John Eaton
-## DP: for the patch.  Closes Bug#514802.
+## DP: for the patch and the comments.  Closes Bug#514802.
 
 @DPATCH@
 --- octave3.0-3.0.4~rc3.orig/src/toplev.cc
@@ -18,3 +18,15 @@
  
        close_files ();
  
+--- octave3.0-3.0.4~rc3.orig/src/oct-hist.cc
++++ octave3.0-3.0.4~rc3/src/oct-hist.cc
+@@ -534,7 +534,8 @@
+   command_history::set_file (Vhistory_file);
+   command_history::set_size (Vhistory_size);
+ 
+-  command_history::read (false);
++  if (Vsaving_history)
++    command_history::read (false);
+ }
+ 
+ void