[Python-modules-commits] r6883 - in packages/matplotlib/branches/lenny/debian (2 files)

[akumar at users.alioth.debian.org]

    Date: Thursday, November 13, 2008 @ 18:47:22
  Author: akumar
Revision: 6883

debian/patches/ttconv_leak_fix.patch: It appears that the call labels
for get_pdf_charprocs and convert_ttf_to_ps have somehow got
interchanged. This change fixes that bug, which causes the failure of
PS and EPS generation. (Closes: #505527).

Modified:
  packages/matplotlib/branches/lenny/debian/changelog
  packages/matplotlib/branches/lenny/debian/patches/ttconv_leak_fix.patch

Modified: packages/matplotlib/branches/lenny/debian/changelog
===================================================================
--- packages/matplotlib/branches/lenny/debian/changelog	2008-11-13 09:42:27 UTC (rev 6882)
+++ packages/matplotlib/branches/lenny/debian/changelog	2008-11-13 18:47:22 UTC (rev 6883)
@@ -1,3 +1,13 @@
+matplotlib (0.98.1-1+lenny4) testing-proposed-updates; urgency=low
+
+  [ Kumar Appaiah ]
+  * debian/patches/ttconv_leak_fix.patch: It appears that the call labels
+    for get_pdf_charprocs and convert_ttf_to_ps have somehow got
+    interchanged. This change fixes that bug, which causes the failure of
+    PS and EPS generation. (Closes: #505527).
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Thu, 13 Nov 2008 12:27:36 -0600
+
 matplotlib (0.98.1-1+lenny3) testing-proposed-updates; urgency=medium
 
   [ Kumar Appaiah ]

Modified: packages/matplotlib/branches/lenny/debian/patches/ttconv_leak_fix.patch
===================================================================
--- packages/matplotlib/branches/lenny/debian/patches/ttconv_leak_fix.patch	2008-11-13 09:42:27 UTC (rev 6882)
+++ packages/matplotlib/branches/lenny/debian/patches/ttconv_leak_fix.patch	2008-11-13 18:47:22 UTC (rev 6883)
@@ -1,7 +1,7 @@
-Index: matplotlib-0.98.1+lenny1/src/_ttconv.cpp
+Index: matplotlib-0.98.1/src/_ttconv.cpp
 ===================================================================
---- matplotlib-0.98.1+lenny1.orig/src/_ttconv.cpp	2008-09-13 20:27:06.000000000 -0500
-+++ matplotlib-0.98.1+lenny1/src/_ttconv.cpp	2008-09-13 20:46:57.000000000 -0500
+--- matplotlib-0.98.1.orig/src/_ttconv.cpp	2008-11-13 12:32:28.000000000 -0600
++++ matplotlib-0.98.1/src/_ttconv.cpp	2008-11-13 12:40:46.000000000 -0600
 @@ -25,22 +25,23 @@
    }
  
@@ -58,15 +58,6 @@
    return 1;
  }
  
-@@ -87,7 +92,7 @@
-     "filename", "output", "fonttype", "glyph_ids", NULL };
-   if (! PyArg_ParseTupleAndKeywords
-       (args, kwds,
--       "sO&i|O&:convert_ttf_to_ps",
-+       "s|O&:get_pdf_charprocs",
-        (char**)kwlist,
-        &filename,
-        fileobject_to_PythonFileWriter,
 @@ -130,9 +135,13 @@
  
    virtual void add_pair(const char* a, const char* b) {
@@ -83,3 +74,12 @@
    }
  };
  
+@@ -145,7 +154,7 @@
+   static const char *kwlist[] = { "filename", "glyph_ids", NULL };
+   if (! PyArg_ParseTupleAndKeywords
+       (args, kwds,
+-       "s|O&:convert_ttf_to_ps",
++       "s|O&:get_pdf_charprocs",
+        (char **)kwlist,
+        &filename,
+        pyiterable_to_vector_int,