[SCM] KDE Bindings module packaging branch, master, updated. debian/4.4.5-6-30-g9954e2e

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 0b12fc6ba400fbe8eb3a4c596fb255a109de1e55
Author: Modestas Vainius <modax at debian.org>
Date:   Tue May 10 01:00:49 2011 +0300

    Do not hardcode python versions in debian/rules. Use pyversions instead.
    
    python2.5 pyshared path used to be hardcoded as the path of old python. Now use
    pyversions to determine which python versions are non-default at build time.
    This should make kdebindings fully binNMUable for python transitions.
---
 debian/changelog |    4 ++++
 debian/rules     |    5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fd8258..8a15072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ kdebindings (4:4.4.5-6) UNRELEASED; urgency=low
   * Backport upstream fixes (merged in smokegen_phonon.diff) to make
     smokephonon compile with Phonon >= 4.5.0. (Closes: #625707)
 
+  [ Modestas Vainius ]
+  * Do not hardcode python versions in debian/rules. Use pyversions instead.
+    This should make kdebindings fully binNMUable for python transitions.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 May 2011 12:21:58 +0200
 
 kdebindings (4:4.4.5-5) unstable; urgency=high
diff --git a/debian/rules b/debian/rules
index 2bc1db3..03001ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,6 +84,7 @@ endif
 pydefault  := $(shell pyversions --default)
 pyversions := $(shell pyversions -vr)
 pydefaultversion := $(shell pyversions -vd)
+pyshared_nondefault = $(foreach v,$(filter-out $(pydefaultversion),$(pyversions)),usr/lib/pyshared/python$v/PyKDE4)
 cmake_flags += -DPYTHON_EXECUTABLE=/usr/bin/$(pydefault)
 DEFAULT_PYTHON_ARGS=-DERRORORRORERROR
 
@@ -202,8 +203,8 @@ binary-indep binary-arch: build install
 	done
 	dh_sodeps
 	if [ -d debian/python-kde4 ]; then \
-		DH_OPTIONS= dh_shlibdeps -ppython-kde4 -X"usr/lib/pyshared/python2.5/PyKDE4/" -- \
-        	-dSuggests debian/python-kde4/usr/lib/pyshared/python2.5/PyKDE4/*.so -dDepends; \
+        DH_OPTIONS= dh_shlibdeps -ppython-kde4 $(foreach s,$(pyshared_nondefault),-X'$s/') -- \
+        	-dSuggests $(foreach s,$(pyshared_nondefault),debian/python-kde4/$s/*.so) -dDepends; \
 	fi
 	dh_shlibdeps -Npython-kde4
 	dh_installdeb

-- 
KDE Bindings module packaging