[Python-modules-commits] r31022 - in packages/python-gd/trunk/debian (4 files)
julian at users.alioth.debian.org
julian at users.alioth.debian.org
Sun Oct 12 21:58:30 UTC 2014
Date: Sunday, October 12, 2014 @ 21:58:29
Author: julian
Revision: 31022
Refresh patches offset
Modified:
packages/python-gd/trunk/debian/changelog
packages/python-gd/trunk/debian/patches/01_fonts.diff
packages/python-gd/trunk/debian/patches/02_detect_libs.diff
packages/python-gd/trunk/debian/patches/03_fixgccwarnings.diff
Modified: packages/python-gd/trunk/debian/changelog
===================================================================
--- packages/python-gd/trunk/debian/changelog 2014-10-12 20:28:41 UTC (rev 31021)
+++ packages/python-gd/trunk/debian/changelog 2014-10-12 21:58:29 UTC (rev 31022)
@@ -1,3 +1,25 @@
+python-gd (0.58-1) unstable; urgency=medium
+
+ * New upstream release. (Closes: #764018)
+ * Remove override_dh_builddeb from d/rules because
+ xz is used by default.
+ * Remove d/source/options, by default is used xz.
+ * Declare compliance with Debian Policy 3.9.6.
+ * Remove get-packaged-orig-source target from d/rules,
+ now the source code is on github.
+ + Remove d/README.source for the same reason.
+ * Remove d/CHANGES and override_dh_installchangelogs
+ in d/rules, because upstream does not provide it anymore.
+ * Update d/watch.
+ * Refresh patches offset.
+ * Update d/copyright.
+ + Add missing font license.
+ + Update Source URL.
+ + Order License Paragraphs.
+ * Add dh-python B-D.
+
+ -- Julián Moreno Patiño <julian at debian.org> Tue, 07 Oct 2014 08:36:05 -0500
+
python-gd (0.56+dfsg-5) unstable; urgency=low
[ Jakub Wilk ]
Modified: packages/python-gd/trunk/debian/patches/01_fonts.diff
===================================================================
--- packages/python-gd/trunk/debian/patches/01_fonts.diff 2014-10-12 20:28:41 UTC (rev 31021)
+++ packages/python-gd/trunk/debian/patches/01_fonts.diff 2014-10-12 21:58:29 UTC (rev 31022)
@@ -2,15 +2,15 @@
Forwarded: no
Author: Julián Moreno Patiño <darkjunix at gmail.com>
Last-Update: 2011-02-15
---- a/gddemo.py
-+++ b/gddemo.py
+--- a/demo/gddemo.py
++++ b/demo/gddemo.py
@@ -2,9 +2,26 @@
import gd, os, cStringIO, urllib2
-os.environ["GDFONTPATH"] = "."
-
--FONT = "adventure"
+-FONT = "Pacifico"
+fontlist = [
+ '/usr/share/fonts/truetype/freefont/FreeSerif.ttf',
+ '/usr/share/fonts/truetype/freefont/FreeSans.ttf',
Modified: packages/python-gd/trunk/debian/patches/02_detect_libs.diff
===================================================================
--- packages/python-gd/trunk/debian/patches/02_detect_libs.diff 2014-10-12 20:28:41 UTC (rev 31021)
+++ packages/python-gd/trunk/debian/patches/02_detect_libs.diff 2014-10-12 21:58:29 UTC (rev 31022)
@@ -3,7 +3,7 @@
Bug-Debian: http://bugs.debian.org/651726
Bug-Ubuntu: https://launchpad.net/bugs/901525
Forwarded: no
-Last-Update: 2012-01-02
+Last-Update: 2014-10-07
--- a/Setup.py
+++ b/Setup.py
@@ -36,6 +36,20 @@
@@ -27,21 +27,21 @@
# library_dirs option is rather non-portable, but since I am targetting
# Unixoid OS's I will just look for the usual suspects.
-@@ -43,7 +57,7 @@
- "/usr/local/lib", "/sw/lib", "/usr/lib",
+@@ -44,7 +58,7 @@
+ "/usr/lib/i386-linux-gnu", "/usr/lib/x86_64-linux-gnu",
"/usr/lib/X11", "/usr/X11R6/lib",
"/opt/gnome/lib",
-])
+]+mult_lib)
- # include_dirs are also non-portable; same trick here.
-
-@@ -51,7 +65,7 @@
+ try:
+ exotic_libdir = commands.getoutput("gdlib-config --libdir"),
+@@ -58,7 +72,7 @@
"/usr/local/include", "/sw/include", "/usr/include",
"/usr/include/X11", "/usr/X11R6/include",
"/opt/gnome/include",
-])
+]+mult_inc)
- # Try to identify our libraries
-
+ try:
+ exotic_incdir = commands.getoutput("gdlib-config --includedir"),
Modified: packages/python-gd/trunk/debian/patches/03_fixgccwarnings.diff
===================================================================
--- packages/python-gd/trunk/debian/patches/03_fixgccwarnings.diff 2014-10-12 20:28:41 UTC (rev 31021)
+++ packages/python-gd/trunk/debian/patches/03_fixgccwarnings.diff 2014-10-12 21:58:29 UTC (rev 31022)
@@ -1,61 +1,15 @@
Description: Fix gcc warnings.
Forwarded: no
-Author: Julián Moreno Patiño <darkjunix at gmail.com>
-Last-Update: 2010-12-10
+Author: Julián Moreno Patiño <julian at debian.org>
+Last-Update: 2014-10-12
--- a/_gdmodule.c
+++ b/_gdmodule.c
-@@ -149,7 +149,9 @@
+@@ -165,7 +165,7 @@
- static PyObject *ErrorObject;
-+#ifndef errno
- extern int errno;
-+#endif
-
- /*
- ** Declarations for objects of type image
-@@ -166,7 +168,7 @@
-
-
// 2.0.22 replaces gdFontTinyRep with gdFontGetTiny, and so on
-typedef gdFontPtr (*ptrGetFontFunction)();
+typedef gdFontPtr (*ptrGetFontFunction)(void);
typedef struct {
char *name;
ptrGetFontFunction func;
-@@ -986,7 +988,7 @@
- static PyObject *image_string(imageobject *self, PyObject *args)
- {
- int x,y,font,color;
-- char *str;
-+ unsigned char *str;
-
- if(!PyArg_ParseTuple(args, "i(ii)si", &font,&x,&y,&str,&color))
- return NULL;
-@@ -1000,7 +1002,7 @@
- static PyObject *image_string16(imageobject *self, PyObject *args)
- {
- int x,y,font,color;
-- Py_UNICODE *ustr;
-+ unsigned short *ustr; //Py_UNICODE *ustr;
-
- if(!PyArg_ParseTuple(args, "i(ii)ui", &font,&x,&y,&ustr,&color))
- return NULL;
-@@ -1015,7 +1017,7 @@
- static PyObject *image_stringup(imageobject *self, PyObject *args)
- {
- int x,y,font,color;
-- char *str;
-+ unsigned char *str;
-
- if(!PyArg_ParseTuple(args, "i(ii)si", &font,&x,&y,&str,&color))
- return NULL;
-@@ -1029,7 +1031,7 @@
- static PyObject *image_stringup16(imageobject *self, PyObject *args)
- {
- int x,y,font,color;
-- Py_UNICODE *ustr;
-+ unsigned short *ustr; //Py_UNICODE *ustr;
-
- if(!PyArg_ParseTuple(args, "i(ii)ui", &font,&x,&y,&ustr,&color))
- return NULL;
More information about the Python-modules-commits
mailing list