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

[Rafael Laboissiere]

Author: rafael
Date: 2008-07-19 16:36:35 +0000 (Sat, 19 Jul 2008)
New Revision: 2311

Added:
   octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Adapt dpatch dont_set_helvetica to octave3.1


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-07-19 15:02:45 UTC (rev 2310)
+++ octave/trunk/debian/changelog	2008-07-19 16:36:35 UTC (rev 2311)
@@ -11,7 +11,7 @@
     + 50_fix_handle_for_plotyy.dpatch
     + 50_add_syspath.dpatch
     + randn_doc.dpatch
-    + dont_set_helvetica.dpatch
+  * debian/patches/dont_set_helvetica-3.1.dpatch: Adapted for octave3.1
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 19 Jul 2008 10:27:26 +0200
 

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2008-07-19 15:02:45 UTC (rev 2310)
+++ octave/trunk/debian/in/00list	2008-07-19 16:36:35 UTC (rev 2311)
@@ -24,5 +24,6 @@
 50_octave-bug-tempfile
 50_include-cstring-mxarray
 no_pdf_in_print.dpatch
+dont_set_helvetica-3.1.dpatch
 add-acx_blas_f77_func.m4.dpatch
 :]

Added: octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch
===================================================================
--- octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch	2008-07-19 16:36:35 UTC (rev 2311)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## don_set_helvetica.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't set Helvetica as default font, it's not available as TrueType font
+## DP: #477688
+
+ at DPATCH@
+diff -urNad octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m
+--- octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m	2008-05-25 17:30:08.000000000 +0200
+@@ -1601,7 +1601,7 @@
+ 
+ function [f, s, fnt, it, bld] = get_fontname_and_size (t)
+   if (isempty (t.fontname))
+-    fnt = "Helvetica";
++    fnt = "";
+   else
+     fnt = t.fontname;
+   endif
+@@ -1639,7 +1639,7 @@
+   if (strcmp (fld, "string"))
+     [f, s, fnt, it, bld] = get_fontname_and_size (obj);
+   else
+-    f = "Helvetica";
++    f = "";
+     s = 10;
+     fnt = f;
+     it = false;
+--- octave3.1-3.1.50.orig/src/graphics.cc
++++ octave3.1-3.1.50/src/graphics.cc
+@@ -2151,7 +2151,7 @@
+   plotboxaspectratio = Matrix (1, 3, 1.0);
+   drawmode = "normal";
+   fontangle = "normal";
+-  fontname = "Helvetica";
++  fontname = "";
+   fontsize = 12;
+   fontunits = "points";
+   fontweight = "normal";