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

[Thomas Weber]

tags 477688 pending
thanks

Author: thomas-guest
Date: 2008-05-25 15:41:20 +0000 (Sun, 25 May 2008)
New Revision: 2032

Added:
   octave/trunk/debian/patches/dont_set_helvetica.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/octave3.0-00list
Log:
Don't set Helvetica as default font (#477688)
We'll go with whatever is default in gnuplot.


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-05-24 02:47:20 UTC (rev 2031)
+++ octave/trunk/debian/changelog	2008-05-25 15:41:20 UTC (rev 2032)
@@ -1,4 +1,4 @@
-octave3.0 (1:3.0.1-4) UNRELEASED; urgency=low
+octave3.0 (1:3.0.1-4) unstable; urgency=low
 
   * New patches:
     - 50_add_syspath.dpatch: Prepend library path again in the loadpath
@@ -10,10 +10,12 @@
       packaged gnuplot (closes: #478677)
     - imshow_only_handles_octave_images.dpatch: documentation patch, imshow
       only handles Octave's image format (closes: #478271)
+    - dont_set_helvetica.dpatch: Go with gnuplot's default font as Helvetica
+      is not available as a TrueType font (closes: #477688)
 
   * debian/in/PACKAGE.conf: Remove explicit library path addition.
 
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 21 May 2008 10:18:43 +0200
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 24 May 2008 13:49:51 +0200
 
 octave3.0 (1:3.0.1-3) unstable; urgency=low
 

Modified: octave/trunk/debian/in/octave3.0-00list
===================================================================
--- octave/trunk/debian/in/octave3.0-00list	2008-05-24 02:47:20 UTC (rev 2031)
+++ octave/trunk/debian/in/octave3.0-00list	2008-05-25 15:41:20 UTC (rev 2032)
@@ -4,3 +4,4 @@
 50_add_syspath.dpatch
 randn_doc.dpatch
 no_pdf_in_print.dpatch
+dont_set_helvetica.dpatch

Added: octave/trunk/debian/patches/dont_set_helvetica.dpatch
===================================================================
--- octave/trunk/debian/patches/dont_set_helvetica.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/dont_set_helvetica.dpatch	2008-05-25 15:41:20 UTC (rev 2032)
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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;
+diff -urNad octave3.0-3.0.1~/src/graphics.cc octave3.0-3.0.1/src/graphics.cc
+--- octave3.0-3.0.1~/src/graphics.cc	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/src/graphics.cc	2008-05-25 17:30:08.000000000 +0200
+@@ -2336,7 +2336,7 @@
+     rotation (0),
+     horizontalalignment ("left"),
+     color (Matrix (1, 3, 0.0)),
+-    fontname ("Helvetica"),
++    fontname (""),
+     fontsize (10),
+     fontangle (radio_values ("{normal}|italic|oblique")),
+     fontweight (radio_values ("{normal}|bold|demi|light")),
+@@ -2470,7 +2470,7 @@
+   m["rotation"] = 0;
+   m["horizontalalignment"] = "left";
+   m["color"] = Matrix (1, 3, 1.0);
+-  m["fontname"] = "Helvetica";
++  m["fontname"] = "";
+   m["fontsize"] = 10;
+   m["fontangle"] = radio_property (radio_values ("{normal}|italic|oblique"));
+   m["fontweight"] = radio_property (radio_values ("{normal}|bold|demi|light"));


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