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

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-19 00:18:34 +0000 (Thu, 19 Feb 2009)
New Revision: 2682

Added:
   octave/trunk/debian/patches/real-no-history-3.1.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Add patch

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-19 00:18:07 UTC (rev 2681)
+++ octave/trunk/debian/changelog	2009-02-19 00:18:34 UTC (rev 2682)
@@ -1,6 +1,8 @@
 octave3.1 (3.1.52-3) UNRELEASED; urgency=low
 
   * Sync with the stable branch
+  * debian/patches/real-no-history-3.1.dpatch: Add patch from upstream
+    Mercurial repository.  Thanks to John Eaton.
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 14 Feb 2009 13:48:26 +0100
 

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-02-19 00:18:07 UTC (rev 2681)
+++ octave/trunk/debian/in/00list	2009-02-19 00:18:34 UTC (rev 2682)
@@ -10,4 +10,5 @@
 no_pdf_in_print.dpatch
 dont_set_helvetica-3.1.dpatch
 clean-examples-subdir.dpatch
+real-no-history-3.1.dpatch
 :]

Added: octave/trunk/debian/patches/real-no-history-3.1.dpatch
===================================================================
--- octave/trunk/debian/patches/real-no-history-3.1.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/real-no-history-3.1.dpatch	2009-02-19 00:18:34 UTC (rev 2682)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## real-no-history-3.1.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, taken from the upstream Mercurial repository.
+##
+## DP: # HG changeset patch
+## DP: # User John W. Eaton <jwe at octave.org>
+## DP: # Date 1234548184 18000
+## DP: # Node ID afbfd7f4fd931c9460102aec3eb073f78839276e
+## DP: # Parent  767ed8cc6634851b239e3b181fa18fd7984c2678
+## DP: toplev.cc (do_octave_atexit): only save history if Vsaving_history is true
+
+ at DPATCH@
+diff --git a/src/toplev.cc b/src/toplev.cc
+--- a/src/toplev.cc
++++ b/src/toplev.cc
+@@ -984,7 +984,8 @@
+ 
+       octave_history_write_timestamp ();
+ 
+-      command_history::clean_up_and_save ();
++      if (Vsaving_history)
++	command_history::clean_up_and_save ();
+ 
+       close_files ();
+