r16910 - in /desktop/experimental/pygtk/debian: changelog control control.in copyright patches/10_use-default-python.patch patches/50_wakeupfd-curruption.patch python-gtk2-dev.install rules

pochu-guest at users.alioth.debian.org pochu-guest at users.alioth.debian.org
Sun Sep 7 17:22:25 UTC 2008


Author: pochu-guest
Date: Sun Sep  7 17:22:25 2008
New Revision: 16910

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16910
Log:
* 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.
* 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.
* debian/copyright:
  - Add Copyright holders.
* Add gnome-icon-theme to the bdeps as some buildds might have optical
  drives which require a special icon in the file chooser.
* New upstream release
  - Bump libgtk2.0-dev bdep to >= 2.13.6 and python-gobject-dev bdep to >=
    2.15.3; also bump libgtk2.0-dev and python-gobject* deps.
  - Drop patch 10_use-default-python as pygtk's codegen copy was dropped; it
    now relies on pygobject's.
  - Drop patch 50_wakeupfd-curruption, merged upstream.
  - Refresh patch 60_pygtk-wakeupfd-fix to apply cleanly.
  - Drop all codegen related code from rules (checks mostly) and drop
    reference in python-gtk2-dev.install.
* Build-dep on xauth and xfonts-base as xvfb-run needs these and also bdep
  on libgl1-mesa-dri for now until Xvfb can start without AIGLX support or
  this dep is added to the package.
* Use ${binary:Version} in control instead of ${Source-Version}.
* Change permission fixup constructs (chmod 755) to use xargs and not run if
  nothing has to be fixed.
* Sync on Debian
* debian/control.in:
  - Build-Depends on xvfb and python-all-dbg
  - list debug variants
  - python-gtk Suggests python-gtk2-dbg
  - updated maintainer information
* debian/python-gtk2-doc.examples, debian/python-gtk2-doc.install:
  - install pygtk-demo there
* debian/rules:
  - build debug variant
  - run testsuite during the build

Removed:
    desktop/experimental/pygtk/debian/patches/10_use-default-python.patch
    desktop/experimental/pygtk/debian/patches/50_wakeupfd-curruption.patch
Modified:
    desktop/experimental/pygtk/debian/changelog
    desktop/experimental/pygtk/debian/control
    desktop/experimental/pygtk/debian/control.in
    desktop/experimental/pygtk/debian/copyright
    desktop/experimental/pygtk/debian/python-gtk2-dev.install
    desktop/experimental/pygtk/debian/rules

