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

[Thomas Weber]

Author: thomas-guest
Date: 2007-08-22 07:53:23 +0000 (Wed, 22 Aug 2007)
New Revision: 1003

Added:
   octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/octave2.9-00list
Log:
Allow choice of wxt as terminal in gnuplot, see
http://www.cae.wisc.edu/pipermail/help-octave/2007-August/005275.html
http://www.cae.wisc.edu/pipermail/help-octave/2007-July/004977.html


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-08-13 21:50:56 UTC (rev 1002)
+++ octave/trunk/debian/changelog	2007-08-22 07:53:23 UTC (rev 1003)
@@ -6,11 +6,15 @@
 
   * debian/rules: Increased the update-alternatives priority of octave2.9
     to 90 and keep that of octave2.1 at 80
-    
+
   [ Thomas Weber ]
-  * debian/rules: Don't force mkoctfile to strip .oct files (closes: #437672)
+  * debian/rules:
+    + Don't force mkoctfile to strip .oct files (closes: #437672)
+  * patches/50_use_wxt_for_gnuplot.dpatch: Allow choice of wxt terminal in
+    gnuplot via GNUTERM, see
+    https://www.cae.wisc.edu/pipermail/help-octave/2007-July/004977.html
 
- -- Rafael Laboissiere <rafael at debian.org>  Wed,  1 Aug 2007 19:06:54 +0200
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 22 Aug 2007 08:57:52 +0000
 
 octave2.9 (1:2.9.13-1) unstable; urgency=low
 

Modified: octave/trunk/debian/in/octave2.9-00list
===================================================================
--- octave/trunk/debian/in/octave2.9-00list	2007-08-13 21:50:56 UTC (rev 1002)
+++ octave/trunk/debian/in/octave2.9-00list	2007-08-22 07:53:23 UTC (rev 1003)
@@ -1,2 +1,3 @@
 50_octave-bug-tempfile
+50_use_wxt_for_gnuplot.dpatch
 

Added: octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch
===================================================================
--- octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch	2007-08-22 07:53:23 UTC (rev 1003)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_use_wxt_for_gnuplot.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable the use of wxt as terminal for gnuplot via the GNUTERM environment variable
+## DP: https://www.cae.wisc.edu/pipermail/help-octave/2007-July/004977.html
+
+ at DPATCH@
+diff -urNad octave2.9-2.9.13~/scripts/plot/drawnow.m octave2.9-2.9.13/scripts/plot/drawnow.m
+--- octave2.9-2.9.13~/scripts/plot/drawnow.m	2007-07-18 17:43:51.000000000 +0000
++++ octave2.9-2.9.13/scripts/plot/drawnow.m	2007-08-22 08:22:17.000000000 +0000
+@@ -109,17 +109,19 @@
+ 
+       ## Guess the terminal type.
+       term = getenv ("GNUTERM");
+-      if (isempty (term) && ! isempty (getenv ("DISPLAY")))
+-        term = "x11";
+-      elseif (! isunix ())
+-        term = "windows";
+-      else
+-        term = "aqua";
+-        ## This should really be checking for os x before setting
+-        ## the terminal type to aqua, but nobody will notice because
+-        ## every other unix will be using x11 and windows will be
+-        ## using windows.  Those diehards still running octave from
+-        ## a linux console know how to set the GNUTERM variable.
++      if (isempty (term))
++	if (! isempty (getenv ("DISPLAY")))
++          term = "x11";
++	elseif (! isunix ())
++          term = "windows";
++	else
++	  ## This should really be checking for os x before setting
++	  ## the terminal type to aqua, but nobody will notice because
++	  ## every other unix will be using x11 and windows will be
++	  ## using windows.  Those diehards still running octave from
++	  ## a linux console know how to set the GNUTERM variable.
++          term = "aqua";
++	endif
+       endif
+ 
+       ## If no 'h' (why not?) then open the terminal as Figure 0.


Property changes on: octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch
___________________________________________________________________
Name: svn:executable
   + *