[SCM] PyKDE4 packaging branch, master, updated. 92473205db185f63421c69d5604329491f5c398c
Modestas Vainius
modax at alioth.debian.org
Mon Jun 6 20:19:51 UTC 2011
The following commit has been merged in the master branch:
commit 5a662b04d0091d78f57fc44efabf3af69f1d5262
Author: Modestas Vainius <modestas at vainius.eu>
Date: Mon Jun 6 20:00:49 2011 +0300
Optimize $(pyversions) check.
---
debian/changelog | 1 +
debian/rules | 5 +----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b1fd0c6..22019c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,5 +29,6 @@ pykde4 (4:4.6.80-0r1) UNRELEASED; urgency=low
* Execute pyversions "on demand".
* Drop ${python:Depends} from python-kde4-dev Depends.
* Add "Provides: ${python:Provides}" to python-kde4.
+ * Optimize $(pyversions) check.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 05 Jun 2011 20:31:17 +0300
diff --git a/debian/rules b/debian/rules
index c6d4543..37ebe3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,11 +13,8 @@ define nl
endef
-ifeq (,$(pyversions))
-$(error "no suitable pythonversion found, failing")
-endif
-
override_dh_auto_configure:
+ $(if $(pyversions),,$(error "no suitable pythonversion found, failing"))
$(foreach v,$(pyversions),$(overridden_command) --builddirectory=builddir-$v -- \
-DPYTHON_EXECUTABLE=/usr/bin/python$v \
$(if $(filter $(pydefaultversion),$v),-DDEFAULT_PYTHON_VERSION=true,-DDEFAULT_PYTHON_VERSION=false) \
--
PyKDE4 packaging
More information about the pkg-kde-commits
mailing list