Modified: desktop/experimental/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/changelog?rev=16910&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/changelog (original)
+++ desktop/experimental/pygtk/debian/changelog Sun Sep  7 17:22:25 2008
@@ -1,3 +1,90 @@
+pygtk (2.13.0-1) UNRELEASED; urgency=low
+
+  * 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.
+
+  * 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.
+  * debian/copyright:
+    - Add Copyright holders.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sun, 07 Sep 2008 19:17:47 +0200
+
+pygtk (2.13.0-0ubuntu2) intrepid; urgency=low
+
+  * Add gnome-icon-theme to the bdeps as some buildds might have optical
+    drives which require a special icon in the file chooser.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 03 Sep 2008 09:49:28 +0200
+
+pygtk (2.13.0-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release
+    - Bump libgtk2.0-dev bdep to >= 2.13.6 and python-gobject-dev bdep to >=
+      2.15.3; also bump libgtk2.0-dev and python-gobject* deps.
+    - Drop patch 10_use-default-python as pygtk's codegen copy was dropped; it
+      now relies on pygobject's.
+    - Drop patch 50_wakeupfd-curruption, merged upstream.
+    - Refresh patch 60_pygtk-wakeupfd-fix to apply cleanly.
+    - Drop all codegen related code from rules (checks mostly) and drop
+      reference in python-gtk2-dev.install.
+  * Build-dep on xauth and xfonts-base as xvfb-run needs these and also bdep
+    on libgl1-mesa-dri for now until Xvfb can start without AIGLX support or
+    this dep is added to the package.
+  * Use ${binary:Version} in control instead of ${Source-Version}.
+  * Change permission fixup constructs (chmod 755) to use xargs and not run if
+    nothing has to be fixed.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 02 Sep 2008 12:04:12 +0200
+
+
+pygtk (2.12.1-6ubuntu1) intrepid; urgency=low
+
+  * Sync on Debian
+  * debian/control.in:
+    - Build-Depends on xvfb and python-all-dbg
+    - list debug variants
+    - python-gtk Suggests python-gtk2-dbg
+    - updated maintainer information
+  * debian/python-gtk2-doc.examples, debian/python-gtk2-doc.install:
+    - install pygtk-demo there
+  * debian/rules:
+    - build debug variant
+    - run testsuite during the build
+
+ -- Sebastien Bacher <seb128 at canonical.com>  Mon, 23 Jun 2008 15:42:00 +0200
+
 pygtk (2.12.1-6) unstable; urgency=low
 
   * 60_pygtk-wakeupfd-fix.patch: do not use the wakeup fd in 

Modified: desktop/experimental/pygtk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/control?rev=16910&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/control (original)
+++ desktop/experimental/pygtk/debian/control Sun Sep  7 17:22:25 2008
@@ -3,26 +3,30 @@
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
 Uploaders: Torsten Landschoff <torsten at debian.org>,
-           Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+           Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
 Build-Depends: debhelper (>= 5),
                python-support (>= 0.7.6),
                gnome-pkg-tools (>= 0.10),
                cdbs,
+               xvfb, xauth, xfonts-base, libgl1-mesa-dri,
                python2.5-dev (>= 2.5.2-5),
                python-all-dev (>= 2.3.5-11),
-               libgtk2.0-dev (>= 2.12.0),
+               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-numeric (>= 24.2-3),
                python-cairo-dev (>= 1.0.2),
-               python-gobject-dev (>= 2.14.0),
+               python-gobject-dev (>= 2.15.3),
                xsltproc,
                docbook-xsl,
-               autotools-dev
+               autotools-dev,
+               gnome-icon-theme
 XS-Python-Version: >= 2.3
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
+Homepage: http://www.pygtk.org/
 
 Package: python-gtk2
 Architecture: any
@@ -32,8 +36,8 @@
          ${misc:Depends}
 Python-Depends: python-numeric (>= 24.2-3),
                 python-cairo (>= 1.0.2-1.1),
-                python-gobject (>= 2.14.0)
-Suggests: python-gtk2-doc
+                python-gobject (>= 2.15.3)
+Suggests: python-gtk2-doc, python-gtk2-dbg
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Conflicts: python-gdk-imlib,
@@ -47,18 +51,32 @@
  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-dbg,
+         python-numeric-dbg,
+         python-cairo-dbg,
+         python-gobject-dbg,
+         ${shlibs:Depends}
+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.
  .
- URL: http://www.daa.com.au/~james/software/pygtk/
+ 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.12.0),
+         libgtk2.0-dev (>= 2.13.6),
          python2.5-dev (>= 2.5.2-5),
          python-dev,
-         python-gobject-dev (>= 2.14.0)
+         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),
@@ -75,8 +93,6 @@
 Description: GTK+ bindings: devel files
  This archive contains files that allow you to build wrappers for addon
  that interoperate python-gtk2 (pygtk).
- .
- URL: http://www.daa.com.au/~james/software/pygtk/
 
 Package: python-glade2
 Architecture: any
@@ -97,8 +113,21 @@
  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-glade2-dbg
+Architecture: any
+Priority: extra
+Depends: python-glade2 (= ${binary:Version}),
+         python-dbg,
+         python-gtk2-dbg,
+         ${shlibs:Depends}
+Description: GTK+ bindings: Glade support (debug extension)
+ 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.
  .
- URL: http://www.daa.com.au/~james/software/pygtk/
+ This package contains the extension built for the python debug interpreter.
 
 Package: python-gtk2-doc
 Architecture: all

