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

[Rafael Laboissiere]

tags 514802 pending
thanks

Author: rafael
Date: 2009-02-13 19:55:21 +0000 (Fri, 13 Feb 2009)
New Revision: 2675

Added:
   octave/trunk/debian/patches/real-no-history.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Add patch for only saving history if Vsaving_history is true


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-13 18:44:23 UTC (rev 2674)
+++ octave/trunk/debian/changelog	2009-02-13 19:55:21 UTC (rev 2675)
@@ -3,6 +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.
 
  -- Rafael Laboissiere <rafael at debian.org>  Fri, 13 Feb 2009 19:52:37 +0100
 

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-02-13 18:44:23 UTC (rev 2674)
+++ octave/trunk/debian/in/00list	2009-02-13 19:55:21 UTC (rev 2675)
@@ -18,6 +18,7 @@
 no_pdf_in_print.dpatch
 dont_set_helvetica.dpatch
 glpk-new-api.dpatch
+real-no-history.dpatch
 :][V_3_1:
 50_octave-bug-tempfile
 no_pdf_in_print.dpatch

Added: octave/trunk/debian/patches/real-no-history.dpatch
===================================================================
--- octave/trunk/debian/patches/real-no-history.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/real-no-history.dpatch	2009-02-13 19:55:21 UTC (rev 2675)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## 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.
+
+ at DPATCH@
+--- octave3.0-3.0.4~rc3.orig/src/toplev.cc
++++ octave3.0-3.0.4~rc3/src/toplev.cc
+@@ -643,7 +643,8 @@
+ 
+       octave_history_write_timestamp ();
+ 
+-      command_history::clean_up_and_save ();
++      if (Vsaving_history)
++	command_history::clean_up_and_save ();
+ 
+       close_files ();
+