--- pygtk-2.13.0.orig/debian/python-gtk2-dev.rtupdate +++ pygtk-2.13.0/debian/python-gtk2-dev.rtupdate @@ -0,0 +1,46 @@ +#!/bin/sh + +# this script updates symlinks to pkg-config files after a Python default +# runtime change + +if [ "$#" != 3 ]; then + echo "Usage: $0 {pre-rtupdate|post-rtupdate|rtupdate} " >&2 + exit 1 +fi + +action="$1" +oldruntime="$2" +newruntime="$3" + +this="python-gtk2-dev" + +pc_files() { + runtime="$1" + + dpkg -L "$this" | sed -n -e "s#^/usr/lib/pkgconfig/$runtime/##p" +} + +case "$action" in + pre-rtupdate) + ;; + post-rtupdate) + ;; + rtupdate) + echo "Updating *.pc symlinks for $this..." + + cd /usr/lib/pkgconfig + + for f in $(pc_files $oldruntime); do + rm -f "$f" + done + + for f in $(pc_files $newruntime); do + ln -s "$newruntime/$f" + done + ;; + *) + echo "$0 called with unknown argument \`$action'" >&2 + exit 0 + ;; +esac + --- pygtk-2.13.0.orig/debian/copyright +++ pygtk-2.13.0/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Torsten Landschoff on +Tue, 6 Aug 2002 21:50:17 +0200. + +It was downloaded from: + + +Upstream Author: James Henstridge + +Copyright (C) 1998-2006 James Henstridge +Copyright (C) 2004-2006 Johan Dahlin +Copyright (C) 2005-2006 John Finlay +Copyright (C) 2005 Gustavo Carneiro +Copyright (C) 2007 Gian Mario Tagliaretti + +Copyright: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 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 + Library General Public License for more details. + + On Debian systems you should have a local copy of the GNU Library + General Public License in /usr/share/common-licenses/LGPL-2. If you + downloaded the source you will find it in the file COPYING; if not, + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +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. --- pygtk-2.13.0.orig/debian/watch +++ pygtk-2.13.0/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/pygtk/([\d\.]+)[02468]/pygtk-([\d\.]+)\.tar\.gz --- pygtk-2.13.0.orig/debian/python-gtk2-dev.postinst +++ pygtk-2.13.0/debian/python-gtk2-dev.postinst @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +PYTHON_DEFAULT=$(pyversions --default) + +this="python-gtk2-dev" + +pc_files() { + runtime="$1" + + dpkg -L "$this" | sed -n -e "s#^/usr/lib/pkgconfig/$runtime/##p" +} + +if [ "$1" = "configure" ]; then + cd /usr/lib/pkgconfig + + for f in $(pc_files $PYTHON_DEFAULT); do + ln -f -s "$PYTHON_DEFAULT/$f" + done +fi + +#DEBHELPER# + --- pygtk-2.13.0.orig/debian/python-gtk2-doc.preinst +++ pygtk-2.13.0/debian/python-gtk2-doc.preinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if dpkg --compare-versions "$2" lt "2.13.0-1"; then + rm -rf /usr/share/doc/python-gtk2-doc/examples/demos +fi + +#DEBHELPER# --- pygtk-2.13.0.orig/debian/python-gtk2.install +++ pygtk-2.13.0/debian/python-gtk2.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/python*/site-packages/gtk-2.0/*.so +debian/tmp/usr/lib/python*/site-packages/gtk-2.0/gtk/_gtk.so +debian/tmp/usr/lib/python*/site-packages/gtk-2.0/gtk/*.py --- pygtk-2.13.0.orig/debian/control +++ pygtk-2.13.0/debian/control @@ -0,0 +1,146 @@ +Source: pygtk +Section: python +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Torsten Landschoff , + Debian GNOME Maintainers , Josselin Mouette , Loic Minier +Build-Depends: debhelper (>= 5), + python-support (>= 0.7.6), + gnome-pkg-tools (>= 0.10), + cdbs, + autotools-dev, + quilt, + xvfb, xauth, xfonts-base, libgl1-mesa-dri, + python2.5-dev (>= 2.5.2-5), + python-all-dev (>= 2.5), + python-all-dbg, + libgtk2.0-dev (>= 2.13.6), + libglib2.0-dev (>= 2.8.0), + libpango1.0-dev (>= 1.16.0), + libatk1.0-dev (>= 1.12.0), + libglade2-dev (>= 2.5.0), + python-numpy-dbg (>= 1:1.0.4-1~), + python-cairo-dev (>= 1.0.2), + python-gobject-dev (>= 2.15.3), + xsltproc, + docbook-xsl, + autotools-dev, + gnome-icon-theme +XS-Python-Version: >= 2.5 +Standards-Version: 3.8.0 +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/pygtk/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/pygtk/ +Homepage: http://www.pygtk.org/ + +Package: python-gtk2 +Architecture: any +Depends: ${python:Depends}, + python2.5 (>= 2.5.2-5), + ${shlibs:Depends}, + ${misc:Depends} +Python-Depends: python-numpy, + python-cairo (>= 1.0.2-1.1), + python-gobject (>= 2.15.3) +Suggests: python-gtk2-doc +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-gtk2, + python2.4-gtk2, + python-gtk-1.2 (<< 0.6.12-7) +Description: Python bindings for the GTK+ widget set + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + +Package: python-gtk2-dbg +Architecture: any +Priority: extra +Depends: python-gtk2 (= ${binary:Version}), + python-glade2 (= ${binary:Version}), + python-dbg, + python-numpy-dbg, + python-cairo-dbg, + python-gobject-dbg, + ${shlibs:Depends} +Conflicts: python-glade2-dbg +Replaces: python-glade2-dbg +Description: Python bindings for the GTK+ widget set (debug extension) + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + . + This package contains the extension built for the Python debug interpreter. + +Package: python-gtk2-dev +Architecture: all +Depends: ${python:Depends}, + python-gtk2 (>= ${source:Version}), + libglib2.0-dev (>= 2.8), + libgtk2.0-dev (>= 2.13.6), + python2.5-dev (>= 2.5.2-5), + python-dev, + python-gobject-dev (>= 2.15.3) +Recommends: python-gtk2-doc +Replaces: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4) +Conflicts: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4), + python-gdk-imlib, + python-glade, + python-gnome, + python-gtk +Description: GTK+ bindings: devel files + This archive contains files that allow you to build wrappers for addons + that interoperate with python-gtk2 (pygtk). + +Package: python-glade2 +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-gtk2 (= ${binary:Version}) +Suggests: python-gtk2-doc +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-glade2, + python2.4-glade2 +Provides: ${python:Provides} +Description: GTK+ bindings: Glade support + Contains bindings for the glade library from use within Python. Glade + makes it very easy to create a user interface. In the target + application you just need to load the interface description from + the .glade file instead of constructing the GUI at runtime. + +Package: python-gtk2-doc +Architecture: all +Section: doc +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + python-gtk2, +Conflicts: python-gtk2 (<< 2.10.4-3) +Recommends: python-gobject, + python-cairo, + python-glade2 +Suggests: devhelp +Description: Python bindings for the GTK+ widget set - documentation + This package contains the documentation and API reference for the + Python bindings of the Pango, ATK, GDK, GTK+ and Glade libraries. + It is well structured and easy to use. + . + The documentation can be browsed with the devhelp documentation + browser, or with a regular web browser. + . + This package also provides several examples showing how to use these + bindings to build simple GUI applications. --- pygtk-2.13.0.orig/debian/python-gtk2-doc.install +++ pygtk-2.13.0/debian/python-gtk2-doc.install @@ -0,0 +1,3 @@ +debian/tmp/usr/share/gtk-doc +debian/tmp/usr/bin/pygtk-demo +debian/tmp/usr/lib/pygtk/2.0 usr/share/pygtk --- pygtk-2.13.0.orig/debian/python-gtk2-doc.postinst +++ pygtk-2.13.0/debian/python-gtk2-doc.postinst @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +olddir=/usr/share/doc/python-gtk2-doc/html +newdir=../../gtk-doc/html/pygtk + +if [ -d $olddir ] && ! [ -L $olddir ]; then + rmdir --ignore-fail-on-non-empty $olddir && ln -s $newdir $olddir +fi + +#DEBHELPER# --- pygtk-2.13.0.orig/debian/python-gtk2.postinst +++ pygtk-2.13.0/debian/python-gtk2.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +# Cleanup for bytecompiled files in the former package version +rm -f /usr/lib/python2.[34]/site-packages/pygtk.py[co] + +#DEBHELPER# --- pygtk-2.13.0.orig/debian/python-gtk2-dev.prerm +++ pygtk-2.13.0/debian/python-gtk2-dev.prerm @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +PYTHON_DEFAULT=$(pyversions --default) + +this="python-gtk2-dev" + +pc_files() { + runtime="$1" + + dpkg -L "$this" | sed -n -e "s#^/usr/lib/pkgconfig/$runtime/##p" +} + +if [ "$1" = "remove" ]; then + cd /usr/lib/pkgconfig + + for f in $(pc_files $PYTHON_DEFAULT); do + rm -f "$f" + done +fi + +#DEBHELPER# + --- pygtk-2.13.0.orig/debian/python-gtk2-doc.examples +++ pygtk-2.13.0/debian/python-gtk2-doc.examples @@ -0,0 +1,6 @@ +examples/atk +examples/glade +examples/gtk +examples/ide +examples/pango +examples/simple --- pygtk-2.13.0.orig/debian/python-glade2.install +++ pygtk-2.13.0/debian/python-glade2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python*/site-packages/gtk-2.0/gtk/glade.so --- pygtk-2.13.0.orig/debian/rules +++ pygtk-2.13.0/debian/rules @@ -0,0 +1,167 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +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) + +configure_flags += --prefix=/usr --enable-thread --build=$(DEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + configure_flags += --host=$(DEB_HOST_GNU_TYPE) +endif + +PYDEFAULTVER := $(shell pyversions --default --version) +PYVERS := $(shell pyversions --requested --version debian/control) +PYVERS := $(filter-out $(PYDEFAULTVER), $(PYVERS)) $(PYDEFAULTVER) + +.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp + +guessub-stamp: + cp config.sub config.sub.back + cp config.guess config.guess.back + cp -f /usr/share/misc/config.sub config.sub + cp -f /usr/share/misc/config.guess config.guess + touch $@ + +build-%/configure-stamp: apply-patches guessub-stamp + dh_testdir + mkdir -p build-$* + cd build-$* && \ + PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + $(MAKE) -C build-$* + -xvfb-run -s -noreset $(MAKE) -C build-$* check + touch $@ + +dbg-build-%/configure-stamp: + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* && \ + PYTHON=/usr/bin/python$*-dbg CFLAGS="$(CFLAGS) -O0" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + $(MAKE) -C dbg-build-$* + touch $@ + +build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp) + +install-clean: + dh_testdir + dh_testroot + dh_clean -k + +install-%: build-%/build-stamp + dh_testdir + dh_testroot + $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp + # move installed files to a per python runtime location to allow + # comparison of the resulting files across runtimes or shipping + # multiple versions + # pkg-config file (this is shipped twice because of varying pyexecdir) + mkdir debian/tmp/usr/lib/pkgconfig/python$* + mv debian/tmp/usr/lib/pkgconfig/*.pc debian/tmp/usr/lib/pkgconfig/python$* + # defs files, should be the same whatever the build-time python runtime + mkdir debian/tmp/usr/share/pygtk/2.0/defs/python$* + mv debian/tmp/usr/share/pygtk/2.0/defs/*.defs debian/tmp/usr/share/pygtk/2.0/defs/python$* + # headers, should be the same whatever the build-time python runtime + mkdir debian/tmp/usr/include/python$* + mv debian/tmp/usr/include/pygtk-2.0 debian/tmp/usr/include/python$* + +dbg-install-%: dbg-build-%/build-stamp + dh_testdir + dh_testroot + $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gtk2-dbg + find debian/python-gtk2-dbg ! -type d ! -name '*.so' | xargs rm -f + find debian/python-gtk2-dbg -depth -empty -exec rmdir {} \; + +install: build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%) + # check that all builds with various Python runtimes produced the same + # *.defs files (or fail) + for v in $(PYVERS); do \ + echo "Comparing defs files for the default Python version ($(PYDEFAULTVER)) with defs files for Python $$v"; \ + diff --brief --recursive debian/tmp/usr/share/pygtk/2.0/defs/python$(PYDEFAULTVER) debian/tmp/usr/share/pygtk/2.0/defs/python$$v; \ + echo "Comparing headers for the default Python version ($(PYDEFAULTVER)) with headers for Python $$v"; \ + diff --brief --recursive debian/tmp/usr/include/python$(PYDEFAULTVER) debian/tmp/usr/include/python$$v; \ + done + # since all Python runtimes produced the same files, only keep one set + echo "Cleaning up" + mv debian/tmp/usr/share/pygtk/2.0/defs/python$(PYDEFAULTVER)/*.defs debian/tmp/usr/share/pygtk/2.0/defs + mv debian/tmp/usr/include/python$(PYDEFAULTVER)/* debian/tmp/usr/include + for v in $(PYVERS); do \ + rm --force --recursive debian/tmp/usr/share/pygtk/2.0/defs/python$$v; \ + rm --force --recursive debian/tmp/usr/share/include/python$$v; \ + done + # finally, install files from DESTDIR in the per-package dirs + dh_install + # install rtupdate script to handle Python default runtime change + install -d debian/python-gtk2-dev/usr/share/python/runtime.d + install debian/python-gtk2-dev.rtupdate debian/python-gtk2-dev/usr/share/python/runtime.d + + for i in $$(find debian/python-*-dbg -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + +clean:: reverse-patches + dh_testdir + dh_testroot + rm -Rf debian/tmp-* + rm -Rf build-* dbg-build-* + -mv config.sub.back config.sub + -mv config.guess.back config.guess + rm -f guessub-stamp + dh_clean + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs -i + dh_installexamples -i + find debian/python-gtk2-doc/usr/share/doc -name '*.py[co]' -delete + dh_installchangelogs ChangeLog -i + dh_link -i + dh_compress -i -X.py -X.glade + dh_fixperms -i + # More permission fixing + grep -rlZ "^#\!.*python" debian/python-gtk2-dev/usr | xargs -0r chmod 755 + dh_pysupport -ppython-gtk2-doc /usr/share/pygtk + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -s + dh_installexamples -s + dh_installchangelogs ChangeLog -s + dh_strip -s --dbg-package=python-gtk2-dbg + rm -rf debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg + ln -s python-gtk2 debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg + dh_link -s + dh_compress -s -X.py -X.glade + dh_fixperms -s + dh_pysupport -s + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install --- pygtk-2.13.0.orig/debian/changelog +++ pygtk-2.13.0/debian/changelog @@ -0,0 +1,794 @@ +pygtk (2.13.0-2ubuntu4) jaunty; urgency=low + + * debian/patches/65_bogus-python-includes.patch: + - reapplied change to fix the dbg build + + -- Sebastien Bacher Wed, 14 Jan 2009 12:32:35 +0100 + +pygtk (2.13.0-2ubuntu3) jaunty; urgency=low + + * Ignore testsuite failures (xvfb error). + + -- Matthias Klose Thu, 04 Dec 2008 22:12:58 +0100 + +pygtk (2.13.0-2ubuntu2) jaunty; urgency=low + + * Rebuild. pygobject did drop support for python2.4. + + -- Matthias Klose Thu, 04 Dec 2008 19:13:12 +0000 + +pygtk (2.13.0-2ubuntu1) jaunty; urgency=low + + * Sync on debian + * debian/control.in: + - python-gtk2-dbg conflicts and replaces python-glade2-dbg + + -- Sebastien Bacher Thu, 27 Nov 2008 11:23:17 +0100 + +pygtk (2.13.0-2) experimental; urgency=low + + * 03_testsuite_filechooser.patch: new patch. Disable the test of the + file chooser since it requires a writable home. Closes: #506909. + + -- Josselin Mouette Wed, 26 Nov 2008 00:14:32 +0100 + +pygtk (2.13.0-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * Merge -dbg packages and running the test suite from Ubuntu, + thanks to Sebastien Bacher: + - debian/control.in: + + Build-depend on python-all-dbg + + Add python-gtk2-dbg and python-glade2-dbg packages. Closes: #470805. + + python-gtk2 suggests python-gtk2-dbg + + Build-depend on xvfb, needed to run make check during the build. + - debian/rules: + + Add -dbg magic. + + Run the test suite. + - debian/python-gtk2-dev.install: + + Install pygtk-codegen-2.0, which will try to launch + pygobject-codegen-2.0. This is for backwards compatibility. + - debian/python-gtk2-doc.install: + + Install pygtk-demo. + + * Merge new upstream release and fixes from Ubuntu, thanks to Loïc Minier: + - debian/control.in: + + Require libgtk2.0-dev >= 2.13.6 and python-gobject-dev >= 2.15.3. + + Build-depend on xauth, xfonts-base, needed by xvfb, and on + libgl1-mesa-dri too, until Xvfb can start without AIGLX support or it + depends on this package. + + Build-depend on gnome-icon-theme, since some buildds might have + optical drives which require a special icon in the file chooser + (needed for the test suite). + - debian/patches/10_use-default-python.patch: + + Removed, codegen copy has been dropped from pygtk. + - debian/patches/50_wakeupfd-curruption.patch: + + Removed, fixed upstream. + - debian/python-gtk2-dev.install, + debian/rules: + + Drop all codegen related code. + - debian/rules: + + Change permission fixup constructs (chmod 755) to use xargs and not + run if nothing has to be fixed. + + * debian/control.in: + - Bump Standards-Version to 3.8.0. + - Move Homepage to its own field. + - python-glade2 suggests python-glade2-dbg. + - Add Vcs-Browser and Vcs-Svn fields. + - python-gtk2-doc depends on python:Depends and python-gtk2, + needed for pygtk-demo. + - python-gtk2-doc recommends python-gobject and python-cairo, needed + by some examples. + - python-gtk2-doc recommends python-glade2 for the examples, instead + of suggest it. + - Add XB-Python-Version to python-gtk2-doc per Python policy. + * debian/python-gtk2-doc.install: + - Install examples needed by pygtk-demo in /usr/lib/pygtk/2.0 + (their original place) so that pygtk-demo doesn't rely on + /usr/share/doc being available. + * debian/python-gtk2-doc.links, + debian/python-gtk2-doc.preinst: + - Link /usr/share/doc/python-gtk2-doc/examples/demos to /usr/lib/pygtk/2.0 + so that examples are still available in /usr/share/doc. + - Make sure /usr/share/doc/python-gtk2-doc/examples/demos doesn't exist + before upgrading to 2.13.0-1, so that the link is successfully created. + * debian/rules: + - Call dh_pysupport for python-gtk2-doc, so example scripts are + byte-compiled. + - Make $(PYVERS) have the default Python version at the end, so that + the last pygtk build is with the default Python version and + pygtk-demo has the default Python in the hashbang. Also this avoids + python-gtk2-doc depending on a non-default Python version. + Closes: #500118. + * debian/copyright: + - Add Copyright holders. + + [ Loic Minier ] + * Pass -s -noreset to xvfb-run as otherwise Xvfb will reset when the first + client (test) disconnects and xvfb-run will fail killing Xvfb. + + [ Josselin Mouette ] + * Require python 2.5 since pygobject requires it already. + * Do not split debug packages for glade. + * Do not suggest the -dbg packages. + * 01_pygtk-demo.patch: new patch. + + Use /usr/bin/python instead of python2.X. + + Put data in /usr/share. + * Install the demos in /usr/share/pygtk accordingly. + * Rename the demos symlink in examples/ into demo, to avoid doing the + symbolic link dance. + * Switch to quilt for patch handling, build-depend on quilt. + * 02_numpy.patch: new patch, mostly taken from Gentoo. Port to numpy. + Closes: #478452. + * 70_autoconf.patch: run autoconf on top of it. + * Switch all dependencies to python-numpy. + * Build-depend on python-numpy-dbg for the debugging build. + * Copy config.{sub,guess} at config time and clean them later to avoid + having them in the diff. + * Build-depend on autotools-dev. + + -- Josselin Mouette Wed, 12 Nov 2008 17:36:25 +0100 + +pygtk (2.12.1-6) unstable; urgency=low + + * 60_pygtk-wakeupfd-fix.patch: do not use the wakeup fd in + non-threaded applications, which is uninitialised and becomes + stdin. Closes: #484654, #481480. + + -- Josselin Mouette Sat, 07 Jun 2008 14:15:51 +0200 + +pygtk (2.12.1-5) unstable; urgency=low + + * Revert 2.12.1-4 upload, re-add the fix, as anyway wakeupfd is used + since python now supports it. + * 50_wakeupfd-curruption.patch: fix memory corruption that occurs + when using the wakeupfd API, and makes pygtk mostly unusable on + some arches. + + -- Josselin Mouette Tue, 03 Jun 2008 23:08:31 +0200 + +pygtk (2.12.1-4) unstable; urgency=low + + * Also add an explicit python2.5 (>= 2.5.2-5) dep; closes: #481977. + * Drop patch 60_pygtk-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, 27 May 2008 16:21:53 +0200 + +pygtk (2.12.1-3) unstable; urgency=low + + * Bump Standards-Version to 3.7.3. + * s/python/Python in description + * Update 60_pygtk-wakeupfd-fix to use more ifdefs for python without the + wakeupfd support; closes: #481457. + * Build-dep and dep on python2.5-dev >= 2.5.2-5 for wakeupfd support. + + -- Loic Minier Thu, 15 May 2008 21:59:27 +0200 + +pygtk (2.12.1-2) unstable; urgency=low + + * New patch, 60_pygtk-wakeupfd-fix, similar to the fix to the initial + SETWAKEUPFD support in GNOME #481569. + + -- Loic Minier Thu, 15 May 2008 15:28:29 +0200 + +pygtk (2.12.1-1) unstable; urgency=low + + * New upstream release. + + Bump pygobject dependencies to 2.14.0. + + Drop 01_glade_example_README.patch, merged upstream. + + Same for 30_ship_gtk-extrafuncs.defs.patch. + * Wrap Python-Depends; build-depend on python-support 0.7.6. + + -- Josselin Mouette Sat, 12 Jan 2008 04:03:14 +0100 + +pygtk (2.12.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * python-gtk2-doc.postinst: do the symbolic link dance, as the + symbolic link used to be a directory containing the documentation in + the split-out package. Closes: #445600. + + [ Loic Minier ] + * Downgrade Recommends on python-gtk2-doc to Suggests in python-gtk2 and + python-glade2 and let python-gtk2-dev Recommend python-gtk2-doc. + + [ Josselin Mouette ] + * Remove .py[co] files in python-gtk2-doc. Closes: #452844. + + [ Loic Minier ] + * New patch, 30_ship_gtk-extrafuncs.defs, from Ubuntu; fixes missing + gtk-extrafuncs.defs; closes: #454247. + + -- Loic Minier Tue, 04 Dec 2007 11:25:42 +0100 + +pygtk (2.12.0-1) unstable; urgency=low + + * New upstream release. + * Use Python-Depends to generate python dependencies; build-depend on + python-support 0.7.3. + * Build-depend on GTK+ 2.12 to get the 2.12 specific features. + * Bump pango and atk build-dependencies. + + -- Josselin Mouette Sat, 22 Sep 2007 13:08:29 +0200 + +pygtk (2.10.6-1) unstable; urgency=low + + * New upstream release; bug fix. + - Drop patch 60_missing-codegen-fixes, merged upstream. + + -- Loic Minier Tue, 10 Jul 2007 14:31:31 +0200 + +pygtk (2.10.5-2) unstable; urgency=high + + * New patch, 60_missing-codegen-fixes, fixes TypeError crashes in misc apps + such as gnome-sudoku and deskbar-applet which were due to an incomplete + backport of a codegen change; GNOME #455468. + + -- Loic Minier Tue, 10 Jul 2007 13:25:26 +0200 + +pygtk (2.10.5-1) unstable; urgency=low + + * New upstream stable release; bug fixes. + * Misc cleanups. + + -- Loic Minier Thu, 05 Jul 2007 13:43:29 +0200 + +pygtk (2.10.4-3) unstable; urgency=low + + * Split the documentation in the python-gtk2-doc package as it is + really large. Incidentally closes: #428579. + * python:Version -> python:Versions. + * Use source:Version and binary:Version. + * Fix X[SB]-Python-Version mess. + + -- Josselin Mouette Tue, 12 Jun 2007 21:21:57 +0200 + +pygtk (2.10.4-2) unstable; urgency=low + + * Honor CFLAGS we set in rules, doh! + * Set some sane default CFLAGS and honor noopt in DEB_BUILD_OPTIONS. + * Wrap build-deps and deps. + * Upload to unstable; drop check-dist include. + * Fix URL in copyright. + * Add XS and XB-Python-Version. + * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE + differ. + * Cleanups. + + -- Loic Minier Mon, 16 Apr 2007 13:02:48 +0200 + +pygtk (2.10.4-1) experimental; urgency=low + + * Cleanup rules. + * Build-depend on autotools-dev. + * New upstream stable release. + - Drop patch 02_doc_licensing, mostly merged upstream. + + -- Loic Minier Sun, 11 Mar 2007 17:22:53 +0100 + +pygtk (2.10.3-2) experimental; 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. + * Bump up libgtk2.0-dev dep to >= 2.10.0. + + -- Loic Minier Fri, 26 Jan 2007 18:29:33 +0100 + +pygtk (2.10.3-1) experimental; urgency=low + + * New upstream release. + + -- Josselin Mouette Thu, 4 Jan 2007 20:53:33 +0100 + +pygtk (2.10.1-3) experimental; urgency=low + + * python-gtk2-dev depends on python-dev (closes: #401896). + * rules: remove .py[co] files created in the examples directory. + * Build-depend on docbook-xsl (closes: #397811). + * python-gtk2-dev depends on python-gobject-dev (closes: #405348). + + -- Josselin Mouette Tue, 2 Jan 2007 22:26:06 +0100 + +pygtk (2.10.1-2) experimental; urgency=low + + * Switch to cdbs for patch handling. + * 02_doc_licensing.patch: stolen from upstream CVS. Upstream agreed to + relicense the documentation to LGPL. + * copyright: document that. + * rules: binary-indep depends on build and install. + + -- Josselin Mouette Thu, 12 Oct 2006 22:19:30 +0200 + +pygtk (2.10.1-1) experimental; urgency=low + + * New upstream release. + * Update watch file. + * Depend on python-gobject. + * Remove uses of dh_python and pycompat. + * Add appropriate build-dependencies. + * python-gtk2.examples: install all examples. + * python-gtk2.{install,links}: install documentation. + + -- Josselin Mouette Wed, 27 Sep 2006 23:36:13 +0200 + +pygtk (2.8.6-6) unstable; urgency=low + + * Drop alternatives usage (closes: #384189, #385027). + + python-gtk2.install: install pygtk.py in the standard directory. + + python-gtk2.prerm: removed. + + python-gtk2.postinst: remove the alternatives call. + * Add a conflict against python-gtk-1.2 (<< 0.6.12-7). + * Remove abusive Replaces: python-gtk-1.2. + + -- Josselin Mouette Fri, 22 Sep 2006 21:18:07 +0200 + +pygtk (2.8.6-5) unstable; urgency=low + + * Add debian/control to the pyversions -r call since it's mandatory, even if + the man page claims it's optional. + * Update rtupdate script to handle calls with three arguments. + + -- Loic Minier Sat, 5 Aug 2006 22:54:26 +0200 + +pygtk (2.8.6-4) unstable; urgency=low + + * Attempt at supporting pkg-config files for multiple Python runtimes: + - Move *.pc files for each runtime in /usr/lib/pkg-config/pythonXXX. + - Symlink the *.pc files for the default runtime in /usr/lib/pkg-config + during python-gtk2-dev's postinst and remove the symlinks in prerm. + - Delete and re-create the symlinks on default runtime change via a + *.rtupdate script shipped by python-gtk2-dev. + * Misc cleanups in rules. + * Drop useless dh_installdirs call. + * Check that all builds with various Python runtimes produced the same + *.defs files, codegen, and headers, and ship files produced by the default + Python version. + + -- Loic Minier Fri, 21 Jul 2006 22:26:15 +0200 + +pygtk (2.8.6-3) unstable; urgency=low + + * New dpatch, 10_use-default-python, to use $PYTHON when non-empty or the + /usr/bin/python interpreter otherise in pygtk-codegen-2.0 instead of using + the build-time Python interpreter. (Closes: #376013, #376027) + + -- Loic Minier Fri, 30 Jun 2006 18:28:01 +0200 + +pygtk (2.8.6-2) unstable; urgency=low + + * python-gtk2.prerm: run update-python-modules before the alternative + removal. + + -- Josselin Mouette Sun, 25 Jun 2006 15:57:05 +0200 + +pygtk (2.8.6-1) unstable; urgency=low + + [ Marco Cabizza ] + * New upstream version + * Added the watch file + * debian/control, debian/control.in: + - Standards-Version is 3.7.2 + * debian/compat: + - Debhelper compatibility is 5 + + [ Josselin Mouette ] + * Revert changes from the NMU (closes: #374804, #374811). + * Require debhelper 5.0.37.2 and python-support 0.3.4. + * Make package binNMU-able by having python-gtk2-dev depend on + python-gtk2 >= ${Source-Version}. + * pycompat: python standards = 2. + * pyversions: we need python >= 2.3. + * Make the package comply with the new policy: + + Remove python2.3-* and python2.4-* packages. + + Correct package descriptions accordingly. + * Replace the multiple alternatives in the postinst by a single + alternative pointing to /usr/share/python-support/python-gtk. + * python-glade2.examples: move examples one directory up. + * rules: rework and simplify. + * Remove move_files and use *.install files instead. + + Don't install the .la files, which are useless anyway. + * rules: don't use config.status as the configure target because of + the stupid way make treats intermediary files. + * Require some minimum versions for python-cairo and python-numeric. + * python-gtk2.postinst: cleanup pygtk.py[co] from the former package, + as they were not handled. + + -- Josselin Mouette Sat, 24 Jun 2006 12:26:15 +0200 + +pygtk (2.8.2-3) unstable; urgency=low + + * Upload to unstable. + + -- Jordi Mallach Mon, 9 Jan 2006 18:29:31 +0100 + +pygtk (2.8.2-2) experimental; urgency=low + + * debian/control.in: + - python-gtk2-dev Depends on libglib2.0-dev libgtk2.0-dev. + - updated the requirements on glib/gtk. + * debian/rules: + - install the example files to the versionned packages. + + -- Sebastien Bacher Thu, 20 Oct 2005 11:06:23 +0200 + +pygtk (2.8.2-1) experimental; urgency=low + + * New upstream release. + + -- Loic Minier Tue, 18 Oct 2005 17:25:11 +0200 + +pygtk (2.8.1-1) experimental; urgency=low + + * New upstream release. + * Copy python2.3-glade2.examples to python2.4-glade2.examples. + (Closes: #331403) [debian/python2.4-glade2.examples] + * Fix python 2.3 / 2.4 substitution, patch by Roland Stigge. + (Closes: #331402) [debian/rules] + + -- Loic Minier Sun, 9 Oct 2005 13:54:06 +0200 + +pygtk (2.8.0-1) experimental; urgency=low + + * New upstream version (Closes: #325986) + * debian/control.in: + - Build-Dep on gtk+ >= 2.8.0, libxrender-dev (added) + - Build-Dep on python-cairo-dev + - python2.?-gtk2 Depend on the corresponding python2.?-cairo packages + + -- Gustavo Noronha Silva Tue, 27 Sep 2005 14:38:26 -0300 + +pygtk (2.6.3-1) unstable; urgency=low + + * New upstream version + * debian/patches/01_glade_example_README.dpatch (added), debian/rules: + - fix name of the script to be called on the README and do not compress + the sample glade files (Closes: #270478) + * debian/copyright: + - fix FSF's address + * debian/control.in: + - upgraded Standards-Version to 3.6.2 with no changes + + -- Gustavo Noronha Silva Wed, 21 Sep 2005 14:35:43 -0300 + +pygtk (2.6.2-3) UNRELEASED; urgency=low + + * debian/control.in, debian/rules, python2.4-gtk2.{postinst,prerm}: + - support 2.4 versions of the packages (Closes: #292796, #329029) + - some help from Bastian Kleineidam 's patch and + advice from Ross Burton and Sebastien Bacher were used + * debian/rules: + - readded the code to update config.{sub,guess} + * debian/control.in, debian/changelog, debian/README.Debian: + - change source package name + + -- Gustavo Noronha Silva Wed, 21 Sep 2005 11:00:19 -0300 + +python-gtk2 (2.6.2-2) UNRELEASED; urgency=low + + * Move source to pkg-gnome, and add GNOME Team to uploaders + * Remove useless Mesa build-dep + * Add missing libglib2.0-dev build-dep + * Remove useless (I hope) patch to config.sub/config.guess + + -- Ross Burton Fri, 9 Sep 2005 17:31:51 +0100 + +python-gtk2 (2.6.2-1) unstable; urgency=low + + * New upstream version. + + -- Sebastien Bacher Mon, 9 May 2005 23:53:44 +0200 + +python-gtk2 (2.6.1-2) unstable; urgency=low + + * CVS patch to fix the crash when argv is not set (Closes: #299328). + + -- Sebastien Bacher Thu, 17 Mar 2005 17:08:41 +0100 + +python-gtk2 (2.6.1-1) unstable; urgency=low + + * New upstream release. + * CVS patch to fix the crash when argv is not set (Closes: #299328). + + -- Sebastien Bacher Thu, 17 Mar 2005 15:17:17 +0100 + +python-gtk2 (2.6.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - updated the Build-Depends. + * debian/python2.3-gtk2.examples: + - now pygtk-demo is in the standard installation. + * debian/rules: + - install pygtk-demo in /usr/bin. + + -- Sebastien Bacher Wed, 9 Mar 2005 19:11:55 +0100 + +python-gtk2 (2.4.1-2) unstable; urgency=low + + * debian/control: + - python-gtk2 depends on the current version of python2.3-gtk2 + (Closes: #281488). + * debian/install-examples: + - not needed since the examples are uncompressed now. + * debian/rules: + - dont' compress examples (Closes: #279604). + - removed extra .pyc files (Closes: #276353). + + -- Sebastien Bacher Mon, 22 Nov 2004 11:48:19 +0100 + +python-gtk2 (2.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sun, 7 Nov 2004 18:08:22 +0100 + +python-gtk2 (2.4.0-2) unstable; urgency=low + + * apply the CVS fix to not use "typename" which is a C++ keyword + (Closes: #276518). + + -- Sebastien Bacher Thu, 14 Oct 2004 19:20:01 +0200 + +python-gtk2 (2.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 4 Oct 2004 00:08:21 +0200 + +python-gtk2 (2.3.97-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Tue, 28 Sep 2004 17:34:16 +0200 + +python-gtk2 (2.3.96-1) experimental; urgency=low + + * New upstream version + - fixes the crash with gtk.icon_size_register (Closes: #261109). + * debian/control: + - Build-Depends on python2.3-numeric. + * debian/move_files: + - fixed the regexp to get python versions to use. + + -- Sebastien Bacher Fri, 6 Aug 2004 19:19:57 +0200 + +python-gtk2 (2.3.95-1) experimental; urgency=low + + * New upstream release + - require python 2.3 and gtk+ 2.4. + * debian/control: + - removed the python2.2-* packages. + - updated the Build-Depends. + * debian/python2.2*: + - removed. + * debian/rules: + - removed python2.2-* build. + + -- Sebastien Bacher Mon, 2 Aug 2004 14:25:53 +0200 + +python-gtk2 (2.3.94-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Thu, 22 Jul 2004 00:16:46 +0200 + +python-gtk2 (2.3.93-2) experimental; urgency=low + + * CVS patch to fix the libglade problem. + + -- Sebastien Bacher Tue, 20 Jul 2004 16:53:28 +0200 + +python-gtk2 (2.3.93-1) experimental; urgency=low + + * New upstream release: + - fix gtk.gdk.window_lookup assertion (Closes: #237125). + * debian/control: + - Build-Depends on python. + + -- Sebastien Bacher Mon, 19 Jul 2004 18:45:30 +0200 + +python-gtk2 (2.3.92-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sat, 22 May 2004 13:12:10 +0200 + +python-gtk2 (2.3.91-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Fri, 16 Apr 2004 21:38:01 +0200 + +python-gtk2 (2.3.90-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Wed, 7 Apr 2004 23:39:54 +0200 + +python-gtk2 (2.2.0-1) unstable; urgency=low + + * New upstream release: + + removed gtkgl bindings. + * debian/control: + + remove gtkgl packages. + * debian/patches/01pixmap_foreign_new_leak.dpatch: + + removed since the changes are in new version. + + -- Sebastien Bacher Thu, 11 Mar 2004 23:10:34 +0100 + +python-gtk2 (2.0.0-4) unstable; urgency=low + + * debian/patches/01pixmap_foreign_new_leak.dpatch: + + patch to fix a mem leak with pixmaps. + + -- Sebastien Bacher Sun, 22 Feb 2004 22:39:34 +0100 + +python-gtk2 (2.0.0-3) unstable; urgency=low + + * Removed pygtk.py[co] (Closes: #222473, #222985). + + -- Sebastien Bacher Fri, 5 Dec 2003 17:27:46 +0100 + +python-gtk2 (2.0.0-2) unstable; urgency=low + + * Removed python2.2-gtkgl2 since python-opengl is only for python2.3. + * Removed pygtk 1.2 examples (Closes: #210987). + + -- Sebastien Bacher Wed, 17 Sep 2003 16:41:58 +0200 + +python-gtk2 (2.0.0-1) unstable; urgency=low + + * New upstream. + * Stable version is out, it's time to switch pygtk default version + from 1.2 to 2 (Closes: #163253). + * Fixed install-examples (Closes: #208234). + + -- Sebastien Bacher Mon, 1 Sep 2003 18:15:40 +0200 + +python-gtk2 (1.99.18-1) unstable; urgency=low + + * New upstream release. + * Updated to Standards-Version 3.6.1.0. + + -- Sebastien Bacher Sun, 24 Aug 2003 17:41:23 +0200 + +python-gtk2 (1.99.17-6) unstable; urgency=low + + * Added missing depends on python-numeric (Closes: #205362). + + -- Sebastien Bacher Thu, 14 Aug 2003 13:42:58 +0200 + +python-gtk2 (1.99.17-5) unstable; urgency=low + + * Added missing pygtk-codegen-2.0 to python-gtk2-dev. + + -- Sebastien Bacher Thu, 14 Aug 2003 01:45:33 +0200 + +python-gtk2 (1.99.17-4) unstable; urgency=low + + * Fixed overwrite problem (Closes: #205176). + * Added python-gtk2-dev package with devel files. + + -- Sebastien Bacher Wed, 13 Aug 2003 14:38:32 +0200 + +python-gtk2 (1.99.17-3) unstable; urgency=low + + * Fixed depends. + * debian/rules + + Changed header of py files with Matthias Klose's script. + + -- Sebastien Bacher Tue, 12 Aug 2003 22:09:50 +0200 + +python-gtk2 (1.99.17-2) unstable; urgency=low + + * Now python 2.3 is the default version. + * Use dh_python. + + -- Sebastien Bacher Mon, 11 Aug 2003 13:19:09 +0200 + +python-gtk2 (1.99.17-1) unstable; urgency=low + + * New upstream release. + * I've more interest on pygtk than Torsten for the moment, so we switch + maintainer and uploaders field. + + -- Sebastien Bacher Thu, 31 Jul 2003 18:38:46 +0200 + +python-gtk2 (1.99.16-3) unstable; urgency=low + + * Added Depends on python-opengl for python-gtkgl2 (Closes: #196064). + * Added a "install-examples" script in examples dir to install gunzip + demos (Closes: #193841) + * Updated to standards version 3.6.0. + * Added homepage and author to the description. + + -- Sebastien Bacher Fri, 13 Jun 2003 22:29:49 +0200 + +python-gtk2 (1.99.16-2) unstable; urgency=low + + * Fixed libglade example (Closes: #189321). + * Updated to standards version 3.5.9. + * Added Depends on ${misc:Depends}. + * Changed section to python. + + -- Sebastien Bacher Fri, 2 May 2003 12:22:29 +0200 + +python-gtk2 (1.99.16-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 24 Mar 2003 01:44:07 +0100 + +python-gtk2 (1.99.15-2) unstable; urgency=low + + * Remove *.pyc and *.pyo from the package. These files are compiled after + the installation (that change the size of the files and make the debsums + failed), so we don't need to have them in the package (Closes: #181211). + + -- Sebastien Bacher Sat, 22 Feb 2003 15:25:25 +0100 + +python-gtk2 (1.99.15-1) unstable; urgency=low + + * Co-maintainer upload. + * New upstream version. + * Depends on a versioned python2.2-gtk2 (Closes: #179376). + * Updated to standards-version 3.5.8. + + -- Sebastien Bacher Fri, 21 Feb 2003 17:50:28 +0100 + +python-gtk2 (1.99.14-1) unstable; urgency=low + + * Co-maintainer upload. + * New upstream version. (Closes: #174997). + * Package is compiled with thread support (Closes: #163037). + * Corrected depend on libgtk2.0-0 (Closes: #162382). + * Added a README.Debian file (Closes: #160342). + * Corrected descriptions in control file to fix some lintian error. + * Fixed examples (Closes: #171982, #167945, #163794). + + -- Sebastien Bacher Fri, 31 Jan 2003 18:12:00 +0100 + +python-gtk2 (1.99.13-4) unstable; urgency=low + + * Rebuild against latest python2.3 (closes: #173819). + + -- Torsten Landschoff Sat, 21 Dec 2002 02:28:41 +0100 + +python-gtk2 (1.99.13-3) unstable; urgency=low + + * debian/rules: Explicitely enable threading support since the default + seems to disable it. Noticed by Matthias Urlichs - I did not notice + I was missing something. + + -- Torsten Landschoff Wed, 2 Oct 2002 00:06:29 +0200 + +python-gtk2 (1.99.13-2) unstable; urgency=low + + * debian/move_files: Fix the check_completeness function (find's return + code is not really useful it seems). + * debian/control: + + Add Sebastien Bacher as co-maintainer. + + Make the package conflict with older python-gtk versions that + don't support the pygtk.py alternative. + * debian/python2.*-gtk2.{postinst,prerm}: Manage the pygtk.py alternatives. + + -- Torsten Landschoff Sat, 31 Aug 2002 19:04:24 +0200 + +python-gtk2 (1.99.13-1) unstable; urgency=low + + * New upstream release. + * Build modules for python 2.2 as well as for 2.3. + * Create dummy packages python-* to pull the right package for + the default python release. + + -- Torsten Landschoff Fri, 30 Aug 2002 18:47:09 +0200 + +python-gtk2 (1.99.12-1) unstable; urgency=low + + * Initial Release. + + -- Torsten Landschoff Tue, 6 Aug 2002 21:50:17 +0200 + --- pygtk-2.13.0.orig/debian/README.Debian +++ pygtk-2.13.0/debian/README.Debian @@ -0,0 +1,11 @@ +pygtk for Debian +---------------- + +To use the new gtk, you'll need to use the following code: + +import pygtk +pygtk.require('2.0') +import gtk + + + -- Gustavo Noronha Silva , Wed Sep 21 10:59:53 2005 --- pygtk-2.13.0.orig/debian/python-gtk2-dev.install +++ pygtk-2.13.0/debian/python-gtk2-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include +debian/tmp/usr/bin/pygtk-codegen-2.0 +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/share/pygtk --- pygtk-2.13.0.orig/debian/python-gtk2-doc.links +++ pygtk-2.13.0/debian/python-gtk2-doc.links @@ -0,0 +1,2 @@ +/usr/share/gtk-doc/html/pygtk /usr/share/doc/python-gtk2-doc/html +/usr/share/pygtk/2.0/demos /usr/share/doc/python-gtk2-doc/examples/demo --- pygtk-2.13.0.orig/debian/docs +++ pygtk-2.13.0/debian/docs @@ -0,0 +1,5 @@ +NEWS +README +TODO +MAPPING +THREADS --- pygtk-2.13.0.orig/debian/control.in +++ pygtk-2.13.0/debian/control.in @@ -0,0 +1,146 @@ +Source: pygtk +Section: python +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Torsten Landschoff , + @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + python-support (>= 0.7.6), + gnome-pkg-tools (>= 0.10), + cdbs, + autotools-dev, + quilt, + xvfb, xauth, xfonts-base, libgl1-mesa-dri, + python2.5-dev (>= 2.5.2-5), + python-all-dev (>= 2.5), + python-all-dbg, + libgtk2.0-dev (>= 2.13.6), + libglib2.0-dev (>= 2.8.0), + libpango1.0-dev (>= 1.16.0), + libatk1.0-dev (>= 1.12.0), + libglade2-dev (>= 2.5.0), + python-numpy-dbg (>= 1:1.0.4-1~), + python-cairo-dev (>= 1.0.2), + python-gobject-dev (>= 2.15.3), + xsltproc, + docbook-xsl, + autotools-dev, + gnome-icon-theme +XS-Python-Version: >= 2.5 +Standards-Version: 3.8.0 +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/pygtk/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/pygtk/ +Homepage: http://www.pygtk.org/ + +Package: python-gtk2 +Architecture: any +Depends: ${python:Depends}, + python2.5 (>= 2.5.2-5), + ${shlibs:Depends}, + ${misc:Depends} +Python-Depends: python-numpy, + python-cairo (>= 1.0.2-1.1), + python-gobject (>= 2.15.3) +Suggests: python-gtk2-doc +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-gtk2, + python2.4-gtk2, + python-gtk-1.2 (<< 0.6.12-7) +Description: Python bindings for the GTK+ widget set + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + +Package: python-gtk2-dbg +Architecture: any +Priority: extra +Depends: python-gtk2 (= ${binary:Version}), + python-glade2 (= ${binary:Version}), + python-dbg, + python-numpy-dbg, + python-cairo-dbg, + python-gobject-dbg, + ${shlibs:Depends} +Conflicts: python-glade2-dbg +Replaces: python-glade2-dbg +Description: Python bindings for the GTK+ widget set (debug extension) + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + . + This package contains the extension built for the Python debug interpreter. + +Package: python-gtk2-dev +Architecture: all +Depends: ${python:Depends}, + python-gtk2 (>= ${source:Version}), + libglib2.0-dev (>= 2.8), + libgtk2.0-dev (>= 2.13.6), + python2.5-dev (>= 2.5.2-5), + python-dev, + python-gobject-dev (>= 2.15.3) +Recommends: python-gtk2-doc +Replaces: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4) +Conflicts: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4), + python-gdk-imlib, + python-glade, + python-gnome, + python-gtk +Description: GTK+ bindings: devel files + This archive contains files that allow you to build wrappers for addons + that interoperate with python-gtk2 (pygtk). + +Package: python-glade2 +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-gtk2 (= ${binary:Version}) +Suggests: python-gtk2-doc +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-glade2, + python2.4-glade2 +Provides: ${python:Provides} +Description: GTK+ bindings: Glade support + Contains bindings for the glade library from use within Python. Glade + makes it very easy to create a user interface. In the target + application you just need to load the interface description from + the .glade file instead of constructing the GUI at runtime. + +Package: python-gtk2-doc +Architecture: all +Section: doc +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, + ${python:Depends}, + python-gtk2, +Conflicts: python-gtk2 (<< 2.10.4-3) +Recommends: python-gobject, + python-cairo, + python-glade2 +Suggests: devhelp +Description: Python bindings for the GTK+ widget set - documentation + This package contains the documentation and API reference for the + Python bindings of the Pango, ATK, GDK, GTK+ and Glade libraries. + It is well structured and easy to use. + . + The documentation can be browsed with the devhelp documentation + browser, or with a regular web browser. + . + This package also provides several examples showing how to use these + bindings to build simple GUI applications. --- pygtk-2.13.0.orig/debian/compat +++ pygtk-2.13.0/debian/compat @@ -0,0 +1 @@ +5 --- pygtk-2.13.0.orig/debian/patches/60_pygtk-wakeupfd-fix.patch +++ pygtk-2.13.0/debian/patches/60_pygtk-wakeupfd-fix.patch @@ -0,0 +1,55 @@ +Index: pygtk-2.13.0/gtk/gtk.override +=================================================================== +--- pygtk-2.13.0.orig/gtk/gtk.override 2008-11-12 17:59:15.427489178 +0100 ++++ pygtk-2.13.0/gtk/gtk.override 2008-11-12 17:59:19.103489690 +0100 +@@ -37,6 +37,8 @@ extern PyTypeObject PyGdkCairoContext_Ty + + #include "pygtk-private.h" + ++#include ++ + #define PYGTK_CONTAINER_FOREACH 0 + #define PYGTK_CONTAINER_FORALL 1 + #define countof(array) (sizeof(array)/sizeof(array[0])) +@@ -1069,7 +1071,10 @@ static gboolean + pygtk_main_watch_prepare(GSource *source, + int *timeout) + { ++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD + PySignalWatchSource *real_source = (PySignalWatchSource *)source; ++ int flag; ++#endif + + /* Python only invokes signal handlers from the main thread, + * so if a thread other than the main thread receives the signal +@@ -1103,6 +1108,11 @@ pygtk_main_watch_prepare(GSource *source + real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR; + g_source_add_poll(source, &real_source->fd); + ++ /* 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); ++ + PySignal_SetWakeupFd(real_source->fds[1]); + + #else /* !HAVE_PYSIGNAL_SETWAKEUPFD */ +@@ -1122,8 +1132,18 @@ pygtk_main_watch_check(GSource *source) + { + PyGILState_STATE state; + ++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD ++ PySignalWatchSource *real_source = (PySignalWatchSource *)source; ++ char buf[1]; ++#endif ++ + state = pyg_gil_state_ensure(); + ++#ifdef HAVE_PYSIGNAL_SETWAKEUPFD ++ if (real_source->fds[0]) ++ read(real_source->fds[0], &buf, 1); ++#endif ++ + if (PyErr_CheckSignals() == -1 && gtk_main_level() > 0) { + PyErr_SetNone(PyExc_KeyboardInterrupt); + gtk_main_quit(); --- pygtk-2.13.0.orig/debian/patches/02_numpy.patch +++ pygtk-2.13.0/debian/patches/02_numpy.patch @@ -0,0 +1,81 @@ +Index: pygtk-2.13.0/README +=================================================================== +--- pygtk-2.13.0.orig/README 2008-11-12 18:04:27.870985209 +0100 ++++ pygtk-2.13.0/README 2008-11-12 18:04:34.210985126 +0100 +@@ -54,7 +54,7 @@ Requirements + GTK+ 2.14.0 or higher for 2.14 API + * libglade 2.5.0 or higher (optional) + * pycairo 1.0.2 or higher (optional) +- * Numeric (optional) ++ * numpy (optional) + + This release is supporting the following GTK+ releases: + +Index: pygtk-2.13.0/configure.ac +=================================================================== +--- pygtk-2.13.0.orig/configure.ac 2008-11-12 17:59:44.822987000 +0100 ++++ pygtk-2.13.0/configure.ac 2008-11-12 18:01:50.203309500 +0100 +@@ -336,18 +336,19 @@ case $gdk_target in + esac + + +-dnl checks to see if Numeric Python is installed. ++dnl checks to see if numpy is installed. + AC_ARG_ENABLE(numpy, + AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),, + enable_numpy=yes) + + if test "x$enable_numpy" != xno; then + save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +- AC_CHECK_HEADER([Numeric/arrayobject.h], ++ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"` ++ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES" ++ AC_CHECK_HEADER([numpy/arrayobject.h], + [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],, + [#include ]) +- CPPFLAGS="$save_CPPFLAGS" ++ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES" + fi + + +Index: pygtk-2.13.0/gtk/gdk.override +=================================================================== +--- pygtk-2.13.0.orig/gtk/gdk.override 2008-11-12 18:04:06.139490006 +0100 ++++ pygtk-2.13.0/gtk/gdk.override 2008-11-12 18:04:11.850987486 +0100 +@@ -43,7 +43,7 @@ headers + #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object)) + + #ifdef HAVE_NUMPY +-# include ++# include + static int have_numpy(void); + #endif + +Index: pygtk-2.13.0/setup.py +=================================================================== +--- pygtk-2.13.0.orig/setup.py 2008-11-12 18:02:06.030988087 +0100 ++++ pygtk-2.13.0/setup.py 2008-11-12 18:02:57.707318739 +0100 +@@ -228,16 +228,16 @@ if pango.can_build(): + data_files.append((DEFS_DIR, ('pangocairo.defs',))) + GLOBAL_MACROS.append(('HAVE_PYCAIRO',1)) + if gtk.can_build(): +- if '--disable-numeric' in sys.argv: +- sys.argv.remove('--disable-numeric') ++ if '--disable-numpy' in sys.argv: ++ sys.argv.remove('--disable-numpy') + else: + try: +- import Numeric +- Numeric # pyflakes ++ import numpy ++ numpy # pyflakes + GLOBAL_MACROS.append(('HAVE_NUMPY', 1)) + except ImportError: +- print ('* Numeric module could not be found, ' +- 'will build without Numeric support.') ++ print ('* numpy module could not be found, ' ++ 'will build without numpy support.') + ext_modules.append(gtk) + data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',))) + data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs', --- pygtk-2.13.0.orig/debian/patches/series +++ pygtk-2.13.0/debian/patches/series @@ -0,0 +1,6 @@ +01_pygtk-demo.patch +02_numpy.patch +03_testsuite_filechooser.patch +60_pygtk-wakeupfd-fix.patch +65_bogus-python-includes.patch +70_autoconf.patch --- pygtk-2.13.0.orig/debian/patches/03_testsuite_filechooser.patch +++ pygtk-2.13.0/debian/patches/03_testsuite_filechooser.patch @@ -0,0 +1,13 @@ +Index: pygtk-2.13.0/tests/runtests.py +=================================================================== +--- pygtk-2.13.0.orig/tests/runtests.py 2008-11-26 00:13:20.451100628 +0100 ++++ pygtk-2.13.0/tests/runtests.py 2008-11-26 00:13:34.107100762 +0100 +@@ -21,7 +21,7 @@ else: + common.importModules(buildDir=buildDir, + srcDir=srcDir) + +-SKIP_FILES = ['common', 'runtests', 'testmodule'] ++SKIP_FILES = ['common', 'runtests', 'testmodule', 'test_filechooserdialog'] + + dir = os.path.split(os.path.abspath(__file__))[0] + os.chdir(dir) --- pygtk-2.13.0.orig/debian/patches/65_bogus-python-includes.patch +++ pygtk-2.13.0/debian/patches/65_bogus-python-includes.patch @@ -0,0 +1,13 @@ +Don't override PYTHON_INCLUDES, it's already set by AM_CHECK_PYTHON_HEADERS; +GNOME #556130; LP #282320. + +--- pygtk-2.13.0/configure.ac 2008-08-24 11:01:38.000000000 +0200 ++++ pygtk-2.13.0.new/configure.ac 2008-10-13 15:05:57.000000000 +0200 +@@ -79,7 +79,6 @@ + + AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h]) + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" + AC_TRY_COMPILE([#include ], --- pygtk-2.13.0.orig/debian/patches/70_autoconf.patch +++ pygtk-2.13.0/debian/patches/70_autoconf.patch @@ -0,0 +1,1039 @@ +Index: pygtk-2.13.0/configure +=================================================================== +--- pygtk-2.13.0.orig/configure 2008-08-24 11:29:32.000000000 +0200 ++++ pygtk-2.13.0/configure 2009-01-14 13:37:52.000000000 +0100 +@@ -809,6 +809,7 @@ + INSTALL_PROGRAM + INSTALL_SCRIPT + INSTALL_DATA ++am__isrc + CYGPATH_W + PACKAGE + VERSION +@@ -2078,7 +2079,8 @@ + ac_config_headers="$ac_config_headers config.h" + + +-am__api_version="1.9" ++am__api_version='1.10' ++ + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then +@@ -2261,38 +2263,53 @@ + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' ++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++done ++IFS=$as_save_IFS ++ ++fi ++ ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" + else +- mkdir_p='$(install_sh) -d' ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ test -d ./--version && rmdir ./--version ++ MKDIR_P="$ac_install_sh -d" + fi + fi ++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++echo "${ECHO_T}$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac + + for ac_prog in gawk mawk nawk awk + do +@@ -2375,12 +2392,16 @@ + fi + rmdir .tst 2>/dev/null + +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 + echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } ++ fi + fi + + # test whether we have cygpath +@@ -2423,7 +2444,7 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2527,7 +2548,7 @@ + fi + + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -2594,9 +2615,7 @@ + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- +- +-if test "x$enable_dependency_tracking" != xno; then ++ if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -2605,7 +2624,6 @@ + fi + + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -3592,6 +3610,7 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -3621,9 +3640,7 @@ + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -3827,9 +3844,7 @@ + esac + { echo "$as_me:$LINENO: result: $platform_win32" >&5 + echo "${ECHO_T}$platform_win32" >&6; } +- +- +-if test "$platform_win32" = "yes"; then ++ if test "$platform_win32" = "yes"; then + PLATFORM_WIN32_TRUE= + PLATFORM_WIN32_FALSE='#' + else +@@ -3850,9 +3865,7 @@ + esac + { echo "$as_me:$LINENO: result: $os_win32" >&5 + echo "${ECHO_T}$os_win32" >&6; } +- +- +-if test "$os_win32" = "yes"; then ++ if test "$os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' + else +@@ -4591,7 +4604,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4594 "configure"' > conftest.$ac_ext ++ echo '#line 4607 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -6971,11 +6984,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:6974: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6987: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6978: \$? = $ac_status" >&5 ++ echo "$as_me:6991: \$? = $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. +@@ -7261,11 +7274,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:7264: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7277: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7268: \$? = $ac_status" >&5 ++ echo "$as_me:7281: \$? = $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. +@@ -7365,11 +7378,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:7368: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7381: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7372: \$? = $ac_status" >&5 ++ echo "$as_me:7385: \$? = $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 +@@ -9742,7 +9755,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo $ECHO_N "checking for PySignal_SetWakeupFd in Python.h... $ECHO_C" >&6; } + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" + cat >conftest.$ac_ext <<_ACEOF +@@ -10901,9 +10913,7 @@ + fi + fi + +- +- +-if test x$enable_docs != xno; then ++ if test x$enable_docs != xno; then + ENABLE_DOCS_TRUE= + ENABLE_DOCS_FALSE='#' + else +@@ -11144,8 +11154,9 @@ + { + int major, minor, micro; + char *tmp_version; ++ int ignored; + +- system ("touch conf.glibtest"); ++ ignored = system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); +@@ -11539,9 +11550,7 @@ + fi + + +- +- +-if $have_atk; then ++ if $have_atk; then + BUILD_ATK_TRUE= + BUILD_ATK_FALSE='#' + else +@@ -11626,9 +11635,7 @@ + fi + + +- +- +-if $have_pango; then ++ if $have_pango; then + BUILD_PANGO_TRUE= + BUILD_PANGO_FALSE='#' + else +@@ -11842,9 +11849,7 @@ + fi + + +- +- +-if $have_pangocairo; then ++ if $have_pangocairo; then + BUILD_PANGOCAIRO_TRUE= + BUILD_PANGOCAIRO_FALSE='#' + else +@@ -11935,9 +11940,7 @@ + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi +- +- +-if $have_gtk; then ++ if $have_gtk; then + BUILD_GTK_TRUE= + BUILD_GTK_FALSE='#' + else +@@ -12032,9 +12035,7 @@ + have_gtk_210=false + fi + +- +- +-if $have_gtk_210; then ++ if $have_gtk_210; then + HAVE_GTK_2_10_TRUE= + HAVE_GTK_2_10_FALSE='#' + else +@@ -12131,9 +12132,7 @@ + have_gtk_212=false + fi + +- +- +-if $have_gtk_212; then ++ if $have_gtk_212; then + HAVE_GTK_2_12_TRUE= + HAVE_GTK_2_12_FALSE='#' + else +@@ -12238,9 +12237,7 @@ + have_gtk_214=false + fi + +- +- +-if $have_gtk_214; then ++ if $have_gtk_214; then + HAVE_GTK_2_14_TRUE= + HAVE_GTK_2_14_FALSE='#' + else +@@ -12328,9 +12325,7 @@ + fi + + +- +- +-if $have_libglade; then ++ if $have_libglade; then + BUILD_LIBGLADE_TRUE= + BUILD_LIBGLADE_FALSE='#' + else +@@ -12415,9 +12410,7 @@ + fi + + +- +- +-if $have_gtkunixprint; then ++ if $have_gtkunixprint; then + BUILD_GTKUNIXPRINT_TRUE= + BUILD_GTKUNIXPRINT_FALSE='#' + else +@@ -12434,9 +12427,7 @@ + echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: result: not checking for gtk due to missing pycairo" >&5 + echo "${ECHO_T}not checking for gtk due to missing pycairo" >&6; } +- +- +-if false; then ++ if false; then + BUILD_PANGOCAIRO_TRUE= + BUILD_PANGOCAIRO_FALSE='#' + else +@@ -12444,9 +12435,7 @@ + BUILD_PANGOCAIRO_FALSE= + fi + +- +- +-if false; then ++ if false; then + BUILD_GTK_TRUE= + BUILD_GTK_FALSE='#' + else +@@ -12454,9 +12443,7 @@ + BUILD_GTK_FALSE= + fi + +- +- +-if false; then ++ if false; then + HAVE_GTK_2_10_TRUE= + HAVE_GTK_2_10_FALSE='#' + else +@@ -12464,9 +12451,7 @@ + HAVE_GTK_2_10_FALSE= + fi + +- +- +-if false; then ++ if false; then + HAVE_GTK_2_12_TRUE= + HAVE_GTK_2_12_FALSE='#' + else +@@ -12474,9 +12459,7 @@ + HAVE_GTK_2_12_FALSE= + fi + +- +- +-if false; then ++ if false; then + HAVE_GTK_2_14_TRUE= + HAVE_GTK_2_14_FALSE='#' + else +@@ -12484,9 +12467,7 @@ + HAVE_GTK_2_14_FALSE= + fi + +- +- +-if false; then ++ if false; then + BUILD_LIBGLADE_TRUE= + BUILD_LIBGLADE_FALSE='#' + else +@@ -12494,9 +12475,7 @@ + BUILD_LIBGLADE_FALSE= + fi + +- +- +-if false; then ++ if false; then + BUILD_GTKUNIXPRINT_TRUE= + BUILD_GTKUNIXPRINT_FALSE='#' + else +@@ -12539,10 +12518,11 @@ + + if test "x$enable_numpy" != xno; then + save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +- { echo "$as_me:$LINENO: checking for Numeric/arrayobject.h" >&5 +-echo $ECHO_N "checking for Numeric/arrayobject.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_Numeric_arrayobject_h+set}" = set; then ++ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"` ++ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES" ++ { echo "$as_me:$LINENO: checking for numpy/arrayobject.h" >&5 ++echo $ECHO_N "checking for numpy/arrayobject.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_numpy_arrayobject_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -12553,7 +12533,7 @@ + /* end confdefs.h. */ + #include + +-#include ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -12572,19 +12552,19 @@ + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- ac_cv_header_Numeric_arrayobject_h=yes ++ ac_cv_header_numpy_arrayobject_h=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_header_Numeric_arrayobject_h=no ++ ac_cv_header_numpy_arrayobject_h=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_Numeric_arrayobject_h" >&5 +-echo "${ECHO_T}$ac_cv_header_Numeric_arrayobject_h" >&6; } +-if test $ac_cv_header_Numeric_arrayobject_h = yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_header_numpy_arrayobject_h" >&5 ++echo "${ECHO_T}$ac_cv_header_numpy_arrayobject_h" >&6; } ++if test $ac_cv_header_numpy_arrayobject_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_NUMPY +@@ -12593,7 +12573,7 @@ + fi + + +- CPPFLAGS="$save_CPPFLAGS" ++ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES" + fi + + +@@ -13388,6 +13368,7 @@ + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -13608,6 +13589,7 @@ + INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim + INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim + INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim + CYGPATH_W!$CYGPATH_W$ac_delim + PACKAGE!$PACKAGE$ac_delim + VERSION!$VERSION$ac_delim +@@ -13660,7 +13642,6 @@ + LN_S!$LN_S$ac_delim + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim +-RANLIB!$RANLIB$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -13702,6 +13683,7 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++RANLIB!$RANLIB$ac_delim + DSYMUTIL!$DSYMUTIL$ac_delim + NMEDIT!$NMEDIT$ac_delim + DLLTOOL!$DLLTOOL$ac_delim +@@ -13782,7 +13764,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -14009,6 +13991,11 @@ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -14062,6 +14049,7 @@ + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +@@ -14177,21 +14165,22 @@ + fi + rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| . 2>/dev/null || +-echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -14226,8 +14215,9 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +Index: pygtk-2.13.0/aclocal.m4 +=================================================================== +--- pygtk-2.13.0.orig/aclocal.m4 2009-01-14 13:37:43.000000000 +0100 ++++ pygtk-2.13.0/aclocal.m4 2009-01-14 13:37:50.000000000 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008 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. +@@ -11,6 +11,14 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(AC_AUTOCONF_VERSION, [2.61],, ++[m4_warning([this file was generated for autoconf 2.61. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) ++ + # Configure paths for GLIB + # Owen Taylor 1997-2001 + +@@ -106,8 +114,9 @@ + { + int major, minor, micro; + char *tmp_version; ++ int ignored; + +- system ("touch conf.glibtest"); ++ ignored = system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); +@@ -7033,7 +7042,7 @@ + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -7043,14 +7052,31 @@ + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.10' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.10.1], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++ ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) ++[AM_AUTOMAKE_VERSION([1.10.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -7107,14 +7133,14 @@ + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 + # 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 7 ++# serial 8 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -7123,8 +7149,10 @@ + [AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -7138,15 +7166,14 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + # 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 8 ++# serial 9 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -7174,6 +7201,7 @@ + ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +@@ -7239,6 +7267,7 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -7291,7 +7320,8 @@ + AMDEPBACKSLASH='\' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl + ]) + + # Generate code to set up dependency tracking. -*- Autoconf -*- +@@ -7316,8 +7346,9 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue +@@ -7376,14 +7407,14 @@ + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008 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 12 ++# serial 13 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -7400,16 +7431,20 @@ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl ++[AC_PREREQ([2.60])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi + fi + + # test whether we have cygpath +@@ -7429,6 +7464,9 @@ + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +@@ -7464,6 +7502,10 @@ + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) + ]) + +@@ -7477,16 +7519,17 @@ + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. ++_am_arg=$1 + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $1 | $1:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +@@ -7499,7 +7542,7 @@ + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + AC_SUBST(install_sh)]) + + # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +@@ -7577,14 +7620,14 @@ + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 ++# Copyright (C) 1997, 1999, 2000, 2001, 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 ++# serial 5 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -7600,6 +7643,7 @@ + # If it does, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl + test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then +@@ -7610,7 +7654,7 @@ + fi + ]) + +-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -7618,60 +7662,23 @@ + + # AM_PROG_MKDIR_P + # --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +-# +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). +-# +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) ++# Check for `mkdir -p'. + AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +-AC_SUBST([mkdir_p])]) ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) + + # Helper functions for option handling. -*- Autoconf -*- + +@@ -7964,9 +7971,21 @@ + if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + ++# Copyright (C) 2006 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. ++ ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. --- pygtk-2.13.0.orig/debian/patches/01_pygtk-demo.patch +++ pygtk-2.13.0/debian/patches/01_pygtk-demo.patch @@ -0,0 +1,14 @@ +Index: pygtk-2.13.0/examples/pygtk-demo/pygtk-demo.in +=================================================================== +--- pygtk-2.13.0.orig/examples/pygtk-demo/pygtk-demo.in 2008-04-27 11:51:14.000000000 +0200 ++++ pygtk-2.13.0/examples/pygtk-demo/pygtk-demo.in 2008-11-12 17:59:10.695490976 +0100 +@@ -1,7 +1,7 @@ +-#! @PYTHON@ ++#! /usr/bin/python + + import sys + import os.path +-pygtklibdir = os.path.join("@libdir@", "pygtk", "2.0") ++pygtklibdir = os.path.join("/usr/share", "pygtk", "2.0") + sys.path.insert(0, pygtklibdir) + execfile(os.path.join(pygtklibdir, "pygtk-demo.py"))