Modified: desktop/experimental/pygtk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/control.in?rev=16910&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/control.in (original)
+++ desktop/experimental/pygtk/debian/control.in Sun Sep  7 17:22:25 2008
@@ -8,21 +8,27 @@
                python-support (>= 0.7.6),
                gnome-pkg-tools (>= 0.10),
                cdbs,
+               xvfb, xauth, xfonts-base, libgl1-mesa-dri,
                python2.5-dev (>= 2.5.2-5),
                python-all-dev (>= 2.3.5-11),
-               libgtk2.0-dev (>= 2.12.0),
+               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-numeric (>= 24.2-3),
                python-cairo-dev (>= 1.0.2),
-               python-gobject-dev (>= 2.14.0),
+               python-gobject-dev (>= 2.15.3),
                xsltproc,
                docbook-xsl,
-               autotools-dev
+               autotools-dev,
+               gnome-icon-theme
 XS-Python-Version: >= 2.3
-Standards-Version: 3.7.3
+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
@@ -32,8 +38,9 @@
          ${misc:Depends}
 Python-Depends: python-numeric (>= 24.2-3),
                 python-cairo (>= 1.0.2-1.1),
-                python-gobject (>= 2.14.0)
-Suggests: python-gtk2-doc
+                python-gobject (>= 2.15.3)
+Suggests: python-gtk2-doc,
+          python-gtk2-dbg
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Conflicts: python-gdk-imlib,
@@ -47,18 +54,32 @@
  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-dbg,
+         python-numeric-dbg,
+         python-cairo-dbg,
+         python-gobject-dbg,
+         ${shlibs:Depends}
+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.
  .
- URL: http://www.daa.com.au/~james/software/pygtk/
+ 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.12.0),
+         libgtk2.0-dev (>= 2.13.6),
          python2.5-dev (>= 2.5.2-5),
          python-dev,
-         python-gobject-dev (>= 2.14.0)
+         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),
@@ -73,10 +94,8 @@
            python-gnome,
            python-gtk
 Description: GTK+ bindings: devel files
- This archive contains files that allow you to build wrappers for addon
- that interoperate python-gtk2 (pygtk).
- .
- URL: http://www.daa.com.au/~james/software/pygtk/
+ This archive contains files that allow you to build wrappers for addons
+ that interoperate with python-gtk2 (pygtk).
 
 Package: python-glade2
 Architecture: any
@@ -84,7 +103,8 @@
          ${shlibs:Depends},
          ${misc:Depends},
          python-gtk2 (= ${binary:Version})
-Suggests: python-gtk2-doc
+Suggests: python-gtk2-doc,
+          python-glade2-dbg
 Conflicts: python-gdk-imlib,
            python-glade,
            python-gnome,
@@ -97,8 +117,21 @@
  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-glade2-dbg
+Architecture: any
+Priority: extra
+Depends: python-glade2 (= ${binary:Version}),
+         python-dbg,
+         python-gtk2-dbg,
+         ${shlibs:Depends}
+Description: GTK+ bindings: Glade support (debug extension)
+ 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.
  .
- URL: http://www.daa.com.au/~james/software/pygtk/
+ This package contains the extension built for the Python debug interpreter.
 
 Package: python-gtk2-doc
 Architecture: all

Modified: desktop/experimental/pygtk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/copyright?rev=16910&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/copyright (original)
+++ desktop/experimental/pygtk/debian/copyright Sun Sep  7 17:22:25 2008
@@ -5,6 +5,12 @@
         <http://ftp.gnome.org/pub/GNOME/sources/pygtk/>
 
 Upstream Author: James Henstridge <james at daa.com.au>
+
+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:
 

Modified: desktop/experimental/pygtk/debian/python-gtk2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2-dev.install?rev=16910&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2-dev.install (original)
+++ desktop/experimental/pygtk/debian/python-gtk2-dev.install Sun Sep  7 17:22:25 2008
@@ -1,4 +1,3 @@
 debian/tmp/usr/include
