[SCM] KDE Bindings module packaging branch, master, updated. debian/4.4.5-1-12-g8653f54

[Sune Vuorela]

The following commit has been merged in the master branch:
commit 8653f5415e51a686b1af61aa8054fa79ade2b713
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sat Aug 7 00:05:31 2010 +0200

    fix pythonpluginfactory building to build only against default python version, and not by 'last built python version'
---
 debian/changelog                               |    7 ++++++-
 debian/patches/optional_install_sip_files.diff |   15 +++++++++++----
 debian/rules                                   |    2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57adb6a..06d9474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,12 @@ kdebindings (4:4.4.5-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Fix typo in description of libsmokekparts3. (Closes: #589904)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Aug 2010 23:37:14 +0200
+  [ Sune Vuorela ]
+  * Only build the kpythonfactoryplugin on default python version, else
+    it ends up a bit random which one is actually used when built parallel.
+    Closes: #591422
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Aug 2010 00:01:00 +0200
 
 kdebindings (4:4.4.5-1) unstable; urgency=low
 
diff --git a/debian/patches/optional_install_sip_files.diff b/debian/patches/optional_install_sip_files.diff
index 253b0ae..677945f 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -1,6 +1,6 @@
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -249,10 +249,15 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DI
+@@ -249,15 +249,20 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DI
  
  # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
  # (Don't forget the / at the end of sip/.)
@@ -8,15 +8,22 @@
 -    PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
 -    PATTERN ".svn" EXCLUDE
 -    PATTERN "*.in" EXCLUDE)
-+IF(NOT DONT_INSTALL_DATA_FILES)
++IF(DEFAULT_PYTHON_VERSION)
 +    INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
 +        PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
 +        PATTERN ".svn" EXCLUDE
 +        PATTERN "*.in" EXCLUDE)
 +   MESSAGE("Installing sip files in this build pass")
-+ELSE(NOT DONT_INSTALL_DATA_FILES)
++ELSE(DEFAULT_PYTHON_VERSION)
 +   MESSAGE("Not installing sip files in this build pass")
-+ENDIF(NOT DONT_INSTALL_DATA_FILES)
++ENDIF(NOT DEFAULT_PYTHON_VERSION)
  
  ADD_SUBDIRECTORY(tools)
  #ADD_SUBDIRECTORY(docs)
+ ADD_SUBDIRECTORY(examples)
+-IF (NOT PYTHON_3)
++IF (NOT PYTHON_3 OR NOT DEFAULT_PYTHON_VERSION)
+     ADD_SUBDIRECTORY(kpythonpluginfactory)
+-ENDIF (NOT PYTHON_3)
++ENDIF (NOT PYTHON_3 OR NOT DEFAULT_PYTHON_VERSION)
+ #ADD_SUBDIRECTORY(pykdedocs)
diff --git a/debian/rules b/debian/rules
index 954831c..18aa971 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,7 +97,7 @@ $(patsubst %,$(objdir)/python/pykde4-%/Makefile,$(pyversions)): $(objdir)/Makefi
 	mkdir -p $(@D)	
 	cd  $(@D) && cmake $(CURDIR)/python/pykde4 $(cmake_flags) \
 	    -DPYTHON_EXECUTABLE=/usr/bin/python$(subst $(objdir)/python/pykde4-,,$(subst /Makefile,,$@)) \
-	    $(if $(findstring $(pydefaultversion),$@),,-DDONT_INSTALL_DATA_FILES=true)
+	    $(if $(findstring $(pydefaultversion),$@),-DDEFAULT_PYTHON_VERSION=true,-DDEFAULT_PYTHON_VERSION=false)
 
 ##
 $(patsubst %,build-stamp-python-%,$(pyversions)): $(patsubst %,$(objdir)/python/pykde4-%/Makefile,$(pyversions))

-- 
KDE Bindings module packaging