r17945 - in /desktop/experimental/pygtk/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Dec 19 14:17:13 2008
New Revision: 17945

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17945
Log:
Pass PYTHON to $(MAKE) runs for robustness in case of timestamp skews; see
#509192; thanks Colin Watson for the original patch.

Modified:
    desktop/experimental/pygtk/debian/changelog
    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=17945&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/changelog (original)
+++ desktop/experimental/pygtk/debian/changelog Fri Dec 19 14:17:13 2008
@@ -1,3 +1,10 @@
+pygtk (2.13.0-3) UNRELEASED; urgency=low
+
+  * Pass PYTHON to $(MAKE) runs for robustness in case of timestamp skews; see
+    #509192; thanks Colin Watson for the original patch.
+
+ -- Loic Minier <lool at dooz.org>  Fri, 19 Dec 2008 15:15:52 +0100
+
 pygtk (2.13.0-2) experimental; urgency=low
 
   * 03_testsuite_filechooser.patch: new patch. Disable the test of the 

Modified: desktop/experimental/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/rules?rev=17945&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/rules (original)
+++ desktop/experimental/pygtk/debian/rules Fri Dec 19 14:17:13 2008
@@ -38,7 +38,7 @@
 
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
-	$(MAKE) -C build-$*
+	PYTHON=/usr/bin/python$* $(MAKE) -C build-$*
 	xvfb-run -s -noreset $(MAKE) -C build-$* check
 	touch $@
 
@@ -52,7 +52,7 @@
 
 dbg-build-%/build-stamp: dbg-build-%/configure-stamp
 	dh_testdir
-	$(MAKE) -C dbg-build-$*
+	PYTHON=/usr/bin/python$* $(MAKE) -C dbg-build-$*
 	touch $@
 
 build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
@@ -65,7 +65,7 @@
 install-%: build-%/build-stamp
 	dh_testdir
 	dh_testroot
-	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	PYTHON=/usr/bin/python$* $(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
@@ -82,7 +82,7 @@
 dbg-install-%: dbg-build-%/build-stamp
 	dh_testdir
 	dh_testroot
-	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gtk2-dbg
+	PYTHON=/usr/bin/python$* $(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 {} \;
 
@@ -108,7 +108,6 @@
 	# 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; \