-debian/tmp/usr/bin/pygtk-codegen-2.0
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/share/pygtk

Modified: desktop/experimental/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/rules?rev=16910&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/rules (original)
+++ desktop/experimental/pygtk/debian/rules Sun Sep  7 17:22:25 2008
@@ -18,7 +18,9 @@
 PYVERS := $(shell pyversions --requested --version debian/control)
 PYDEFAULTVER := $(shell pyversions --default --version)
 
-build-%/configure-stamp: apply-patches
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+build-%/configure-stamp:
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && \
@@ -29,9 +31,23 @@
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
 	$(MAKE) -C build-$*
+	xvfb-run $(MAKE) -C build-$* check
 	touch $@
 
-build: $(PYVERS:%=build-%/build-stamp)
+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: apply-patches $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
 
 install-clean:
 	dh_testdir
@@ -48,10 +64,6 @@
 	# 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$*
-	# codegen helper, should be the same code whatever the build-time
-	# python runtime
-	mkdir debian/tmp/usr/share/pygtk/2.0/codegen/python$*
-	mv debian/tmp/usr/share/pygtk/2.0/codegen/*.py debian/tmp/usr/share/pygtk/2.0/codegen/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$*
@@ -59,25 +71,31 @@
 	mkdir debian/tmp/usr/include/python$*
 	mv debian/tmp/usr/include/pygtk-2.0 debian/tmp/usr/include/python$*
 
-install: build install-clean $(PYVERS:%=install-%)
+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 {} \;
+	mkdir -p debian/python-glade2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk
+	mv debian/python-gtk2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk/glade.so \
+		debian/python-glade2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk/
+
+install: build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%)
 	# check that all builds with various Python runtimes produced the same
-	# *.defs files and codegen (or fail)
+	# *.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 codegen for the default Python version ($(PYDEFAULTVER)) with codegen for Python $$v"; \
-	    diff --brief --recursive debian/tmp/usr/share/pygtk/2.0/codegen/python$(PYDEFAULTVER) debian/tmp/usr/share/pygtk/2.0/codegen/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/share/pygtk/2.0/codegen/python$(PYDEFAULTVER)/*.py debian/tmp/usr/share/pygtk/2.0/codegen
 	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/pygtk/2.0/codegen/python$$v; \
 	    rm --force --recursive debian/tmp/usr/share/include/python$$v; \
 	done
 	# finally, install files from DESTDIR in the per-package dirs
@@ -86,18 +104,23 @@
 	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-*
+	rm -Rf build-* dbg-build-*
 	-test -f config.sub && \
 	  test -r /usr/share/misc/config.sub && \
 	  cp -f /usr/share/misc/config.sub config.sub
 	-test -f config.guess && \
 	  test -r /usr/share/misc/config.guess && \
 	  cp -f /usr/share/misc/config.guess config.guess
-	dh_clean codegen/*.pyc
+	dh_clean
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -111,8 +134,7 @@
 	dh_compress -i -X.py -X.glade
 	dh_fixperms -i
 	# More permission fixing
-	chmod 755 `grep -rl "^#\!.*python" debian/python-gtk2-dev/usr`
-	dh_pysupport -i /usr/share/pygtk/2.0/codegen/
+	grep -rlZ "^#\!.*python" debian/python-gtk2-dev/usr | xargs -0r chmod 755
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
@@ -125,7 +147,12 @@
 	dh_installdocs -s
 	dh_installexamples -s
 	dh_installchangelogs ChangeLog -s
-	dh_strip -s
+	dh_strip -ppython-gtk2 --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_strip -ppython-glade2 --dbg-package=python-glade2-dbg
+	rm -rf debian/python-glade2-dbg/usr/share/doc/python-glade2-dbg
+	ln -s python-glade2 debian/python-glade2-dbg/usr/share/doc/python-glade2-dbg
 	dh_link -s
 	dh_compress -s -X.py -X.glade
 	dh_fixperms -s




More information about the pkg-gnome-commits mailing list