r18872 - in /desktop/experimental/pygtk/debian: changelog python-glade2.install python-gtk2.install rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Mar  8 14:06:57 2009
New Revision: 18872

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18872
Log:
* Install files to the python-support directory so that the debugging 
  symbols are usable.
* Fix quilt invocation so that patches are applied.

Modified:
    desktop/experimental/pygtk/debian/changelog
    desktop/experimental/pygtk/debian/python-glade2.install
    desktop/experimental/pygtk/debian/python-gtk2.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=18872&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/changelog (original)
+++ desktop/experimental/pygtk/debian/changelog Sun Mar  8 14:06:57 2009
@@ -1,4 +1,4 @@
-pygtk (2.13.0-3) UNRELEASED; urgency=low
+pygtk (2.13.0-3) unstable; urgency=low
 
   [ Loic Minier ]
   * Pass PYTHON to $(MAKE) runs for robustness in case of timestamp skews; see
@@ -20,10 +20,11 @@
     Closes: #512345.
   * 70_autoconf.patch: refreshed.
   * Only recommend python-numpy, it can be detected at runtime.
-  * Move dh_pysupport call before dh_strip so that the split debugging 
-    symbols can actually be used.
-
- -- Loic Minier <lool at dooz.org>  Fri, 19 Dec 2008 15:15:52 +0100
+  * Install files to the python-support directory so that the debugging 
+    symbols are usable.
+  * Fix quilt invocation so that patches are applied.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 08 Mar 2009 14:51:09 +0100
 
 pygtk (2.13.0-2) experimental; urgency=low
 

Modified: desktop/experimental/pygtk/debian/python-glade2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-glade2.install?rev=18872&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-glade2.install (original)
+++ desktop/experimental/pygtk/debian/python-glade2.install Sun Mar  8 14:06:57 2009
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/python*/site-packages/gtk-2.0/gtk/glade.so
+debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/glade.so

Modified: desktop/experimental/pygtk/debian/python-gtk2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2.install?rev=18872&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2.install (original)
+++ desktop/experimental/pygtk/debian/python-gtk2.install Sun Mar  8 14:06:57 2009
@@ -1,3 +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
+debian/tmp/var/lib/python-support/*/gtk-2.0/*.so
+debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/_gtk.so
+debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/*.py

Modified: desktop/experimental/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/rules?rev=18872&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/rules (original)
+++ desktop/experimental/pygtk/debian/rules Sun Mar  8 14:06:57 2009
@@ -21,6 +21,7 @@
 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
 
 # how to call quilt
+PATCH_DIR := $(CURDIR)/debian/patches
 QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
 
 patch-stamp:
@@ -59,7 +60,7 @@
 
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
-	PYTHON=/usr/bin/python$* $(MAKE) -C build-$*
+	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=/var/lib/python-support/python$*
 	xvfb-run -s -noreset $(MAKE) -C build-$* check
 	touch $@
 
@@ -81,7 +82,7 @@
 build-%/install-stamp: build-%/build-stamp
 	dh_testdir
 	dh_testroot
-	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp pyexecdir=/var/lib/python-support/python$*
 	# move installed files to a per python runtime location to allow
 	# comparison of the resulting files across runtimes or shipping
 	# multiple versions
@@ -171,13 +172,13 @@
 	dh_installdocs -s
 	dh_installexamples -s
 	dh_installchangelogs ChangeLog -s
-	dh_pysupport -s
 	dh_strip -s -Npython-gtk2-dbg --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