--- pygobject-2.17.0.orig/debian/copyright +++ pygobject-2.17.0/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Josselin Mouette on +Tue, 26 Sep 2006 21:31:55 +0200. + +It was downloaded from + +Upstream authors: James Henstridge + Johan Dahlin + +License: + + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + + +Note: the documentation used to be licensed under the Creative Commons +Attribution-ShareAlike License version 1.0, and was re-licensed to LGPL +on oct 12, 2006. --- pygobject-2.17.0.orig/debian/watch +++ pygobject-2.17.0/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/pygobject/([\d\.]+)[02468]/pygobject-([\d\.]+)\.tar\.gz --- pygobject-2.17.0.orig/debian/control +++ pygobject-2.17.0/debian/control @@ -0,0 +1,71 @@ +Source: pygobject +Section: python +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sjoerd Simons +Build-Depends: debhelper (>= 5), + python-support (>= 0.4), + gnome-pkg-tools (>= 0.10), + cdbs, + quilt, + python-all-dev (>= 2.5), + libglib2.0-dev (>= 2.16.0), + libffi-dev (>= 3.0.5), + xsltproc, + docbook-xsl, + autotools-dev, + python-all-dbg +Build-Conflicts: python2.3-dev (<< 2.3.5) +XS-Python-Version: >= 2.5 +Standards-Version: 3.8.0 + +Package: python-gobject +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Suggests: python-gobject-dbg +Conflicts: python-gtk2 (<< 2.10) +Description: Python bindings for the GObject library + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the Python bindings for GObject. It is mostly + used by other bindings to map their GObjects to Python objects. + +Package: python-gobject-dev +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, + python-gobject (>= ${source:Version}), + python-dev, + libglib2.0-dev (>= 2.8.0), + libffi-dev (>= 3.0.5) +Conflicts: python-gtk2-dev (<< 2.10), python-gobject-doc +Replaces: python-gobject-doc +Provides: python-gobject-doc +Recommends: docbook-xsl +Description: Development headers for the GObject Python bindings + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the development headers needed to build + other Python bindings relying on pygobject. + +Package: python-gobject-dbg +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbg, python-gobject (= ${binary:Version}) +Conflicts: python-gtk2 (<< 2.10) +Description: Python bindings for the GObject library (debug extension) + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the Python bindings for GObject. It is mostly + used by other bindings to map their GObjects to Python objects. --- pygobject-2.17.0.orig/debian/rules +++ pygobject-2.17.0/debian/rules @@ -0,0 +1,169 @@ +#!/usr/bin/make -f + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +export echo=/bin/echo + +configure_flags += \ + --prefix=/usr \ + --enable-thread \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --disable-maintainer-mode + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + configure_flags += --host=$(DEB_HOST_GNU_TYPE) +endif + +PYVERS := $(shell pyversions -vr) + +# how to call quilt +PATCH_DIR := $(CURDIR)/debian/patches +QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null + +patch-stamp: + dh_testdir + # apply patches + $(QUILT) push -a || test $$? = 2 + # backup the original files to restore them in the clean target + [ ! -r config.sub ] || \ + (cp config.sub config.sub.orig && \ + cp /usr/share/misc/config.sub config.sub) + [ ! -r config.guess ] || \ + (cp config.guess config.guess.orig && \ + cp /usr/share/misc/config.guess config.guess) + touch $@ + +patch: patch-stamp + +unpatch: + rm -f patch-stamp + # restore files from backup (before unpatching) + [ ! -r config.sub.orig ] || \ + cp config.sub.orig config.sub + [ ! -r config.guess.orig ] || \ + cp config.guess.orig config.guess + # unapply patches, if any + $(QUILT) pop -a || test $$? = 2 + rm -rf .pc + +build-%/configure-stamp: patch-stamp + dh_testdir + mkdir -p build-$* + cd build-$* && \ + PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +dbg-build-%/configure-stamp: patch-stamp + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* && \ + PYTHON=/usr/bin/python$*-dbg CFLAGS="$(CFLAGS) -O0" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=/var/lib/python-support/python$* + -PYTHON=/usr/bin/python$* $(MAKE) -C build-$* check + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* + touch $@ + +build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp) + +build-%/install-stamp: build-%/build-stamp + dh_testdir + dh_testroot + PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dev pyexecdir=/var/lib/python-support/python$* + touch $@ + +dbg-build-%/install-stamp: dbg-build-%/build-stamp + dh_testdir + dh_testroot + PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dbg + find debian/python-gobject-dbg ! -type d ! \( -name '*.so' -o -name '*.so.*' \) -delete + find debian/python-gobject-dbg -type d -empty -delete + touch $@ + +install-stamp: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp) + dh_testdir + dh_testroot + # remove the install stamps to force a reinstall (since dh_clean is + # removing the package dirs) + dh_clean -k $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp) + $(MAKE) -f debian/rules $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp) + find debian/python-gobject-dev -name \*.la -delete + mkdir -p debian/python-gobject/var/lib debian/python-gobject/usr/lib + mv debian/python-gobject-dev/var/lib/python* debian/python-gobject/var/lib/ + mv debian/python-gobject-dev/usr/lib/libpyglib-*so.* \ + debian/python-gobject/usr/lib + rm -rf debian/python-gobject-dev/usr/lib/python* debian/python-gobject-dev/var + for i in $$(find debian/python-gobject-dbg -name '*.so' -path 'debian/python-gobject-dbg/usr/lib/python*/*-packages/*'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + sed -i 's,bin/python[23]\.[0-9],bin/python,' \ + debian/python-gobject-dev/usr/bin/pygobject-codegen-2.0 + + touch $@ + +install: install-stamp + +clean:: + dh_testdir + dh_testroot + rm -f install-stamp + rm -rf build-* dbg-build-* + $(MAKE) -f debian/rules unpatch + dh_clean *.pyc */*.pyc + +binary-indep: install + dh_testdir + dh_testroot + dh_installdocs -i + dh_installexamples -i + dh_installchangelogs ChangeLog -i + dh_link -i + dh_compress -i -X.py + dh_fixperms -i + # More permission fixing + chmod 755 `grep -rl "^#\!.*python" debian/python-gobject-dev/usr` + dh_pysupport -i /usr/share/pygobject + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: install + dh_testdir + dh_testroot + dh_installdocs -s + dh_installexamples -s + dh_installchangelogs -s ChangeLog + dh_strip -ppython-gobject --dbg-package=python-gobject-dbg + rm -rf debian/python-gobject-dbg/usr/share/doc/python-gobject-dbg + ln -sf python-gobject debian/python-gobject-dbg/usr/share/doc/python-gobject-dbg + dh_link -s + dh_compress -s -X.py + dh_fixperms -s + dh_pysupport -s + dh_makeshlibs -ppython-gobject -V'python-gobject (>= 2.15.2)' + dh_makeshlibs -ppython-gobject-dbg -V'python-gobject-dbg (>= 2.15.2)' + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-arch binary-indep +.PHONY: patch unpatch build install clean binary-indep binary-arch binary --- pygobject-2.17.0.orig/debian/changelog +++ pygobject-2.17.0/debian/changelog @@ -0,0 +1,341 @@ +pygobject (2.17.0-0ubuntu1) karmic; urgency=low + + * New upstream version: + - Write a good part of the docs for gio + - Wrap g_mount_guess_content_type g_mount_guess_content_type_finish + g_mount_guess_content_type_sync + - Swap first two arguments of gio.File.query_info_async + - Fix a crash in pyg_type_add_interfaces + - Remove an empty structure, use sizeof instead + - Wrap four g_get_user_*_dir + - Remove 'ltihooks.py' as using deprecated Python module + - Code maintenance: add .gitignore files + - CellRendererPixbuf stock-size property has wrong type + - Add a doap file after git migration + - missing dep on libffi in pygobject-2.0.pc + - g_volume_monitor_tp_new new function, return the singleton object. + - Remove a DeprecationWarning under python 2.6 + - several scripts from codegen directory are not distributed + - g_file_copy_async change argument order to keep it consistent with the + other methods + - memory leak in gio.File.copy_async + - g_file_monitor should accept None for cancellable and set the default + flag to G_FILE_MONITOR_NONE + - pyg_notify_free needs to ensure it has GIL before calling Py_XDECREF + - Wrap g_file_set_display_name_async + - Add a semi-private method to return the option context C object from + an option context wrapper + - Converting a negative long Python value to a GUINT64 GValue doesn't + error out as it should + - Wrap g_file_set_attributes_async and + g_file_set_attributes_finish + - g_file_query_filesystem_info_async fix a typo + - Wrap g_file_query_filesystem_info_async + - Add missing g_file_query_filesystem_info_async and + g_file_query_filesystem_info_finish + - Wrap g_file_eject_mountable + - g_file_copy callback cannot be optional + - Swap various kwargs names to reflect the code + - Update the address of the FSF + - Add g_volume_should_automount + - Wrap g_drive_enumerate_identifiers and g_volume_enumerate_identifiers + - Add a couple of convinence functions to convert from/to a python list + and an array of strings + - Allow setting pytype wrapper class + - Wrap g_file_enumerator_close_async + * debian/patches/01_pkgconfig-private.patch: + - new version update + * debian/patches/91_upstream_change_fix_rhythmbox_crash.patch: + - the change is in the new version + + -- Sebastien Bacher Mon, 11 May 2009 14:16:44 +0200 + +pygobject (2.16.1-1ubuntu2) jaunty; urgency=low + + * debian/patches/91_upstream_change_fix_rhythmbox_crash.patch: + - upstream bugzilla change to fix a crasher + + -- Sebastien Bacher Wed, 08 Apr 2009 00:58:31 +0200 + +pygobject (2.16.1-1ubuntu1) jaunty; urgency=low + + * Sync on Debian + * debian/control.in, debian/rules: + - don't use a specific python version + + -- Sebastien Bacher Tue, 07 Apr 2009 22:57:05 +0200 + +pygobject (2.16.1-1) unstable; urgency=low + + * New upstream release. + + 90_autofoo.patch: regenerated. + + -- Josselin Mouette Wed, 11 Mar 2009 22:51:50 +0100 + +pygobject (2.16.0-1) unstable; urgency=low + + [ Loic Minier ] + * Pass PYTHON to $(MAKE) runs for robustness in case of timestamp skews; + thanks Colin Watson; closes: #509192. + * Pass --disable-maintainer-mode to configure. + * Rework patch and config.sub/.guess handling: backup config.guess and .sub, + call quilt instead of relying on cdbs' quilt patchsys, restore + config.guess and .sub after unpatching. This avoids config.guess and .sub + in the diff, and allows control over fully working and fully patched + trees. + * Call dh_* -s instead of -a in binary-arch. + * Rework install rules and dependencies completely to avoid .PHONY implicit + targets. + + [ Josselin Mouette ] + * Install files to the python-support directory since objcopy is + completely stupid and doesn’t add the full pathname to the + .gnu_debuglink section. Closes: #518026. + * New upstream release. + * 63_macro-dir.patch: removed, merged upstream. + * 90_autofoo.patch: regenerated. + * Fix quilt invocation so that patches are applied. + * Pass echo=/bin/echo to the environment to work around the ☠☢☣⚡⚠✈║ + libtool bug that is not able to find a command as simple as echo, is + that really too much to ask? + * 04_testsuite_gtk.patch: new patch. Don’t run tests that require + pygtk being installed. + + -- Josselin Mouette Sun, 08 Mar 2009 12:44:24 +0100 + +pygobject (2.15.4-2) experimental; urgency=low + + * debian/patches/64_gil_lock.patch, added. + + Release the python GIL lock when getting properties and unreffing + objects. Prevents deadlocks when using farsight2. + + -- Sjoerd Simons Fri, 28 Nov 2008 16:07:42 +0100 + +pygobject (2.15.4-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * Merged 2.15 updates from Ubuntu, thanks to Sebastien Bacher + and Loïc Minier: + - Build-Depend on libglib2.0-dev >= 2.14. + - debian/patches/60_use-python-config-for-includes.patch, + debian/patches/02_ffi-use-pkgconfig: + + Dropped, fixed upstream. + - debian/patches/debian/patches/61_wakeupfd-fix.patch: + + Renamed as 61_wakeupfd-fctnl-and-read.patch, updated. + - debian/patches/62_install-pyglib-in-libdir-with-python-version.patch: + + installs the new pyglib public library to the private directory + libdir/pygobject/python to have one lib per python + version + - debian/patches/63_macro-dir.patch: + + Add AC_CONFIG_MACRO_DIR for libtoolize. GNOME #551227. + - debian/patches/69_pyg-register-pointer-typo: + + fixes crash on x86-64 due to a typo. GNOME #550463. + - debian/patches/90_autofoo.patch: + + Updated. + - debian/rules: + + Call dh_makeshlibs to generate shlibs on python-gobject >= 2.15.2. + + Rework -dbg support for the new pyglib shared lib. + - Bump Standards-Version to 3.8.0. + - debian/rules: + + Use find -print0/xargs -0. + * New upstream release. Closes: #492647. + - Build-Depend on libglib2.0-dev >= 2.16.0 for GIO support. + - debian/patches/69_pyg-register-pointer-typo: + + Removed, fixed upstream. + * debian/patches/62_install-pyglib-in-libdir-with-python-version.patch: + - Changed so that libpyglib is in /usr/lib and shared objects linking + to it don't need an RPATH. The library is now in + $libdir/libpyglib-2.0-pythonX.Y.so + Thanks a lot to Loïc Minier for his help and guidance! + * debian/rules: + - Adjusted for the above patch. + - Copy config.* in build and restore it in clean, so that changes don't + end up in the diff.gz. + * debian/patches/90_autofoo.patch: + - Regenerated. + + [ Josselin Mouette ] + * Re-add references in 61_wakeupfd-fctnl-and-read.patch. + * 90_autofoo.patch: remove autom4te.cache. + * Depend on python 2.5, since the test suite does not run with python + 2.4. + * Use pyversions -vr to really disable the 2.4 build. + * Pass /usr/share/pygobject to dh_pysupport. + * Don’t move the -dbg symbolic link to the -dev package. + * Run dh_makeshlibs separately for python-gobject-dbg. + + -- Josselin Mouette Wed, 12 Nov 2008 15:49:34 +0100 + +pygobject (2.14.2-1) unstable; urgency=low + + * Switch to quilt; build-depend on quilt. + * New upstream release. + + Refresh patches. + * 03_maintainer_mode.patch: add AM_MAINTAINER_MODE. + * 61_wakeupfd-fix.patch: do not use the wakeupfd in non-threaded + applications, as it is not initialized. + + -- Josselin Mouette Sat, 07 Jun 2008 15:05:11 +0200 + +pygobject (2.14.1-8) unstable; urgency=low + + * Revert last upload, the pygobject patch was fine and the bug lies in + pygtk. Furthermore, wakeupfd gets used anyway since Python supports + it, so we *need* this patch. + + -- Josselin Mouette Wed, 04 Jun 2008 00:08:02 +0200 + +pygobject (2.14.1-7) unstable; urgency=low + + * Also add an explicit python2.5 (>= 2.5.2-5) dep; closes: #481936. + * Drop patch 61_wakeupfd-fix, it seems to expose some python2.5 64-bits + issue; revert build-deps and deps bumps from 2.12.1-3 and -4. + + -- Loic Minier Tue, 20 May 2008 11:26:02 +0200 + +pygobject (2.14.1-6) unstable; urgency=low + + * Update 61_wakeupfd-fix to use more ifdefs for python without the wakeupfd + support; see #481457. + * Build-dep and dep on python2.5-dev >= 2.5.2-5 for wakeupfd support. + + -- Loic Minier Fri, 16 May 2008 14:14:06 +0200 + +pygobject (2.14.1-5) unstable; urgency=low + + * New patch, 61_wakeupfd-fix, from the fix to the initial SETWAKEUPFD + support in GNOME #481569. + + -- Loic Minier Thu, 15 May 2008 14:56:58 +0200 + +pygobject (2.14.1-4) unstable; urgency=low + + * Depend and build-depend on libffi-dev >= 3.0.5 so that the older + package without a .pc file is not used. + + -- Josselin Mouette Thu, 17 Apr 2008 20:24:59 +0200 + +pygobject (2.14.1-3) unstable; urgency=low + + * 01_pkgconfig-private.patch: new patch, move libffi to + Requires.private to prevent pygobject rdeps from depending on it. + * 02_ffi-use-pkgconfig.patch: new patch, use pkg-config to check for + libffi. + * 60_use-python-config-for-includes.patch: strip the autogenerated + part. + * 90_autofoo.patch: re-run aclocal/automake/autoconf on top of it. + * Capitalize Python in the descriptions. + * Use binary:Version. + + -- Josselin Mouette Tue, 25 Mar 2008 01:11:56 +0100 + +pygobject (2.14.1-2) unstable; urgency=low + + * New patch, 60_use-python-config-for-includes, use python-config to set + PYTHON_INCLUDES; fixes support for -dbg package; GNOME #448173; + closes: #468130. NB: the patch also ships m4/ from upstream SVN as this + wasn't disted properly and also updated autoconf. + + -- Loic Minier Wed, 27 Feb 2008 16:09:00 +0100 + +pygobject (2.14.1-1) unstable; urgency=low + + * New upstream release; new features / bug fixes. + + -- Loic Minier Mon, 07 Jan 2008 10:59:32 +0100 + +pygobject (2.14.0-4) unstable; urgency=low + + * debian/rules: + - don't stop the build when make check has an error to avoid having + to add a depends on pygtk + + -- Sebastien Bacher Sat, 01 Dec 2007 23:20:19 +0100 + +pygobject (2.14.0-3) unstable; urgency=low + + * debian/control.in: + - Build-Depends on python-all-dbg + - Conflicts,Provides,Replaces python-gobject-doc + - list python-gobject-dbg package + * debian/rules: + - build dbg variant + - run make check + + -- Sebastien Bacher Fri, 30 Nov 2007 12:46:58 +0100 + +pygobject (2.14.0-2) unstable; urgency=low + + * python-gobject-dev depends on libglib2.0-dev and libffi-dev. + + -- Josselin Mouette Sun, 23 Sep 2007 22:43:19 +0200 + +pygobject (2.14.0-1) unstable; urgency=low + + * New upstream release. + * Use source:Version. + * Build-depend on libffi-dev. + + -- Josselin Mouette Sat, 22 Sep 2007 10:11:58 +0200 + +pygobject (2.12.3-2) unstable; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Cleanup rules. + * Build-depend on autotools-dev. + * Honor CFLAGS we set in rules, doh! + * Set some sane default CFLAGS and honor noopt in DEB_BUILD_OPTIONS. + * Upload to unstable; drop check-dist include. + * Add watch file. + * Fix URL in copyright. + * Wrap build-deps and deps. + * Set XS-Python-Version to >= 2.3 and build-conflict on python2.3-dev << + 2.3.5; add XB-Python-Version; bump python-all-dev build-dep to >= 2.3.5. + * Add a ${misc:Depends}. + * Don't pass --host to configure when DEB_BUILD_GNU_TYPE equals + DEB_HOST_GNU_TYPE. + * build target is PHONY. + * Cleanups. + + -- Loic Minier Sat, 14 Apr 2007 13:29:37 +0200 + +pygobject (2.12.3-1) experimental; urgency=low + + * New upstream release. + * 01_doc_licensing.patch: removed, integrated upstream. + + -- Josselin Mouette Thu, 4 Jan 2007 20:41:25 +0100 + +pygobject (2.12.1-4) experimental; urgency=low + + * python-gobject-dev recommends docbook-xsl. + * python-gobject-dev depends on python-dev. + + -- Josselin Mouette Tue, 2 Jan 2007 22:27:27 +0100 + +pygobject (2.12.1-3) experimental; urgency=low + + [ Josselin Mouette ] + * Build-depend on docbook-xsl (closes: #397811). + + [ Loic Minier ] + * Upload. + + -- Loic Minier Sun, 3 Dec 2006 13:50:38 +0100 + +pygobject (2.12.1-2) experimental; urgency=low + + * 01_doc_licensing.patch: stolen from upstream CVS. Upstream agreed to + relicense the documentation to LGPL. + * copyright: document that. + + -- Josselin Mouette Thu, 12 Oct 2006 20:35:45 +0200 + +pygobject (2.12.1-1) experimental; urgency=low + + * Initial release. + * This package was split out from pygtk. + + -- Josselin Mouette Tue, 26 Sep 2006 21:30:26 +0200 --- pygobject-2.17.0.orig/debian/python-gobject.examples +++ pygobject-2.17.0/debian/python-gobject.examples @@ -0,0 +1 @@ +examples/*.py --- pygobject-2.17.0.orig/debian/python-gobject-dev.links +++ pygobject-2.17.0/debian/python-gobject-dev.links @@ -0,0 +1 @@ +/usr/share/gtk-doc/html/pygobject /usr/share/doc/python-gobject-dev/html --- pygobject-2.17.0.orig/debian/docs +++ pygobject-2.17.0/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +AUTHORS --- pygobject-2.17.0.orig/debian/control.in +++ pygobject-2.17.0/debian/control.in @@ -0,0 +1,71 @@ +Source: pygobject +Section: python +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + python-support (>= 0.4), + gnome-pkg-tools (>= 0.10), + cdbs, + quilt, + python-all-dev (>= 2.5), + libglib2.0-dev (>= 2.16.0), + libffi-dev (>= 3.0.5), + xsltproc, + docbook-xsl, + autotools-dev, + python-all-dbg +Build-Conflicts: python2.3-dev (<< 2.3.5) +XS-Python-Version: >= 2.5 +Standards-Version: 3.8.0 + +Package: python-gobject +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Suggests: python-gobject-dbg +Conflicts: python-gtk2 (<< 2.10) +Description: Python bindings for the GObject library + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the Python bindings for GObject. It is mostly + used by other bindings to map their GObjects to Python objects. + +Package: python-gobject-dev +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, + python-gobject (>= ${source:Version}), + python-dev, + libglib2.0-dev (>= 2.8.0), + libffi-dev (>= 3.0.5) +Conflicts: python-gtk2-dev (<< 2.10), python-gobject-doc +Replaces: python-gobject-doc +Provides: python-gobject-doc +Recommends: docbook-xsl +Description: Development headers for the GObject Python bindings + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the development headers needed to build + other Python bindings relying on pygobject. + +Package: python-gobject-dbg +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbg, python-gobject (= ${binary:Version}) +Conflicts: python-gtk2 (<< 2.10) +Description: Python bindings for the GObject library (debug extension) + GObject is an abstraction layer that allows to program with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the Python bindings for GObject. It is mostly + used by other bindings to map their GObjects to Python objects. --- pygobject-2.17.0.orig/debian/compat +++ pygobject-2.17.0/debian/compat @@ -0,0 +1 @@ +5 --- pygobject-2.17.0.orig/debian/patches/03_maintainer_mode.patch +++ pygobject-2.17.0/debian/patches/03_maintainer_mode.patch @@ -0,0 +1,10 @@ +--- pygobject-2.15.1.orig/configure.ac 2008-08-11 17:28:58.000000000 +0200 ++++ pygobject-2.15.1/configure.ac 2008-08-11 17:28:59.000000000 +0200 +@@ -27,6 +27,7 @@ + AM_CONFIG_HEADER(config.h) + + AM_INIT_AUTOMAKE ++AM_MAINTAINER_MODE + + dnl put the ACLOCAL flags in the makefile + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" --- pygobject-2.17.0.orig/debian/patches/series +++ pygobject-2.17.0/debian/patches/series @@ -0,0 +1,8 @@ +01_pkgconfig-private.patch +03_maintainer_mode.patch +04_testsuite_gtk.patch +61_wakeupfd-fctnl-and-read.patch +62_install-pyglib-in-libdir-with-python-version.patch +64_gil_locking.patch +90_autofoo.patch + --- pygobject-2.17.0.orig/debian/patches/90_autofoo.patch +++ pygobject-2.17.0/debian/patches/90_autofoo.patch @@ -0,0 +1,701 @@ +diff -Nur pygobject-2.17.0/aclocal.m4 pygobject-2.17.0.ubuntu/aclocal.m4 +--- pygobject-2.17.0/aclocal.m4 2009-04-30 22:03:09.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/aclocal.m4 2009-05-11 14:42:43.000000000 +0200 +@@ -925,6 +925,35 @@ + rmdir .tst 2>/dev/null + AC_SUBST([am__leading_dot])]) + ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ + # Check to see how 'make' treats includes. -*- Autoconf -*- + + # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +diff -Nur pygobject-2.17.0/codegen/Makefile.in pygobject-2.17.0.ubuntu/codegen/Makefile.in +--- pygobject-2.17.0/codegen/Makefile.in 2009-04-30 22:03:12.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/codegen/Makefile.in 2009-05-11 14:42:49.000000000 +0200 +@@ -113,6 +113,7 @@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ +@@ -134,6 +135,7 @@ + PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@ + PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@ + PYTHON = @PYTHON@ ++PYTHON_BASENAME = @PYTHON_BASENAME@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ + PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ +@@ -234,7 +236,7 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -259,9 +261,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + pygobject-codegen-2.0: $(top_builddir)/config.status $(srcdir)/pygobject-codegen-2.0.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +diff -Nur pygobject-2.17.0/configure pygobject-2.17.0.ubuntu/configure +--- pygobject-2.17.0/configure 2009-04-30 22:03:11.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/configure 2009-05-11 14:42:48.000000000 +0200 +@@ -803,6 +803,7 @@ + FFI_CFLAGS + DATADIR + pygobject_CODEGEN_DEFINES ++PYTHON_BASENAME + GLIB_MKENUMS + GOBJECT_QUERY + GLIB_GENMARSHAL +@@ -874,6 +875,9 @@ + build_vendor + build_cpu + build ++MAINT ++MAINTAINER_MODE_FALSE ++MAINTAINER_MODE_TRUE + am__untar + am__tar + AMTAR +@@ -941,6 +945,7 @@ + ac_subst_files='' + ac_user_opts=' + enable_option_checking ++enable_maintainer_mode + enable_static + enable_shared + with_pic +@@ -1599,6 +1604,8 @@ + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] +@@ -2605,6 +2612,28 @@ + + + ++{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } ++ # Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++$as_echo "$USE_MAINTAINER_MODE" >&6; } ++ if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ + + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + +@@ -4792,13 +4821,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:4795: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:4824: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4798: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:4827: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4801: output\"" >&5) ++ (eval echo "\"\$as_me:4830: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -6001,7 +6030,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6004 "configure"' > conftest.$ac_ext ++ echo '#line 6033 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7826,11 +7855,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7829: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7858: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7833: \$? = $ac_status" >&5 ++ echo "$as_me:7862: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8165,11 +8194,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8168: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8197: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8172: \$? = $ac_status" >&5 ++ echo "$as_me:8201: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8270,11 +8299,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8273: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8302: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8277: \$? = $ac_status" >&5 ++ echo "$as_me:8306: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8325,11 +8354,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8328: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8357: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8332: \$? = $ac_status" >&5 ++ echo "$as_me:8361: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11138,7 +11167,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11141 "configure" ++#line 11170 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11234,7 +11263,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11237 "configure" ++#line 11266 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -13891,6 +13920,8 @@ + if test -n "$export_dynamic"; then + GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"` + fi ++PYTHON_BASENAME=`basename $PYTHON` ++ + + pygobject_CODEGEN_DEFINES="" + +@@ -14490,6 +14521,13 @@ + LTLIBOBJS=$ac_ltlibobjs + + ++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then ++ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +diff -Nur pygobject-2.17.0/docs/Makefile.in pygobject-2.17.0.ubuntu/docs/Makefile.in +--- pygobject-2.17.0/docs/Makefile.in 2009-04-30 22:03:12.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/docs/Makefile.in 2009-05-11 14:42:49.000000000 +0200 +@@ -111,6 +111,7 @@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ +@@ -132,6 +133,7 @@ + PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@ + PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@ + PYTHON = @PYTHON@ ++PYTHON_BASENAME = @PYTHON_BASENAME@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ + PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ +@@ -308,7 +310,7 @@ + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -333,9 +335,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: +diff -Nur pygobject-2.17.0/examples/Makefile.in pygobject-2.17.0.ubuntu/examples/Makefile.in +--- pygobject-2.17.0/examples/Makefile.in 2009-04-30 22:03:12.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/examples/Makefile.in 2009-05-11 14:42:49.000000000 +0200 +@@ -100,6 +100,7 @@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ +@@ -121,6 +122,7 @@ + PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@ + PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@ + PYTHON = @PYTHON@ ++PYTHON_BASENAME = @PYTHON_BASENAME@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ + PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ +@@ -195,7 +197,7 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -220,9 +222,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: +diff -Nur pygobject-2.17.0/gio/Makefile.in pygobject-2.17.0.ubuntu/gio/Makefile.in +--- pygobject-2.17.0/gio/Makefile.in 2009-04-30 22:03:12.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/gio/Makefile.in 2009-05-11 14:42:49.000000000 +0200 +@@ -65,7 +65,7 @@ + LTLIBRARIES = $(pkgpyexec_LTLIBRARIES) $(pyexec_LTLIBRARIES) + am__DEPENDENCIES_1 = + _gio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(top_builddir)/glib/libpyglib-2.0.la ++ $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la + am__gio_la_OBJECTS = _gio_la-giomodule.lo _gio_la-pygio-utils.lo + nodist__gio_la_OBJECTS = _gio_la-gio.lo + _gio_la_OBJECTS = $(am__gio_la_OBJECTS) $(nodist__gio_la_OBJECTS) +@@ -156,6 +156,7 @@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ +@@ -177,6 +178,7 @@ + PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@ + PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@ + PYTHON = @PYTHON@ ++PYTHON_BASENAME = @PYTHON_BASENAME@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ + PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ +@@ -297,7 +299,7 @@ + GIO_DEFS = gio.defs gio-types.defs $(GIO_OVERRIDES) + _gio_la_CFLAGS = $(GIO_CFLAGS) + _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio +-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0.la ++_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la + _gio_la_SOURCES = \ + giomodule.c \ + pygio-utils.c \ +@@ -316,7 +318,7 @@ + + .SUFFIXES: + .SUFFIXES: .c .defs .la .lo .o .obj .so +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -341,9 +343,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-pkgpyexecLTLIBRARIES: $(pkgpyexec_LTLIBRARIES) + @$(NORMAL_INSTALL) +diff -Nur pygobject-2.17.0/glib/Makefile.in pygobject-2.17.0.ubuntu/glib/Makefile.in +--- pygobject-2.17.0/glib/Makefile.in 2009-04-30 22:03:12.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/glib/Makefile.in 2009-05-11 14:42:49.000000000 +0200 +@@ -60,7 +60,8 @@ + pyglibLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) $(pyglib_LTLIBRARIES) + am__DEPENDENCIES_1 = +-_glib_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libpyglib-2.0.la ++_glib_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ libpyglib-2.0-@PYTHON_BASENAME@.la + am__glib_la_OBJECTS = _glib_la-glibmodule.lo _glib_la-pygiochannel.lo \ + _glib_la-pygoptioncontext.lo _glib_la-pygoptiongroup.lo \ + _glib_la-pygmaincontext.lo _glib_la-pygmainloop.lo \ +@@ -69,13 +70,16 @@ + _glib_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(_glib_la_CFLAGS) $(CFLAGS) \ + $(_glib_la_LDFLAGS) $(LDFLAGS) -o $@ +-libpyglib_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-am_libpyglib_2_0_la_OBJECTS = libpyglib_2_0_la-pyglib.lo +-libpyglib_2_0_la_OBJECTS = $(am_libpyglib_2_0_la_OBJECTS) +-libpyglib_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpyglib_2_0_la_CFLAGS) \ +- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++libpyglib_2_0_@PYTHON_BASENAME@_la_DEPENDENCIES = \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++am_libpyglib_2_0_@PYTHON_BASENAME@_la_OBJECTS = \ ++ libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo ++libpyglib_2_0_@PYTHON_BASENAME@_la_OBJECTS = \ ++ $(am_libpyglib_2_0_@PYTHON_BASENAME@_la_OBJECTS) ++libpyglib_2_0_@PYTHON_BASENAME@_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -88,8 +92,10 @@ + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-SOURCES = $(_glib_la_SOURCES) $(libpyglib_2_0_la_SOURCES) +-DIST_SOURCES = $(_glib_la_SOURCES) $(libpyglib_2_0_la_SOURCES) ++SOURCES = $(_glib_la_SOURCES) \ ++ $(libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES) ++DIST_SOURCES = $(_glib_la_SOURCES) \ ++ $(libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES) + pyglibPYTHON_INSTALL = $(INSTALL_DATA) + py_compile = $(top_srcdir)/py-compile + pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) +@@ -151,6 +157,7 @@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ +@@ -172,6 +179,7 @@ + PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@ + PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@ + PYTHON = @PYTHON@ ++PYTHON_BASENAME = @PYTHON_BASENAME@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ + PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ +@@ -245,7 +253,7 @@ + AUTOMAKE_OPTIONS = 1.7 + INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN + pkginclude_HEADERS = pyglib.h +-lib_LTLIBRARIES = libpyglib-2.0.la ++lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la + pyglibdir = $(pkgpyexecdir)/glib + pyglib_PYTHON = \ + __init__.py \ +@@ -253,9 +261,9 @@ + + pyglib_LTLIBRARIES = _glib.la + common_ldflags = -module -avoid-version $(am__append_1) +-libpyglib_2_0_la_CFLAGS = $(GLIB_CFLAGS) +-libpyglib_2_0_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) +-libpyglib_2_0_la_SOURCES = \ ++libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS) ++libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) ++libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = \ + pyglib.c \ + pyglib.h \ + pyglib-private.h \ +@@ -263,7 +271,7 @@ + + _glib_la_CFLAGS = $(GLIB_CFLAGS) $(am__append_2) + _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib" +-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0.la ++_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la + _glib_la_SOURCES = \ + glibmodule.c \ + pygiochannel.c \ +@@ -285,7 +293,7 @@ + + .SUFFIXES: + .SUFFIXES: .c .la .lo .o .obj .so +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -310,9 +318,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +@@ -370,8 +378,8 @@ + done + _glib.la: $(_glib_la_OBJECTS) $(_glib_la_DEPENDENCIES) + $(_glib_la_LINK) -rpath $(pyglibdir) $(_glib_la_OBJECTS) $(_glib_la_LIBADD) $(LIBS) +-libpyglib-2.0.la: $(libpyglib_2_0_la_OBJECTS) $(libpyglib_2_0_la_DEPENDENCIES) +- $(libpyglib_2_0_la_LINK) -rpath $(libdir) $(libpyglib_2_0_la_OBJECTS) $(libpyglib_2_0_la_LIBADD) $(LIBS) ++libpyglib-2.0-@PYTHON_BASENAME@.la: $(libpyglib_2_0_@PYTHON_BASENAME@_la_OBJECTS) $(libpyglib_2_0_@PYTHON_BASENAME@_la_DEPENDENCIES) ++ $(libpyglib_2_0_@PYTHON_BASENAME@_la_LINK) -rpath $(libdir) $(libpyglib_2_0_@PYTHON_BASENAME@_la_OBJECTS) $(libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -387,7 +395,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygoptiongroup.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygsource.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_glib_la-pygspawn.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpyglib_2_0_la-pyglib.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -466,12 +474,12 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glib_la_CFLAGS) $(CFLAGS) -c -o _glib_la-pygspawn.lo `test -f 'pygspawn.c' || echo '$(srcdir)/'`pygspawn.c + +-libpyglib_2_0_la-pyglib.lo: pyglib.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpyglib_2_0_la_CFLAGS) $(CFLAGS) -MT libpyglib_2_0_la-pyglib.lo -MD -MP -MF $(DEPDIR)/libpyglib_2_0_la-pyglib.Tpo -c -o libpyglib_2_0_la-pyglib.lo `test -f 'pyglib.c' || echo '$(srcdir)/'`pyglib.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libpyglib_2_0_la-pyglib.Tpo $(DEPDIR)/libpyglib_2_0_la-pyglib.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pyglib.c' object='libpyglib_2_0_la-pyglib.lo' libtool=yes @AMDEPBACKSLASH@ ++libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo: pyglib.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS) $(CFLAGS) -MT libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo -MD -MP -MF $(DEPDIR)/libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.Tpo -c -o libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo `test -f 'pyglib.c' || echo '$(srcdir)/'`pyglib.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.Tpo $(DEPDIR)/libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pyglib.c' object='libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpyglib_2_0_la_CFLAGS) $(CFLAGS) -c -o libpyglib_2_0_la-pyglib.lo `test -f 'pyglib.c' || echo '$(srcdir)/'`pyglib.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS) $(CFLAGS) -c -o libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo `test -f 'pyglib.c' || echo '$(srcdir)/'`pyglib.c + + mostlyclean-libtool: + -rm -f *.lo +diff -Nur pygobject-2.17.0/gobject/Makefile.in pygobject-2.17.0.ubuntu/gobject/Makefile.in +--- pygobject-2.17.0/gobject/Makefile.in 2009-04-30 22:03:13.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/gobject/Makefile.in 2009-05-11 14:42:49.000000000 +0200 +@@ -164,6 +164,7 @@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ +@@ -185,6 +186,7 @@ + PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@ + PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@ + PYTHON = @PYTHON@ ++PYTHON_BASENAME = @PYTHON_BASENAME@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ + PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ +@@ -278,7 +280,7 @@ + _gobject_la_LIBADD = \ + $(GLIB_LIBS) \ + $(FFI_LIBS) \ +- $(top_builddir)/glib/libpyglib-2.0.la ++ $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la + + _gobject_la_SOURCES = gobjectmodule.c pygboxed.c pygboxed.h pygenum.c \ + pygenum.h pygflags.c pygflags.h pyginterface.c pyginterface.h \ +@@ -290,7 +292,7 @@ + + .SUFFIXES: + .SUFFIXES: .c .la .lo .o .obj .so +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -315,9 +317,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-pygobjectLTLIBRARIES: $(pygobject_LTLIBRARIES) + @$(NORMAL_INSTALL) +diff -Nur pygobject-2.17.0/Makefile.in pygobject-2.17.0.ubuntu/Makefile.in +--- pygobject-2.17.0/Makefile.in 2009-04-30 22:03:13.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/Makefile.in 2009-05-11 14:42:50.000000000 +0200 +@@ -153,6 +153,7 @@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ +@@ -174,6 +175,7 @@ + PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@ + PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@ + PYTHON = @PYTHON@ ++PYTHON_BASENAME = @PYTHON_BASENAME@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ + PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ +@@ -285,7 +287,7 @@ + .SUFFIXES: + am--refresh: + @: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -312,9 +314,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 +@@ -326,7 +328,7 @@ + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +-$(srcdir)/config.h.in: $(am__configure_deps) ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ +diff -Nur pygobject-2.17.0/tests/Makefile.in pygobject-2.17.0.ubuntu/tests/Makefile.in +--- pygobject-2.17.0/tests/Makefile.in 2009-04-30 22:03:13.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/tests/Makefile.in 2009-05-11 14:42:49.000000000 +0200 +@@ -124,6 +124,7 @@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + NM = @NM@ +@@ -145,6 +146,7 @@ + PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@ + PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@ + PYTHON = @PYTHON@ ++PYTHON_BASENAME = @PYTHON_BASENAME@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ + PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ +@@ -257,7 +259,7 @@ + + .SUFFIXES: + .SUFFIXES: .c .la .lo .o .obj .so +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -282,9 +284,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: --- pygobject-2.17.0.orig/debian/patches/61_wakeupfd-fctnl-and-read.patch +++ pygobject-2.17.0/debian/patches/61_wakeupfd-fctnl-and-read.patch @@ -0,0 +1,53 @@ +From the fix to the initial SETWAKEUPFD support in GNOME #481569. + +--- a/glib/pygmainloop.c (revision 959) ++++ b/glib/pygmainloop.c (working copy) +@@ -24,6 +24,7 @@ + #ifdef HAVE_CONFIG_H + # include + #endif ++#include + + #include + #include +@@ -121,6 +122,7 @@ + { + #ifdef HAVE_PYSIGNAL_SETWAKEUPFD + PySignalWatchSource *real_source = (PySignalWatchSource *)source; ++ int flag; + #endif + + /* Python only invokes signal handlers from the main thread, +@@ -151,6 +153,11 @@ + g_error("Cannot create main loop pipe: %s\n", + g_strerror(errno)); + ++ /* Make the read end of the fd non blocking */ ++ flag = fcntl(real_source->fds[0], F_GETFL, 0); ++ flag |= O_NONBLOCK; ++ fcntl(real_source->fds[0], F_SETFL, flag); ++ + real_source->fd.fd = real_source->fds[0]; + real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR; + g_source_add_poll(source, &real_source->fd); +@@ -175,10 +182,20 @@ + PyGILState_STATE state; + GMainLoop *main_loop; + ++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD ++ PySignalWatchSource *real_source = (PySignalWatchSource *)source; ++ char buf[1]; ++#endif ++ + state = pyglib_gil_state_ensure(); + + main_loop = pyg_get_current_main_loop(); + ++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD ++ if (real_source->fds[0]) ++ read(real_source->fds[0], &buf, 1); ++#endif ++ + if (PyErr_CheckSignals() == -1 && main_loop != NULL) { + PyErr_SetNone(PyExc_KeyboardInterrupt); + g_main_loop_quit(main_loop); --- pygobject-2.17.0.orig/debian/patches/01_pkgconfig-private.patch +++ pygobject-2.17.0/debian/patches/01_pkgconfig-private.patch @@ -0,0 +1,11 @@ +--- pygobject-2.17.0/pygobject-2.0.pc.in 2009-04-25 18:07:45.000000000 +0200 ++++ pygobject-2.17.0.ubuntu/pygobject-2.0.pc.in 2009-05-11 14:39:10.000000000 +0200 +@@ -16,6 +16,7 @@ + + Name: PyGObject + Description: Python bindings for GObject +-Requires: gobject-2.0 @LIBFFI_PC@ ++Requires: gobject-2.0 ++Requires.private: @LIBFFI_PC@ + Version: @VERSION@ + Cflags: -I${pygtkincludedir} --- pygobject-2.17.0.orig/debian/patches/04_testsuite_gtk.patch +++ pygobject-2.17.0/debian/patches/04_testsuite_gtk.patch @@ -0,0 +1,13 @@ +Index: pygobject-2.16.0/tests/runtests.py +=================================================================== +--- pygobject-2.16.0.orig/tests/runtests.py 2009-03-08 14:11:20.765178704 +0100 ++++ pygobject-2.16.0/tests/runtests.py 2009-03-08 14:11:29.154585458 +0100 +@@ -22,7 +22,7 @@ common.importModules(buildDir=buildDir, + srcDir=srcDir) + + SKIP_FILES = ['common', 'runtests', +- 'test_enum', 'test_conversion'] ++ 'test_enum', 'test_conversion', 'test_subtype'] + + dir = os.path.split(os.path.abspath(__file__))[0] + os.chdir(dir) --- pygobject-2.17.0.orig/debian/patches/62_install-pyglib-in-libdir-with-python-version.patch +++ pygobject-2.17.0/debian/patches/62_install-pyglib-in-libdir-with-python-version.patch @@ -0,0 +1,70 @@ +diff -ruNp pygobject-2.15.4/configure.ac pygobject-2.15.4.new/configure.ac +--- pygobject-2.15.4/configure.ac 2008-08-31 23:26:11.000000000 +0200 ++++ pygobject-2.15.4.new/configure.ac 2008-09-20 11:18:48.000000000 +0200 +@@ -144,6 +144,8 @@ AM_PATH_GLIB_2_0(glib_required_version,, + if test -n "$export_dynamic"; then + GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"` + fi ++PYTHON_BASENAME=`basename $PYTHON` ++AC_SUBST([PYTHON_BASENAME]) + + pygobject_CODEGEN_DEFINES="" + AC_SUBST([pygobject_CODEGEN_DEFINES]) +diff -ruNp pygobject-2.15.4/gio/Makefile.am pygobject-2.15.4.new/gio/Makefile.am +--- pygobject-2.15.4/gio/Makefile.am 2008-08-09 16:26:44.000000000 +0200 ++++ pygobject-2.15.4.new/gio/Makefile.am 2008-09-20 11:32:56.000000000 +0200 +@@ -54,7 +54,7 @@ EXTRA_DIST += $(GIO_DEFS) $(GIO_OVERRIDE + gio.c: $(GIO_DEFS) $(GIO_OVERRIDES) + _gio_la_CFLAGS = $(GIO_CFLAGS) + _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio +-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0.la ++_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la + _gio_la_SOURCES = \ + giomodule.c \ + pygio-utils.c \ +diff -ruNp pygobject-2.15.4/glib/Makefile.am pygobject-2.15.4.new/glib/Makefile.am +--- pygobject-2.15.4/glib/Makefile.am 2008-07-26 15:57:53.000000000 +0200 ++++ pygobject-2.15.4.new/glib/Makefile.am 2008-09-20 11:27:57.000000000 +0200 +@@ -4,7 +4,7 @@ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFL + pkgincludedir = $(includedir)/pygtk-2.0 + pkginclude_HEADERS = pyglib.h + +-lib_LTLIBRARIES = libpyglib-2.0.la ++lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la + + pkgpyexecdir = $(pyexecdir)/gtk-2.0 + +@@ -19,9 +19,9 @@ if PLATFORM_WIN32 + common_ldflags += -no-undefined + endif + +-libpyglib_2_0_la_CFLAGS = $(GLIB_CFLAGS) +-libpyglib_2_0_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) +-libpyglib_2_0_la_SOURCES = \ ++libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS) ++libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) ++libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = \ + pyglib.c \ + pyglib.h \ + pyglib-private.h \ +@@ -29,7 +29,7 @@ libpyglib_2_0_la_SOURCES = \ + + _glib_la_CFLAGS = $(GLIB_CFLAGS) + _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib" +-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0.la ++_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la + _glib_la_SOURCES = \ + glibmodule.c \ + pygiochannel.c \ +diff -ruNp pygobject-2.15.4/gobject/Makefile.am pygobject-2.15.4.new/gobject/Makefile.am +--- pygobject-2.15.4/gobject/Makefile.am 2008-07-27 12:21:46.000000000 +0200 ++++ pygobject-2.15.4.new/gobject/Makefile.am 2008-09-20 11:29:01.000000000 +0200 +@@ -42,7 +42,7 @@ _gobject_la_LDFLAGS = $(common_ldflags) + _gobject_la_LIBADD = \ + $(GLIB_LIBS) \ + $(FFI_LIBS) \ +- $(top_builddir)/glib/libpyglib-2.0.la ++ $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la + _gobject_la_SOURCES = \ + gobjectmodule.c \ + pygboxed.c \ --- pygobject-2.17.0.orig/debian/patches/64_gil_locking.patch +++ pygobject-2.17.0/debian/patches/64_gil_locking.patch @@ -0,0 +1,45 @@ +--- a/gobject/pygobject.c (revision 975) ++++ b/gobject/pygobject.c (working copy) +@@ -291,7 +291,9 @@ + } + + g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec)); ++ pyg_begin_allow_threads; + g_object_get_property(self->pygobject->obj, attr_name, &value); ++ pyg_end_allow_threads; + ret = pyg_param_gvalue_as_pyobject(&value, TRUE, pspec); + g_value_unset(&value); + +@@ -1066,8 +1068,11 @@ + if (self->inst_dict) { + g_object_remove_toggle_ref(self->obj, pyg_toggle_notify, self); + self->private_flags.flags &= ~PYGOBJECT_USING_TOGGLE_REF; +- } else ++ } else { ++ pyg_begin_allow_threads; + g_object_unref(self->obj); ++ pyg_end_allow_threads; ++ } + self->obj = NULL; + } + Py_CLEAR(self->inst_dict); +@@ -1197,7 +1202,9 @@ + return NULL; + } + g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec)); ++ pyg_begin_allow_threads; + g_object_get_property(self->obj, param_name, &value); ++ pyg_end_allow_threads; + ret = pyg_param_gvalue_as_pyobject(&value, TRUE, pspec); + g_value_unset(&value); + return ret; +@@ -1247,7 +1254,9 @@ + } + g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec)); + ++ pyg_begin_allow_threads; + g_object_get_property(self->obj, property_name, &value); ++ pyg_end_allow_threads; + + item = pyg_value_as_pyobject(&value, TRUE); + PyTuple_SetItem(tuple, i, item);