[Pkg-octave-commit] [SCM] qtoctave branch, master, updated. 1dfa0c6d8de06026de751df9134d37eb77a84e7b

[Thomas Weber]

The following commit has been merged in the master branch:
commit f801aec9b79e197a3cdea897a855c89941b042fe
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 23 00:39:57 2010 +0200

    Drop patch font-option-in-png-export

diff --git a/debian/changelog b/debian/changelog
index 4dad00d..964c9e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
     GPL-questionable docs.
   * Dropped patches:
     - add_missing_includes (partly superseded by code changes, partly applied)
+    - font-option-in-png-export (applied upstream)
 
   [ Thomas Weber ]
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571914)
diff --git a/debian/patches/font-option-in-png-export b/debian/patches/font-option-in-png-export
deleted file mode 100644
index 28dbe85..0000000
--- a/debian/patches/font-option-in-png-export
+++ /dev/null
@@ -1,20 +0,0 @@
-When exporting a figure in png format, give the correct font option to
-the print command, prepending -F to Helvetica:12 (fixes Bug#521731).
-
- -- Rafael Laboissiere <rafael at debian.org>  Wed, 01 Apr 2009 22:15:59 +0200
-
-This patch is in upstream's trunk, but not in the 0.8.2 release.
- 
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 29 Sep 2009 21:54:05 +0200
-
---- a/qtoctave/src/menus/Plot/Export/png.menu
-+++ b/qtoctave/src/menus/Plot/Export/png.menu
-@@ -12,7 +12,7 @@
- end{output_list}
- 
- begin{command}
--print ("%o1%", "%o2%", "Helvetica:12", "-dpng")
-+print ("%o1%", "%o2%", "-FHelvetica:12", "-dpng")
- end{command}
- 
- begin{help}
diff --git a/debian/patches/series b/debian/patches/series
index e72775c..bd552c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 dont_include_simple_rcs
-font-option-in-png-export
 use_octave_htmldoc
 move_doc_under_doc
 install_easyplot_as_target

-- 
qtoctave