--- pygoocanvas-0.14.1.orig/.pc/.quilt_patches +++ pygoocanvas-0.14.1/.pc/.quilt_patches @@ -0,0 +1 @@ +debian/patches --- pygoocanvas-0.14.1.orig/.pc/.quilt_series +++ pygoocanvas-0.14.1/.pc/.quilt_series @@ -0,0 +1 @@ +series --- pygoocanvas-0.14.1.orig/.pc/.version +++ pygoocanvas-0.14.1/.pc/.version @@ -0,0 +1 @@ +2 --- pygoocanvas-0.14.1.orig/.pc/applied-patches +++ pygoocanvas-0.14.1/.pc/applied-patches @@ -0,0 +1 @@ +lp_640630.patch --- pygoocanvas-0.14.1.orig/.pc/lp_640630.patch/arg-types.py +++ pygoocanvas-0.14.1/.pc/lp_640630.patch/arg-types.py @@ -0,0 +1,109 @@ +from argtypes import ArgType, matcher +import reversewrapper + +class CairoMatrixArg(ArgType): + + before = (' %(name)s = &((PycairoMatrix*)(py_%(name)s))->matrix;\n') + + def write_param(self, ptype, pname, pdflt, pnull, info): + info.varlist.add('PyObject', '*py_' + pname) + info.varlist.add('cairo_matrix_t', '*'+pname) + info.add_parselist('O', ['&py_'+pname], [pname]) + info.arglist.append(pname) + info.codebefore.append (self.before % { 'name' : pname, 'namecopy' : 'NULL' }) + + + def write_return(self, ptype, ownsreturn, info): + info.varlist.add('cairo_matrix_t', '*ret') + info.codeafter.append(' if (ret)\n' + ' return PycairoMatrix_FromMatrix(ret);\n' + ' else {\n' + ' Py_INCREF(Py_None);\n' + ' return Py_None;\n' + ' }'); + +matcher.register('cairo_matrix_t*', CairoMatrixArg()) + + +class CairoParam(reversewrapper.Parameter): + def get_c_type(self): + return self.props.get('c_type').replace('const-', 'const ') + def convert_c2py(self): + self.wrapper.add_declaration("PyObject *py_%s;" % self.name) + self.wrapper.write_code( + code=('py_%s = PycairoContext_FromContext(cairo_reference(%s), &PyGdkCairoContext_Type, NULL);' % + (self.name, self.name)), + cleanup=("Py_DECREF(py_%s);" % self.name)) + self.wrapper.add_pyargv_item("py_%s" % self.name) + +matcher.register_reverse("cairo_t*", CairoParam) + +class BoundsPtrArg(ArgType): + + def write_param(self, ptype, pname, pdflt, pnull, info): + if pdflt: + info.varlist.add('PyObject', '*py_' + pname + " = " + pdflt) + else: + info.varlist.add('PyObject', '*py_' + pname) + if pnull: + info.add_parselist('O', ['&py_'+pname], [pname]) + info.codebefore.append( + ' if (!(py_%(name)s == NULL || py_%(name)s == Py_None || \n' + ' PyObject_IsInstance(py_%(name)s, (PyObject *) &PyGooCanvasBounds_Type))) {\n' + ' PyErr_SetString(PyExc_TypeError, "parameter %(name)s must be goocanvas.Bounds or None");\n' + ' return NULL;\n' + ' }\n' % dict(name=pname)) + info.arglist.append("(py_%s == NULL || py_%s == Py_None)? NULL :" + " &((PyGooCanvasBounds *) py_%s)->bounds" % (pname, pname, pname)) + else: + info.add_parselist('O!', ['&PyGooCanvasBounds_Type', '&py_'+pname], [pname]) + info.arglist.append("(py_%s == NULL)? NULL :" + " &((PyGooCanvasBounds *) py_%s)->bounds" % (pname, pname)) + + def write_return(self, ptype, ownsreturn, info): + info.varlist.add('GooCanvasBounds', '*ret') + info.codeafter.append(' return pygoo_canvas_bounds_new(ret);\n'); + +matcher.register('GooCanvasBounds*', BoundsPtrArg()) +matcher.register('const-GooCanvasBounds*', BoundsPtrArg()) + +class GooCanvasBoundPtrReturn(reversewrapper.ReturnType): + def get_c_type(self): + return self.props.get('c_type') + def write_decl(self): + self.wrapper.add_declaration("%s retval;" % self.get_c_type()) + self.wrapper.add_declaration("PyObject *py_bounds;") + def write_error_return(self): + self.wrapper.write_code("return NULL;") + def write_conversion(self): + self.wrapper.add_pyret_parse_item("O!", "&PyGooCanvasBounds_Type, &py_bounds", prepend=True) + self.wrapper.write_code(( + " /* FIXME: this leaks memory */\n" + "retval = g_new(GooCanvasBounds, 1);\n" + "*retval = ((PyGooCanvasBounds*) py_bounds)->bounds;"), + code_sink=self.wrapper.post_return_code) + +matcher.register_reverse_ret("GooCanvasBounds*", GooCanvasBoundPtrReturn) + +class GooCanvasBoundPtrParam(reversewrapper.Parameter): + def get_c_type(self): + return self.props.get('c_type').replace('const-', 'const ') + def convert_c2py(self): + self.wrapper.add_declaration("PyObject *py_%s;" % self.name) + self.wrapper.write_code( + code=('py_%s = pygoo_canvas_bounds_new(%s);' % + (self.name, self.name)), + cleanup=("Py_DECREF(py_%s);" % self.name)) + self.wrapper.add_pyargv_item("py_%s" % self.name) + +matcher.register_reverse("GooCanvasBounds*", GooCanvasBoundPtrParam) +matcher.register_reverse("const-GooCanvasBounds*", GooCanvasBoundPtrParam) + +class GObjectReturn(reversewrapper.GObjectReturn): + def write_conversion(self): + self.wrapper.write_code( + code=None, + failure_expression="py_retval == Py_None") + reversewrapper.GObjectReturn.write_conversion(self) + +matcher.register_reverse_ret('GObject*', GObjectReturn) --- pygoocanvas-0.14.1.orig/acinclude.m4 +++ pygoocanvas-0.14.1/acinclude.m4 @@ -45,7 +45,7 @@ dnl deduce PYTHON_INCLUDES py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +PYTHON_INCLUDES="`$PYTHON-config --includes`" if test "$py_prefix" != "$py_exec_prefix"; then PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" fi --- pygoocanvas-0.14.1.orig/arg-types.py +++ pygoocanvas-0.14.1/arg-types.py @@ -33,6 +33,7 @@ self.wrapper.write_code( code=('py_%s = PycairoContext_FromContext(cairo_reference(%s), &PyGdkCairoContext_Type, NULL);' % (self.name, self.name)), + failure_expression="py_%s == NULL" % self.name, cleanup=("Py_DECREF(py_%s);" % self.name)) self.wrapper.add_pyargv_item("py_%s" % self.name) --- pygoocanvas-0.14.1.orig/configure +++ pygoocanvas-0.14.1/configure @@ -13066,7 +13066,7 @@ $as_echo_n "checking for headers required to compile python extensions... " >&6; } py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +PYTHON_INCLUDES="`$PYTHON-config --includes`" if test "$py_prefix" != "$py_exec_prefix"; then PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" fi --- pygoocanvas-0.14.1.orig/debian/changelog +++ pygoocanvas-0.14.1/debian/changelog @@ -0,0 +1,142 @@ +pygoocanvas (0.14.1-1.1ubuntu1) xenial; urgency=low + + * New upstream list. + - use quilt as a patching system + + -- Chris J Arges Thu, 14 Jan 2016 16:10:48 -0600 + +pygoocanvas (0.14.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build using dh-python. Closes: #786280. + + -- Matthias Klose Fri, 21 Aug 2015 21:44:55 +0200 + +pygoocanvas (0.14.1-1ubuntu8) raring; urgency=low + + * Fix python multi-arch include issues. + + -- Chris J Arges Mon, 21 Jan 2013 14:17:16 -0600 + +pygoocanvas (0.14.1-1ubuntu7) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Mon, 08 Oct 2012 16:56:14 +0100 + +pygoocanvas (0.14.1-1ubuntu6) precise; urgency=low + + * Build using dh_python2 + + -- Matthias Klose Sat, 17 Dec 2011 13:50:30 +0000 + +pygoocanvas (0.14.1-1ubuntu5) natty; urgency=low + + * Drop build dependency on python-gobject-doc. + + -- Matthias Klose Thu, 31 Mar 2011 12:29:41 +0200 + +pygoocanvas (0.14.1-1ubuntu4) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Wed, 08 Dec 2010 15:08:54 +0000 + +pygoocanvas (0.14.1-1ubuntu3) natty; urgency=low + + * Rebuild to add support for python 2.7. + + -- Matthias Klose Fri, 03 Dec 2010 00:07:56 +0000 + +pygoocanvas (0.14.1-1ubuntu2) maverick; urgency=low + + * debian/patches/lp_640630.patch + - Check the return value of PycairoContext_FromContext in + CairoParam (LP: #640630) + + -- Ken VanDine Mon, 04 Oct 2010 09:25:27 -0400 + +pygoocanvas (0.14.1-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + * debian/python-pygoocanvas.examples: + - Include demo files in binary package. + * debian/control: + - Set build-depends of python-cairo-dev to >= 1.8.0 + - Add build-depends on python-gobject-doc + - Add Vcs-Bzr link + + -- Robert Ancell Wed, 16 Jun 2010 16:48:19 +1000 + +pygoocanvas (0.14.1-1) unstable; urgency=low + + * New upstream release (Closes: #539981, #527609, #527674) + * Add new watch file + * Bump Standards-Version to 3.8.4 + + -- Jose Carlos Garcia Sogo Sat, 12 Jun 2010 09:56:42 +0200 + +pygoocanvas (0.10.0-1) unstable; urgency=low + + * New upstream version. + * Build-depend on goocanvas 0.10 + * Change VCS info to point to git.debian.org + * Bump Standards-Version to 3.7.3 + * Change python to Pyhton in short description field + * Update debian/copyright + + -- Jose Carlos Garcia Sogo Sun, 25 May 2008 14:24:41 +0200 + +pygoocanvas (0.9.0-1) unstable; urgency=low + + * New upstream release (Closes: #445169) + + -- Jose Carlos Garcia Sogo Mon, 14 May 2007 23:15:45 +0200 + +pygoocanvas (0.8.0-2) unstable; urgency=low + + * Link gtk-doc documentation to /usr/share/doc. + + -- Jose Carlos Garcia Sogo Mon, 14 May 2007 22:57:46 +0200 + +pygoocanvas (0.8.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + depends on version 0.8 of goocanvas. + + improve description. + * debian/rules: don't install .la files. + * Upload to unstable. + + -- Jose Carlos Garcia Sogo Tue, 01 May 2007 22:37:11 +0200 + +pygoocanvas (0.6.0-1) experimental; urgency=low + + * New upstream release. + * First upload to Debian archive (Closes: #411730) + * debian/rules: + + Use pysupport instead of pycentral + + There is no need to call dh_python + + Fix a typo and call dh_pysupport in binary-install/python-pygoocanvas:: + target, so it is actually called. + * debian/control: + + add XS-X-Vcs-Svn field + + change dependencies to use pysupport. + + -- Jose Carlos Garcia Sogo Thu, 22 Feb 2007 00:42:09 +0100 + +pygoocanvas (0.4.1-1) edgy; urgency=low + + * New upstream version: + - Much better support for subclassing ItemSimple / ItemSimpleView + - Don't crash an functions returning NULL CairoMatrix + - CairoPattern property convertion bug fixed + + -- Sebastien Bacher Sun, 10 Sep 2006 20:17:39 +0200 + +pygoocanvas (0.4.0-1) edgy; urgency=low + + * First upload + + -- Sebastien Bacher Mon, 28 Aug 2006 11:02:29 +0200 + --- pygoocanvas-0.14.1.orig/debian/compat +++ pygoocanvas-0.14.1/debian/compat @@ -0,0 +1 @@ +5 --- pygoocanvas-0.14.1.orig/debian/control +++ pygoocanvas-0.14.1/debian/control @@ -0,0 +1,16 @@ +Source: pygoocanvas +Section: python +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Build-Depends: debhelper (>= 5), cdbs, python-all-dev (>= 2.3.5-11), dh-python, python-gtk2-dev (>= 2.8.4), python-gobject-dev (>= 2.11.3), libgoocanvas-dev (>= 0.10), python-cairo-dev (>= 1.2.0), xsltproc, docbook-xsl +Standards-Version: 3.8.4 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pygoocanvas/ubuntu + +Package: python-pygoocanvas +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2 +Provides: ${python:Provides} +Description: GooCanvas Python bindings + This package include Python bindings for GooCanvas. + It is needed to run programs written in Python and using GooCanvas set. --- pygoocanvas-0.14.1.orig/debian/copyright +++ pygoocanvas-0.14.1/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Sebastien Bacher on +Mon, 28 Aug 2006 11:11:02 +0200. + +It was downloaded from https://developer.berlios.de/projects/pygoocanvas/ + +Upstream Author: + +Gian Mario Tagliaretti +Gustavo J. A. M. Carneiro + +Copyright (C) Gian Mario Tagliaretti +Copyright (C) Gustavo J. A. M. Carneiro + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the full text of the LGPL can be found in +/usr/share/common-licenses/LGPL-2 + +The Debian packaging is (C) 2006, Sebastien Bacher , +(C) 2007-2008 Jose Carlos Garcia Sogo and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- pygoocanvas-0.14.1.orig/debian/patches/lp_640630.patch +++ pygoocanvas-0.14.1/debian/patches/lp_640630.patch @@ -0,0 +1,25 @@ +From 5d9f41da823e93ea9be888058a63acd7687a2145 Mon Sep 17 00:00:00 2001 +From: Alessandro Decina +Date: Tue, 28 Sep 2010 15:52:31 +0200 +Subject: [PATCH] Check the return value of PycairoContext_FromContext in CairoParam. + +Fixes #622134. +--- + arg-types.py | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/arg-types.py b/arg-types.py +index 8ec5cdf..39c6da0 100644 +--- a/arg-types.py ++++ b/arg-types.py +@@ -33,6 +33,7 @@ class CairoParam(reversewrapper.Parameter): + self.wrapper.write_code( + code=('py_%s = PycairoContext_FromContext(cairo_reference(%s), &PyGdkCairoContext_Type, NULL);' % + (self.name, self.name)), ++ failure_expression="py_%s == NULL" % self.name, + cleanup=("Py_DECREF(py_%s);" % self.name)) + self.wrapper.add_pyargv_item("py_%s" % self.name) + +-- +1.7.1 + --- pygoocanvas-0.14.1.orig/debian/patches/series +++ pygoocanvas-0.14.1/debian/patches/series @@ -0,0 +1 @@ +lp_640630.patch --- pygoocanvas-0.14.1.orig/debian/python-pygoocanvas.examples +++ pygoocanvas-0.14.1/debian/python-pygoocanvas.examples @@ -0,0 +1,5 @@ +demo/customs +demo/images +demo/misc +demo/mv_demo +demo/simple_demo --- pygoocanvas-0.14.1.orig/debian/python-pygoocanvas.links +++ pygoocanvas-0.14.1/debian/python-pygoocanvas.links @@ -0,0 +1 @@ +usr/share/gtk-doc/html/pygoocanvas usr/share/doc/python-pygoocanvas/html --- pygoocanvas-0.14.1.orig/debian/rules +++ pygoocanvas-0.14.1/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +DEB_AUTO_CLEANUP_RCS := yes + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +binary-install/python-pygoocanvas:: + find debian -name "*.la" -exec rm -f {} \; + dh_python2 -ppython-pygoocanvas --- pygoocanvas-0.14.1.orig/debian/watch +++ pygoocanvas-0.14.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/pygoocanvas/0.([\d.]+)/pygoocanvas-([\d.]+).tar.gz