diff -Nru pykde4-4.9.2/debian/changelog pykde4-4.9.2/debian/changelog --- pykde4-4.9.2/debian/changelog 2012-10-05 05:18:53.000000000 +0000 +++ pykde4-4.9.2/debian/changelog 2012-10-26 16:11:53.000000000 +0000 @@ -1,3 +1,10 @@ +pykde4 (4:4.9.2-0ubuntu3) raring; urgency=low + + * Fix building for python3.3. + * Fix installation of multiple python3 extensions. + + -- Matthias Klose Fri, 26 Oct 2012 18:11:10 +0200 + pykde4 (4:4.9.2-0ubuntu2) quantal; urgency=low * Rebuild to get missing binaries that were lost due to being copied from diff -Nru pykde4-4.9.2/debian/patches/python3.3.diff pykde4-4.9.2/debian/patches/python3.3.diff --- pykde4-4.9.2/debian/patches/python3.3.diff 1970-01-01 00:00:00.000000000 +0000 +++ pykde4-4.9.2/debian/patches/python3.3.diff 2012-10-26 16:56:52.000000000 +0000 @@ -0,0 +1,23 @@ +Index: pykde4-4.9.2/CMakeLists.txt +=================================================================== +--- pykde4-4.9.2.orig/CMakeLists.txt 2012-10-26 16:32:47.000000000 +0000 ++++ pykde4-4.9.2/CMakeLists.txt 2012-10-26 16:56:04.578537892 +0000 +@@ -26,6 +26,9 @@ + + FIND_PACKAGE(PythonLibrary REQUIRED) + INCLUDE(PythonMacros) ++find_package(PkgConfig REQUIRED) ++# this doesn't work ... ++pkg_check_modules(PYTHON xpython${_CURRENT_VERSION}) + + FIND_PACKAGE(SIP REQUIRED) + IF(SIP_VERSION STRLESS "040d01") # These version numbers also appear in ../CMakeLists.txt +@@ -61,7 +64,7 @@ + ENDIF (${PYTHON_SHORT_VERSION} MATCHES "^3") + + INCLUDE_DIRECTORIES( +- ${PYTHON_INCLUDE_PATH} ++ ${PYTHON_INCLUDE_DIR2} + ${SIP_INCLUDE_DIR} + ${QT_INCLUDE_DIR} + ${QT_QT_INCLUDE_DIR} diff -Nru pykde4-4.9.2/debian/patches/series pykde4-4.9.2/debian/patches/series --- pykde4-4.9.2/debian/patches/series 2012-10-02 14:47:16.000000000 +0000 +++ pykde4-4.9.2/debian/patches/series 2012-10-26 16:02:00.000000000 +0000 @@ -4,3 +4,5 @@ make_pykde4_respect_sip_flags.diff pythonpluginfactory_use_versioned_python_lib.diff optional_install_sip_files.diff +xxx.diff +python3.3.diff diff -Nru pykde4-4.9.2/debian/patches/xxx.diff pykde4-4.9.2/debian/patches/xxx.diff --- pykde4-4.9.2/debian/patches/xxx.diff 1970-01-01 00:00:00.000000000 +0000 +++ pykde4-4.9.2/debian/patches/xxx.diff 2012-10-26 15:19:53.000000000 +0000 @@ -0,0 +1,74 @@ +commit fd30259903ad693b86476b6e8c280b93d0102223 +Author: Luca Beltrame +Date: Wed Oct 3 21:35:49 2012 +0200 + + Enable proper building with newer SIP and PyQt. This change makes a part + of the SIP files present in PyKDE4 conditional to the version of PyQt. + If greater than 4.9, they are omitted, and thus this will build. + + The same change will be made in master + +diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip +index 5a0a080..af53f85 100644 +--- a/sip/kdecore/typedefs.sip ++++ b/sip/kdecore/typedefs.sip +@@ -951,6 +951,9 @@ template + %End + }; + ++%Feature PyKDE_QVector ++ ++%If(PyKDE_QVector) + %MappedType QVector + { + %TypeHeaderCode +@@ -1025,3 +1028,4 @@ template + return sipGetState(sipTransferObj); + %End + }; ++%End +\ No newline at end of file +commit fd30259903ad693b86476b6e8c280b93d0102223 +Author: Luca Beltrame +Date: Wed Oct 3 21:35:49 2012 +0200 + + Enable proper building with newer SIP and PyQt. This change makes a part + of the SIP files present in PyKDE4 conditional to the version of PyQt. + If greater than 4.9, they are omitted, and thus this will build. + + The same change will be made in master + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f778510..83e9322 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,6 +37,7 @@ IF(PYQT4_VERSION STRLESS "040900") # These version numbers also appear in ../CM + ENDIF(PYQT4_VERSION STRLESS "040900") + + ++ + SET(SOPRANO_MIN_VERSION "2.0") + MACRO_OPTIONAL_FIND_PACKAGE(Soprano) + MACRO_LOG_FEATURE(Soprano_FOUND "Soprano" "Soprano Libraries" "kdesupport" FALSE "" "Required for Soprano Python bindings.") +@@ -95,9 +96,19 @@ SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) + + # Use an extra option when compiling on Python 3. + IF (PYTHON_3) +- SET(SIP_EXTRA_OPTIONS -g -x Py_v3) ++ IF(PYQT4_VERSION STRGREATER "040900") ++ # Disable for newer PyQt ++ SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3) ++ ELSE (PYQT4_VERSION STRGREATER "040900") ++ SET(SIP_EXTRA_OPTIONS -g -x Py_v3) ++ ENDIF(PYQT4_VERSION STRGREATER "040900") + ELSE (PYTHON_3) +- SET(SIP_EXTRA_OPTIONS -g) ++ IF(PYQT4_VERSION STRGREATER "040900") ++ # Disable for newer PyQt ++ SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) ++ ELSE (PYQT4_VERSION STRGREATER "040900") ++ SET(SIP_EXTRA_OPTIONS -g) ++ ENDIF(PYQT4_VERSION STRGREATER "040900") + ENDIF (PYTHON_3) + + ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API) diff -Nru pykde4-4.9.2/debian/rules pykde4-4.9.2/debian/rules --- pykde4-4.9.2/debian/rules 2012-10-02 14:47:16.000000000 +0000 +++ pykde4-4.9.2/debian/rules 2012-10-26 16:56:43.000000000 +0000 @@ -12,6 +12,8 @@ PYTHONDONTWRITEBYTECODE = True export PYTHONDONTWRITEBYTECODE +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + define nl @@ -21,19 +23,27 @@ $(if $(pyversions),,$(error "no suitable pythonversion found, failing")) $(foreach v,$(pyversions),$(overridden_command) --builddirectory=builddir-$v -- \ -DPYTHON_EXECUTABLE=/usr/bin/python$v \ + -DPYTHON_INCLUDE_PATH=/usr/include/python$v \ + -DPYTHON_INCLUDE_DIR2=/usr/include/$(DEB_HOST_MULTIARCH)/python$v \ -DDEFAULT_PYTHON_VERSION=$(if $(filter $(pydefaultversion),$v),true,false) \ $(nl)) $(foreach v,$(py3versions),$(overridden_command) --builddirectory=builddir-$v -- \ -DPYTHON_EXECUTABLE=/usr/bin/python$v \ - -DPYTHON_LIBRARY=/usr/lib/libpython${v}mu.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python$v$(if $(filter 3.2,$(v)),mu,m) \ + -DPYTHON_INCLUDE_DIR2=/usr/include/$(DEB_HOST_MULTIARCH)/python$v$(if $(filter 3.2,$(v)),mu,m) \ + -DPYTHON_LIBRARY=/usr/lib/$(if $(filter 3.2,$(v)),libpython3.2mu.so,$(DEB_HOST_MULTIARCH)/libpython$(v)m.so) \ -DPYTHON_SITE_PACKAGES_INSTALL_DIR=/usr/lib/python3/dist-packages \ -DDEFAULT_PYTHON_VERSION=false \ $(nl)) -override_dh_auto_build override_dh_auto_install override_dh_auto_test override_dh_auto_clean: +override_dh_auto_build override_dh_auto_test override_dh_auto_clean: $(foreach v,$(pyversions),$(overridden_command) --builddirectory=builddir-$v $(nl)) $(foreach v,$(py3versions),$(overridden_command) --builddirectory=builddir-$v $(nl)) +override_dh_auto_install: + $(foreach v,$(pyversions),dh_auto_install --builddirectory=builddir-$v $(nl)) + $(foreach v,$(py3versions),dh_auto_install --builddirectory=builddir-$v $(nl) ABITAG=`python$(v) -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; for f in `find debian/tmp/usr/lib/python3* -name '*.so' ! -name '*.cpython*.so'`; do mv $$f $${f%.so}.$$ABITAG.so; done;) + override_dh_python3: $(overridden_command) dh_sip3 -ppython3-pykde4