diff -Nru python-gd-0.58/debian/changelog python-gd-0.59/debian/changelog --- python-gd-0.58/debian/changelog 2014-10-12 21:49:53.000000000 +0000 +++ python-gd-0.59/debian/changelog 2016-09-27 15:20:02.000000000 +0000 @@ -1,3 +1,19 @@ +python-gd (0.59-1) unstable; urgency=medium + + [ Ondřej Nový ] + * Fixed VCS URL (https) + + [ Julián Moreno Patiño ] + * New upstream release + * d/patches: Update patches offset and headers + + Add 04_fix_spelling_errors.diff patch to fix spelling errors. + * d/rules: Rewrite to use pybuild + + Add support for hardening bindnow flag. + * d/control: Bump Standards-Version to 3.9.8 (no changes). + * d/copyright: Extend debian copyright holders years. + + -- Julián Moreno Patiño Tue, 27 Sep 2016 10:20:02 -0500 + python-gd (0.58-1) unstable; urgency=medium * New upstream release. (Closes: #764018) diff -Nru python-gd-0.58/debian/control python-gd-0.59/debian/control --- python-gd-0.58/debian/control 2014-10-12 21:23:58.000000000 +0000 +++ python-gd-0.59/debian/control 2016-09-27 15:17:52.000000000 +0000 @@ -15,10 +15,10 @@ python-all-dev (>= 2.6.6-3~), zlib1g-dev X-Python-Version: >= 2.5 -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://newcenturycomputers.net/projects/gdmodule.html -Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-gd/trunk/ -Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-gd/trunk/ +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-gd.git +Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-gd.git Package: python-gd Architecture: any diff -Nru python-gd-0.58/debian/copyright python-gd-0.59/debian/copyright --- python-gd-0.58/debian/copyright 2014-10-09 14:16:55.000000000 +0000 +++ python-gd-0.59/debian/copyright 2016-09-27 15:20:02.000000000 +0000 @@ -40,7 +40,7 @@ Files: debian/* Copyright: 2002, Ben Pfaff - 2009-2014, Julián Moreno Patiño + 2009-2016, Julián Moreno Patiño License: GPL-2+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru python-gd-0.58/debian/.git-dpm python-gd-0.59/debian/.git-dpm --- python-gd-0.58/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 +++ python-gd-0.59/debian/.git-dpm 2016-09-15 21:42:45.000000000 +0000 @@ -0,0 +1,11 @@ +# see git-dpm(1) from git-dpm package +70504ebe39b302f77c8111f5b4659fe3befbf64b +70504ebe39b302f77c8111f5b4659fe3befbf64b +3eaccc1d3e7d87871866aa63da4653683aa3eb4f +3eaccc1d3e7d87871866aa63da4653683aa3eb4f +python-gd_0.58.orig.tar.gz +99513a36e601b983aba268860e09c205a6c54b9a +76670 +debianTag="debian/%e%v" +patchedTag="patched/%e%v" +upstreamTag="upstream/%e%u" diff -Nru python-gd-0.58/debian/patches/01_fonts.diff python-gd-0.59/debian/patches/01_fonts.diff --- python-gd-0.58/debian/patches/01_fonts.diff 2014-10-07 13:33:49.000000000 +0000 +++ python-gd-0.59/debian/patches/01_fonts.diff 2016-09-15 21:43:30.000000000 +0000 @@ -1,7 +1,7 @@ -Description: Fix copyright font problem. +Description: Use systems fonts. Forwarded: no -Author: Julián Moreno Patiño -Last-Update: 2011-02-15 +Last-Update: 2016-09-15 +Author: Julián Moreno Patiño --- a/demo/gddemo.py +++ b/demo/gddemo.py @@ -2,9 +2,26 @@ diff -Nru python-gd-0.58/debian/patches/02_detect_libs.diff python-gd-0.59/debian/patches/02_detect_libs.diff --- python-gd-0.58/debian/patches/02_detect_libs.diff 2014-10-07 13:35:18.000000000 +0000 +++ python-gd-0.59/debian/patches/02_detect_libs.diff 2016-09-15 21:43:39.000000000 +0000 @@ -1,11 +1,11 @@ Description: Detect libraries from multiarch paths -Author: Julián Moreno Patiño Bug-Debian: http://bugs.debian.org/651726 Bug-Ubuntu: https://launchpad.net/bugs/901525 Forwarded: no -Last-Update: 2014-10-07 ---- a/Setup.py -+++ b/Setup.py +Last-Update: 2016-09-15 +Author: Julián Moreno Patiño +--- a/setup.py ++++ b/setup.py @@ -36,6 +36,20 @@ if lst[i] == itm: del lst[i] diff -Nru python-gd-0.58/debian/patches/03_fixgccwarnings.diff python-gd-0.59/debian/patches/03_fixgccwarnings.diff --- python-gd-0.58/debian/patches/03_fixgccwarnings.diff 2014-10-12 21:35:32.000000000 +0000 +++ python-gd-0.59/debian/patches/03_fixgccwarnings.diff 2016-09-15 22:12:42.000000000 +0000 @@ -1,7 +1,7 @@ Description: Fix gcc warnings. Forwarded: no +Last-Update: 2016-09-15 Author: Julián Moreno Patiño -Last-Update: 2014-10-12 --- a/_gdmodule.c +++ b/_gdmodule.c @@ -165,7 +165,7 @@ diff -Nru python-gd-0.58/debian/patches/04_fix_spelling_errors.diff python-gd-0.59/debian/patches/04_fix_spelling_errors.diff --- python-gd-0.58/debian/patches/04_fix_spelling_errors.diff 1970-01-01 00:00:00.000000000 +0000 +++ python-gd-0.59/debian/patches/04_fix_spelling_errors.diff 2016-09-15 22:14:00.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Fix spelling errors. +Forwarded: yes +Last-Update: 2016-09-15 +Author: Julián Moreno Patiño +--- a/_gdmodule.c ++++ b/_gdmodule.c +@@ -1638,7 +1638,7 @@ + + {"getClip", (PyCFunction)image_getclip, 1, + "getClip()\n" +- "returns (x1,y1), (x2,y2) of the image clip rectange"}, ++ "returns (x1,y1), (x2,y2) of the image clip rectangle"}, + + {"getInterlaced", (PyCFunction)image_getinterlaced, 1, + "getInterlaced()\n" diff -Nru python-gd-0.58/debian/patches/series python-gd-0.59/debian/patches/series --- python-gd-0.58/debian/patches/series 2014-10-12 21:33:35.000000000 +0000 +++ python-gd-0.59/debian/patches/series 2016-09-15 22:14:55.000000000 +0000 @@ -1,3 +1,4 @@ 01_fonts.diff 02_detect_libs.diff 03_fixgccwarnings.diff +04_fix_spelling_errors.diff diff -Nru python-gd-0.58/debian/rules python-gd-0.59/debian/rules --- python-gd-0.58/debian/rules 2014-10-12 21:20:25.000000000 +0000 +++ python-gd-0.59/debian/rules 2016-09-27 15:19:17.000000000 +0000 @@ -1,22 +1,10 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 - -PYVERS := $(shell pyversions -r) +export PYBUILD_NAME=gd +export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow %: - dh $@ --with python2 - -override_dh_auto_clean: - rm -rf build/ - -override_dh_auto_install: - set -e; \ - for PYTHON in $(PYVERS); do \ - $$PYTHON ./Setup.py install --root=debian/python-gd --install-layout=deb; \ - $$PYTHON-dbg ./Setup.py install --root=debian/python-gd-dbg --install-layout=deb; \ - done - find debian/python-*-dbg ! -type d ! -name '*.so' | xargs rm -f - find debian/python-*-dbg -depth -empty -exec rmdir {} \; + dh $@ --with python2 --buildsystem=pybuild override_dh_strip: dh_strip -ppython-gd --dbg-package=python-gd-dbg diff -Nru python-gd-0.58/setup.py python-gd-0.59/setup.py --- python-gd-0.58/setup.py 1970-01-01 00:00:00.000000000 +0000 +++ python-gd-0.59/setup.py 2015-12-01 15:03:03.000000000 +0000 @@ -0,0 +1,134 @@ +# Setup for gdmodule 0.50 and later + +from distutils.core import setup, Extension +import os, glob, sys, string, commands + +# version of this gdmodule package +this_version = "0.59" + +# directory existence tester + +def dirtest(lst): + rlst = [] + for d in lst: + try: + if os.listdir(d): + rlst.append(d) + except: + pass + return rlst + +def filetest(path, names): + rlst = [] + for d in path: + for i in range(len(names)): + found = glob.glob(os.path.join(d, "lib%s.*" % names[i])) + if found: + rlst.append(names[i]) + names[i] = None + names = filter(None, names) + return rlst + +def remove(itm, lst): + r = range(len(lst)) + r.reverse() + for i in r: + if lst[i] == itm: + del lst[i] + +# library_dirs option is rather non-portable, but since I am targetting +# Unixoid OS's I will just look for the usual suspects. + +libdirs = dirtest([ + "/usr/local/lib", "/sw/lib", "/usr/lib", + "/usr/lib/i386-linux-gnu", "/usr/lib/x86_64-linux-gnu", + "/usr/lib/X11", "/usr/X11R6/lib", + "/opt/gnome/lib", +]) + +try: + exotic_libdir = commands.getoutput("gdlib-config --libdir"), + libdirs += exotic_libdir +except: + pass + +# include_dirs are also non-portable; same trick here. + +incdirs = dirtest([ + "/usr/local/include", "/sw/include", "/usr/include", + "/usr/include/X11", "/usr/X11R6/include", + "/opt/gnome/include", +]) + +try: + exotic_incdir = commands.getoutput("gdlib-config --includedir"), + incdirs += exotic_incdir +except: + pass + +# Try to identify our libraries + +want_libs = [ + "gd", + "jpeg", "png", "gif", + "X11", "Xpm", + "z", "ttf", "freetype", +] + +libs = filetest(libdirs, want_libs) + +missing = [] + +for l in want_libs: + if l and l not in libs: + missing.append(l) + +if "ttf" in missing and "freetype" not in missing: + remove("ttf", missing) + +if missing: + print "WARNING: Missing", string.join(missing, ", "), "Libraries" + +# hand-clean the libs + +if "gd" not in libs: + print "Can't find GD library." + sys.exit(0) + +if "ttf" in libs and "freetype" in libs: + remove("ttf", libs) + +if "Xpm" in libs and "X11" not in libs: + remove("Xpm", libs) + +if "png" in libs and "z" not in libs: + remove("png", libs) + +if "z" in libs and "png" not in libs: + remove("png", libs) + +# build the macro list + +macros = [] + +for l in libs: + macros.append(( "HAVE_LIB%s" % l.upper(), None )) + +# OK, now do it! + +setup(name="gdmodule", version=this_version, + + description="GD Package", + long_description="GD Package", + author="Chris Gonnerman", + author_email="chris.gonnerman@newcenturycomputers.net", + + url="http://newcenturycomputers.net/projects/gdmodule.html", + py_modules=["gd"], + ext_modules=[ + Extension("_gd", ["_gdmodule.c"], + include_dirs=incdirs, library_dirs=libdirs, + libraries=libs, define_macros=macros)], +) + +# end of file. diff -Nru python-gd-0.58/Setup.py python-gd-0.59/Setup.py --- python-gd-0.58/Setup.py 2013-06-21 13:10:13.000000000 +0000 +++ python-gd-0.59/Setup.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ -# Setup for gdmodule 0.50 and later - -from distutils.core import setup, Extension -import os, glob, sys, string, commands - -# version of this gdmodule package -this_version = "0.58" - -# directory existence tester - -def dirtest(lst): - rlst = [] - for d in lst: - try: - if os.listdir(d): - rlst.append(d) - except: - pass - return rlst - -def filetest(path, names): - rlst = [] - for d in path: - for i in range(len(names)): - found = glob.glob(os.path.join(d, "lib%s.*" % names[i])) - if found: - rlst.append(names[i]) - names[i] = None - names = filter(None, names) - return rlst - -def remove(itm, lst): - r = range(len(lst)) - r.reverse() - for i in r: - if lst[i] == itm: - del lst[i] - -# library_dirs option is rather non-portable, but since I am targetting -# Unixoid OS's I will just look for the usual suspects. - -libdirs = dirtest([ - "/usr/local/lib", "/sw/lib", "/usr/lib", - "/usr/lib/i386-linux-gnu", "/usr/lib/x86_64-linux-gnu", - "/usr/lib/X11", "/usr/X11R6/lib", - "/opt/gnome/lib", -]) - -try: - exotic_libdir = commands.getoutput("gdlib-config --libdir"), - libdirs += exotic_libdir -except: - pass - -# include_dirs are also non-portable; same trick here. - -incdirs = dirtest([ - "/usr/local/include", "/sw/include", "/usr/include", - "/usr/include/X11", "/usr/X11R6/include", - "/opt/gnome/include", -]) - -try: - exotic_incdir = commands.getoutput("gdlib-config --includedir"), - incdirs += exotic_incdir -except: - pass - -# Try to identify our libraries - -want_libs = [ - "gd", - "jpeg", "png", "gif", - "X11", "Xpm", - "z", "ttf", "freetype", -] - -libs = filetest(libdirs, want_libs) - -missing = [] - -for l in want_libs: - if l and l not in libs: - missing.append(l) - -if "ttf" in missing and "freetype" not in missing: - remove("ttf", missing) - -if missing: - print "WARNING: Missing", string.join(missing, ", "), "Libraries" - -# hand-clean the libs - -if "gd" not in libs: - print "Can't find GD library." - sys.exit(0) - -if "ttf" in libs and "freetype" in libs: - remove("ttf", libs) - -if "Xpm" in libs and "X11" not in libs: - remove("Xpm", libs) - -if "png" in libs and "z" not in libs: - remove("png", libs) - -if "z" in libs and "png" not in libs: - remove("png", libs) - -# build the macro list - -macros = [] - -for l in libs: - macros.append(( "HAVE_LIB%s" % l.upper(), None )) - -# OK, now do it! - -setup(name="gdmodule", version=this_version, - - description="GD Package", - long_description="GD Package", - author="Chris Gonnerman", - author_email="chris.gonnerman@newcenturycomputers.net", - - url="http://newcenturycomputers.net/projects/gdmodule.html", - py_modules=["gd"], - ext_modules=[ - Extension("_gd", ["_gdmodule.c"], - include_dirs=incdirs, library_dirs=libdirs, - libraries=libs, define_macros=macros)], -) - -# end of file.