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

[Thomas Weber]

Author: thomas-guest
Date: 2008-09-24 18:52:10 +0000 (Wed, 24 Sep 2008)
New Revision: 2433

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch
   octave/trunk/debian/patches/dont_set_helvetica.dpatch
Log:
Change font patch to pass an asterisk instead of an empty string. 
I just *love* gnuplot and libgd (did I mention that this still doesn't fix
every issue?)


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-09-22 21:32:25 UTC (rev 2432)
+++ octave/trunk/debian/changelog	2008-09-24 18:52:10 UTC (rev 2433)
@@ -1,11 +1,19 @@
 octave3.0 (1:3.0.2-4) experimental; urgency=low
 
+  [ Rafael Laboissiere ]
   * Add octaveX.Y-common package containing the architecture-independent
     files, which were taking too much place in the architecture-dependent
     main package octaveX.Y
 
- -- Rafael Laboissiere <rafael at debian.org>  Mon, 15 Sep 2008 11:07:18 +0200
+  [ Thomas Weber ]
+  * Change dont_set_helvetica.dpatch to use an asterisk (*) instead of an
+    empty string for the font; see
+    http://thread.gmane.org/gmane.comp.gnu.octave.bugs/9843
+    for the reasoning. Saving greek symbols as .png or .jpeg continues to not
+    work with this, though.
 
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 24 Sep 2008 20:49:07 +0200
+
 octave3.0 (1:3.0.2-3) experimental; urgency=low
 
   * debian/in/PACKAGE.triggers, debian/in/PACKAGE.postinst: Use a dpkg

Modified: octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch
===================================================================
--- octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch	2008-09-22 21:32:25 UTC (rev 2432)
+++ octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch	2008-09-24 18:52:10 UTC (rev 2433)
@@ -15,7 +15,7 @@
  function [f, s, fnt, it, bld] = get_fontname_and_size (t)
    if (isempty (t.fontname))
 -    fnt = "Helvetica";
-+    fnt = "";
++    fnt = "*";
    else
      fnt = t.fontname;
    endif
@@ -24,7 +24,7 @@
      [f, s, fnt, it, bld] = get_fontname_and_size (obj);
    else
 -    f = "Helvetica";
-+    f = "";
++    f = "*";
      s = 10;
      fnt = f;
      it = false;
@@ -35,7 +35,7 @@
    drawmode = "normal";
    fontangle = "normal";
 -  fontname = "Helvetica";
-+  fontname = "";
++  fontname = "*";
    fontsize = 12;
    fontunits = "points";
    fontweight = "normal";

Modified: octave/trunk/debian/patches/dont_set_helvetica.dpatch
===================================================================
--- octave/trunk/debian/patches/dont_set_helvetica.dpatch	2008-09-22 21:32:25 UTC (rev 2432)
+++ octave/trunk/debian/patches/dont_set_helvetica.dpatch	2008-09-24 18:52:10 UTC (rev 2433)
@@ -15,7 +15,7 @@
  function [f, s, fnt, it, bld] = get_fontname_and_size (t)
    if (isempty (t.fontname))
 -    fnt = "Helvetica";
-+    fnt = "";
++    fnt = "*";
    else
      fnt = t.fontname;
    endif
@@ -24,7 +24,7 @@
      [f, s, fnt, it, bld] = get_fontname_and_size (obj);
    else
 -    f = "Helvetica";
-+    f = "";
++    f = "*";
      s = 10;
      fnt = f;
      it = false;
@@ -36,7 +36,7 @@
      horizontalalignment ("left"),
      color (Matrix (1, 3, 0.0)),
 -    fontname ("Helvetica"),
-+    fontname (""),
++    fontname ("*"),
      fontsize (10),
      fontangle (radio_values ("{normal}|italic|oblique")),
      fontweight (radio_values ("{normal}|bold|demi|light")),
@@ -45,7 +45,7 @@
    m["horizontalalignment"] = "left";
    m["color"] = Matrix (1, 3, 1.0);
 -  m["fontname"] = "Helvetica";
-+  m["fontname"] = "";
++  m["fontname"] = "*";
    m["fontsize"] = 10;
    m["fontangle"] = radio_property (radio_values ("{normal}|italic|oblique"));
    m["fontweight"] = radio_property (radio_values ("{normal}|bold|demi|light"));