diff -Nru pygtk-2.24.0/debian/changelog pygtk-2.24.0/debian/changelog --- pygtk-2.24.0/debian/changelog 2014-08-25 02:16:21.000000000 +0800 +++ pygtk-2.24.0/debian/changelog 2016-10-08 07:19:34.000000000 +0800 @@ -1,3 +1,34 @@ +pygtk (2.24.0-5.1ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. + - Remove bugzilla_leak_fix.patch keep 04_Fix_leaks_of_Pango_objects.patch + + -- FanJun Kong Fri, 07 Oct 2016 23:19:34 +0000 + +pygtk (2.24.0-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * 05_Fix_GdkColor_pixel_parse.patch: Fix bus error on sparc64. + Closes: #839867. + + -- James Clarke Fri, 07 Oct 2016 14:49:35 +0100 + +pygtk (2.24.0-5) unstable; urgency=medium + + * Add build-indep and build-arch targets. Closes: #831945. + + -- Emilio Pozuelo Monfort Fri, 22 Jul 2016 19:24:13 +0200 + +pygtk (2.24.0-4ubuntu1) wily; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/bugzilla_leak_fix.patch: patch from Owen Taylor to fix a + leak issue in pango's create_layout() + - Build-Depend on adwaita-icon-theme instead of gnome-icon-theme. + adwaita-icon-theme is the successor. + + -- Iain Lane Mon, 18 May 2015 15:07:35 +0100 + pygtk (2.24.0-4) unstable; urgency=low * Team upload. @@ -17,6 +48,38 @@ -- Andreas Henriksson Sun, 24 Aug 2014 08:04:49 -0700 +pygtk (2.24.0-3ubuntu4) vivid; urgency=medium + + * Build-Depend on adwaita-icon-theme instead of gnome-icon-theme. + adwaita-icon-theme is the successor. + + -- Iain Lane Thu, 29 Jan 2015 13:42:42 +0000 + +pygtk (2.24.0-3ubuntu3) trusty; urgency=medium + + * Rebuild to drop files installed into /usr/share/pyshared. + + -- Matthias Klose Sun, 23 Feb 2014 13:50:29 +0000 + +pygtk (2.24.0-3ubuntu2) trusty; urgency=medium + + * Build with dh-autoreconf for new libtool. + + -- William Grant Sun, 15 Dec 2013 15:07:19 +0000 + +pygtk (2.24.0-3ubuntu1) raring; urgency=low + + * debian/patches/bugzilla_leak_fix.patch: uploaded patch from Owen Taylor + to fix a leak issue in pango's create_layout() (lp: #981376) + + -- Sebastien Bacher Thu, 04 Apr 2013 19:14:40 +0200 + +pygtk (2.24.0-3build1) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Mon, 08 Oct 2012 16:57:57 +0100 + pygtk (2.24.0-3) unstable; urgency=low [ Josselin Mouette ] diff -Nru pygtk-2.24.0/debian/control pygtk-2.24.0/debian/control --- pygtk-2.24.0/debian/control 2014-08-25 02:18:27.000000000 +0800 +++ pygtk-2.24.0/debian/control 2016-10-08 07:19:34.000000000 +0800 @@ -2,13 +2,13 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: pygtk Section: python Priority: optional -Maintainer: Sebastien Bacher +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sebastien Bacher Uploaders: Torsten Landschoff , - Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Laurent Bigonville , Martin Pitt , Michael Biebl + Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort Build-Depends: debhelper (>= 8), gnome-pkg-tools (>= 0.10), cdbs, @@ -28,7 +28,7 @@ python-gobject-2-dbg (>= 2.21.3), xsltproc, docbook-xsl, - gnome-icon-theme + adwaita-icon-theme X-Python-Version: >= 2.5 Standards-Version: 3.9.2 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/attic/pygtk/ diff -Nru pygtk-2.24.0/debian/control.in pygtk-2.24.0/debian/control.in --- pygtk-2.24.0/debian/control.in 2014-08-24 23:26:39.000000000 +0800 +++ pygtk-2.24.0/debian/control.in 2016-10-08 07:19:33.000000000 +0800 @@ -1,7 +1,8 @@ Source: pygtk Section: python Priority: optional -Maintainer: Sebastien Bacher +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sebastien Bacher Uploaders: Torsten Landschoff , @GNOME_TEAM@ Build-Depends: debhelper (>= 8), @@ -23,7 +24,7 @@ python-gobject-2-dbg (>= 2.21.3), xsltproc, docbook-xsl, - gnome-icon-theme + adwaita-icon-theme X-Python-Version: >= 2.5 Standards-Version: 3.9.2 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/attic/pygtk/ diff -Nru pygtk-2.24.0/debian/patches/04_Fix_leaks_of_Pango_objects.patch pygtk-2.24.0/debian/patches/04_Fix_leaks_of_Pango_objects.patch --- pygtk-2.24.0/debian/patches/04_Fix_leaks_of_Pango_objects.patch 1970-01-01 08:00:00.000000000 +0800 +++ pygtk-2.24.0/debian/patches/04_Fix_leaks_of_Pango_objects.patch 2015-02-07 12:49:14.000000000 +0800 @@ -0,0 +1,55 @@ +From: "Owen W. Taylor" +Date: Tue, 27 Sep 2011 00:17:52 -0400 +Subject: Fix leaks of Pango objects + +Gtk.PrintContext.create_pango_context() +Gtk.PrintContext.create_pango_layout() +pangocairo.CairoContext.create_layout() + +were leaking the objects they returned. + +https://bugzilla.gnome.org/show_bug.cgi?id=660216 + +Index: pygtk-2.24.0/gtk/gtk-2.10.defs +=================================================================== +--- pygtk-2.24.0.orig/gtk/gtk-2.10.defs ++++ pygtk-2.24.0/gtk/gtk-2.10.defs +@@ -1388,12 +1388,14 @@ + (define-method create_pango_context + (of-object "GtkPrintContext") + (c-name "gtk_print_context_create_pango_context") ++ (caller-owns-return #t) + (return-type "PangoContext*") + ) + + (define-method create_pango_layout + (of-object "GtkPrintContext") + (c-name "gtk_print_context_create_pango_layout") ++ (caller-owns-return #t) + (return-type "PangoLayout*") + ) + +Index: pygtk-2.24.0/pangocairo.override +=================================================================== +--- pygtk-2.24.0.orig/pangocairo.override ++++ pygtk-2.24.0/pangocairo.override +@@ -118,11 +118,16 @@ _wrap_pango_cairo_update_context(PyGObje + static PyObject * + _wrap_pango_cairo_create_layout(PyGObject *self) + { +- PangoLayout *ret; ++ PangoLayout *layout; ++ PyObject *ret; + +- ret = pango_cairo_create_layout(PycairoContext_GET(self)); ++ layout = pango_cairo_create_layout(PycairoContext_GET(self)); + /* pygobject_new handles NULL checking */ +- return pygobject_new((GObject *)ret); ++ ret = pygobject_new((GObject *)layout); ++ if (layout) ++ g_object_unref(layout); ++ ++ return ret; + } + + static PyObject * diff -Nru pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch --- pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch 1970-01-01 08:00:00.000000000 +0800 +++ pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch 2016-10-07 21:46:42.000000000 +0800 @@ -0,0 +1,31 @@ +Description: Fix bus error on sparc64 + Since GdkColor.pixel is a guint32, but "k" in the format string means unsigned + long, a temporary local needs to be used to get the right alignment and size + on platforms where unsigned long is not 32-bit. +Author: James Clarke +Bug-Debian: https://bugs.debian.org/839867 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: pygtk-2.24.0/gtk/gdkcolor.override +=================================================================== +--- pygtk-2.24.0.orig/gtk/gdkcolor.override ++++ pygtk-2.24.0/gtk/gdkcolor.override +@@ -33,6 +33,7 @@ _wrap_gdk_color_new(PyGBoxed *self, + static char *kwlist1[] = {"red", "green", "blue", "pixel", NULL }; + static char *kwlist2[] = { "spec", NULL }; + PyObject *red = Py_None, *green = Py_None, *blue = Py_None; ++ unsigned long pixel; + const char *spec = NULL; + GdkColor colour; + +@@ -56,7 +57,9 @@ _wrap_gdk_color_new(PyGBoxed *self, + PyErr_Clear(); + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "|OOOk:gdk.Color", kwlist1, +- &red, &green, &blue, &colour.pixel)) { ++ &red, &green, &blue, &pixel)) { ++ colour.pixel = pixel; ++ + /* We don't allow mixing floats and non-floats as that is too + * error-prone. All non-floats are deemed integers in case + * they have __int__() method. */ diff -Nru pygtk-2.24.0/debian/patches/series pygtk-2.24.0/debian/patches/series --- pygtk-2.24.0/debian/patches/series 2011-04-19 03:26:36.000000000 +0800 +++ pygtk-2.24.0/debian/patches/series 2016-10-08 07:19:34.000000000 +0800 @@ -1,2 +1,4 @@ 01_pygtk-demo.patch 03_testsuite_filechooser.patch +04_Fix_leaks_of_Pango_objects.patch +05_Fix_GdkColor_pixel_parse.patch diff -Nru pygtk-2.24.0/debian/rules pygtk-2.24.0/debian/rules --- pygtk-2.24.0/debian/rules 2014-08-25 02:16:21.000000000 +0800 +++ pygtk-2.24.0/debian/rules 2016-10-08 07:19:33.000000000 +0800 @@ -76,6 +76,7 @@ touch $@ build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp) +build-arch build-indep: build build-%/check-stamp: build-%/build-stamp dh_testdir @@ -205,4 +206,4 @@ dh_builddeb -s binary: binary-arch binary-indep -.PHONY: patch unpatch build check install clean binary-indep binary-arch binary +.PHONY: patch unpatch build-indep build-arch build check install clean binary-indep binary-arch binary