r24902 - in /desktop/unstable/pygobject/debian: changelog rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Jul 26 19:17:54 2010
New Revision: 24902

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24902
Log:
Drop above change to make pygobject-codegen-2.0 call the default
Python version. Build with the default Python version after all
the other ones instead. Closes: #590358.

Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/rules

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=24902&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Mon Jul 26 19:17:54 2010
@@ -1,4 +1,4 @@
-pygobject (2.21.4-1) UNRELEASED; urgency=low
+pygobject (2.21.4-1) unstable; urgency=low
 
   [ Laurent Bigonville ]
   * New upstream release.
@@ -20,10 +20,11 @@
 
   [ Emilio Pozuelo Monfort ]
   * debian/rules:
-    - Do not change python3.x to python, as python is the default Python 2
-      interpreter.
-
- -- Laurent Bigonville <bigon at debian.org>  Sun, 11 Jul 2010 01:38:04 +0200
+    - Drop above change to make pygobject-codegen-2.0 call the default
+      Python version. Build with the default Python version after all
+      the other ones instead. Closes: #590358.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 26 Jul 2010 21:16:58 +0200
 
 pygobject (2.21.1-2) unstable; urgency=low
 

Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=24902&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules [utf-8] (original)
+++ desktop/unstable/pygobject/debian/rules [utf-8] Mon Jul 26 19:17:54 2010
@@ -20,7 +20,9 @@
 	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-PYVERS := $(shell pyversions -vr)
+PYDEFAULTVER := $(shell pyversions --default --version)
+PYVERS := $(shell pyversions --requested --version debian/control)
+PYVERS := $(filter-out $(PYDEFAULTVER), $(PYVERS)) $(PYDEFAULTVER)
 
 # how to call quilt
 PATCH_DIR := $(CURDIR)/debian/patches
@@ -126,8 +128,6 @@
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
-	sed -i 's,bin/python2\.[0-9],bin/python,' \
-		debian/python-gobject-dev/usr/bin/pygobject-codegen-2.0
 
 	touch $@