[SCM] PyKDE4 packaging branch, master, updated. debian/4.7.4-3

Mon May 21 05:21:24 UTC 2012

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/pykde4.git;a=commitdiff;h=595ddd3

The following commit has been merged in the master branch:
commit 595ddd34e423922f0dff9e774cceaa17666c7ac1
Author: Scott Kitterman <scott at kitterman.com>
Date:   Mon May 21 01:18:53 2012 -0400

    pykde4 (4:4.7.4-3) unstable; urgency=low
    
      * Team upload.
      * Add new binary python3-pykde for Python 3 support (Closes: #672553)
        - Adjust debian/rules
        - Add debian/patches/python32_compile_fix.diff to support building with
          python3.2
        - Bump build-dep version for kde4libs to 4:4.7.4-6 due to patch added in
          that revision to support building with Python 3
        - Add Python 3 equivalent packages to build-depends
        - Thanks to Colin Watson for the patch
      * Bump standards version to 3.9.3 without further change
    
     -- Scott Kitterman <scott at kitterman.com>  Sun, 20 May 2012 16:06:19 -0400
---
 debian/changelog                                 |   15 ++++++
 debian/control                                   |   57 ++++++++++++++++++++--
 debian/patches/python32_compile_fix.diff         |   21 ++++++++
 debian/patches/series                            |    1 +
 debian/python-kde4.install                       |   10 ++--
 debian/{python-kde4.docs => python3-pykde4.docs} |    0
 debian/python3-pykde4.install                    |    5 ++
 debian/rules                                     |   15 +++++-
 8 files changed, 113 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81655fd..995246a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+pykde4 (4:4.7.4-3) unstable; urgency=low
+
+  * Team upload.
+  * Add new binary python3-pykde for Python 3 support (Closes: #672553)
+    - Adjust debian/rules
+    - Add debian/patches/python32_compile_fix.diff to support building with
+      python3.2
+    - Bump build-dep version for kde4libs to 4:4.7.4-6 due to patch added in
+      that revision to support building with Python 3
+    - Add Python 3 equivalent packages to build-depends
+    - Thanks to Colin Watson for the patch
+  * Bump standards version to 3.9.3 without further change
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 20 May 2012 16:06:19 -0400
+
 pykde4 (4:4.7.4-2) unstable; urgency=low
 
   * Team upload. Upload to unstable.
diff --git a/debian/control b/debian/control
index 51ac67f..d9d6a68 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,17 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
  debhelper (>= 7.3), cmake, pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.7),kdepimlibs5-dev (>= 4:4.7),
+ kdelibs5-dev (>= 4:4.7.4-6),kdepimlibs5-dev (>= 4:4.7),
  libphonon-dev (>= 4:4.6.0really4.4.4), libsoprano-dev (>= 2.7.0),
  libqt4-dev (>= 4:4.7.1), libqt4-opengl-dev (>= 4:4.7.1), libqtwebkit-dev,
  libboost-dev, shared-desktop-ontologies (>= 0.8),
- python, python-all-dev, python-sip-dev (>= 4.12.0),
- python-qt4 (>= 4.8.3-3~), python-qt4-dev (>= 4.8.3-3~)
+ python, python-all-dev, python3-all-dev,
+ python-sip-dev (>= 4.12.0), python3-sip-dev,
+ python-qt4 (>= 4.8.3-3~), python3-pyqt4, python-qt4-dev (>= 4.8.3-3~)
 Uploaders: Sune Vuorela <sune at debian.org>, Modestas Vainius <modax at debian.org>, Michael Meskes <meskes at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.2
 Homepage: http://www.kde.org
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/pykde4.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/pykde4.git
@@ -89,3 +91,50 @@ Description: debugging symbols for the PyKDE bindings
  are experiencing crashes of the PyKDE application and wish to report a problem
  to the developers.
 
+Package: python3-pykde4
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends},
+ python3-pyqt4, ${sip:Depends}, python3-sip
+Provides: ${python3:Provides}
+Description: Python 3 bindings for the KDE Development Platform
+ This package contains PyKDE, the Python 3 bindings for the KDE
+ libraries, that allow you to write KDE programs using Python 3 instead of
+ C++. It contains at least the following modules under the
+ PyKDE namespace:
+ .
+  * dnssd
+  * kdecore
+  * kdeui
+  * khtml
+  * kio
+  * knewstuff
+  * kparts
+  * kterminal
+  * ktexteditor
+  * kutils
+  * nepomuk
+  * plasma
+  * solid
+ .
+ And a few KDE related technologies like:
+ .
+  * akonadi
+  * phonon
+  * soprano
+ .
+ This package provides modules for all supported Python 3 versions.
+
+Package: python3-pykde4-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${misc:Depends}, kdelibs5-dbg, python3-pykde4 (= ${binary:Version})
+Recommends: python3-pyqt4-dbg
+Breaks: kdebindings-dbg
+Replaces: kdebindings-dbg
+Description: debugging symbols for PyKDE bindings for Python 3
+ This package contains debugging files used to investigate problems with
+ Python 3 bindings for the KDE Development Platform. Install this package if
+ you are experiencing crashes of the PyKDE application and wish to report a
+ problem to the developers.
+
diff --git a/debian/patches/python32_compile_fix.diff b/debian/patches/python32_compile_fix.diff
new file mode 100644
index 0000000..5440477
--- /dev/null
+++ b/debian/patches/python32_compile_fix.diff
@@ -0,0 +1,21 @@
+Description: Compile fix for Python 3.2 and higher
+Author: Simon Edwards <simon at simonzone.com>
+Origin: upstream, https://projects.kde.org/projects/kde/kdebindings/pykde4/repository/revisions/54bd6a7628e04efe5e1de53075227713f2526acf
+Last-Update: 2012-05-08
+
+Index: b/sip/kio/kfileitem.sip
+===================================================================
+--- a/sip/kio/kfileitem.sip
++++ b/sip/kio/kfileitem.sip
+@@ -236,7 +236,11 @@
+         
+         len = sipCpp->count();
+         
++#if PY_VERSION_HEX >= 0x03020000
++        if (PySlice_GetIndicesEx(a0, len, &start, &stop, &step, &slicelength) < 0)
++#else
+         if (PySlice_GetIndicesEx((PySliceObject *)a0, len, &start, &stop, &step, &slicelength) < 0)
++#endif
+             sipIsErr = 1;
+         else
+         {
diff --git a/debian/patches/series b/debian/patches/series
index 0474e82..2e6f47e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix_kpythonpluginfactory_build.diff
 make_pykde4_respect_sip_flags.diff
 pythonpluginfactory_use_versioned_python_lib.diff
 optional_install_sip_files.diff
+python32_compile_fix.diff
diff --git a/debian/python-kde4.install b/debian/python-kde4.install
index bb19869..824bdd6 100644
--- a/debian/python-kde4.install
+++ b/debian/python-kde4.install
@@ -1,6 +1,6 @@
 usr/lib/kde4/kpythonpluginfactory.so
-usr/lib/python*/*-packages/PyKDE4/*.so
-usr/lib/python*/*-packages/PyKDE4/__init__.py
-usr/lib/python*/*-packages/PyKDE4/pykdeconfig.py
-usr/lib/python*/*-packages/PyQt4/uic/pykdeuic4.py
-usr/lib/python*/*-packages/PyQt4/uic/widget-plugins/kde4.py
+usr/lib/python2.*/*-packages/PyKDE4/*.so
+usr/lib/python2.*/*-packages/PyKDE4/__init__.py
+usr/lib/python2.*/*-packages/PyKDE4/pykdeconfig.py
+usr/lib/python2.*/*-packages/PyQt4/uic/pykdeuic4.py
+usr/lib/python2.*/*-packages/PyQt4/uic/widget-plugins/kde4.py
diff --git a/debian/python-kde4.docs b/debian/python3-pykde4.docs
similarity index 100%
copy from debian/python-kde4.docs
copy to debian/python3-pykde4.docs
diff --git a/debian/python3-pykde4.install b/debian/python3-pykde4.install
new file mode 100644
index 0000000..3367644
--- /dev/null
+++ b/debian/python3-pykde4.install
@@ -0,0 +1,5 @@
+usr/lib/python3/*-packages/PyKDE4/*.so
+usr/lib/python3/*-packages/PyKDE4/__init__.py
+usr/lib/python3/*-packages/PyKDE4/pykdeconfig.py
+usr/lib/python3/*-packages/PyQt4/uic/pykdeuic4.py
+usr/lib/python3/*-packages/PyQt4/uic/widget-plugins/kde4.py
diff --git a/debian/rules b/debian/rules
index 90db410..88d897e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 
-dh = --with=python2
+dh = --with=python2,python3
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
@@ -8,6 +8,9 @@ pyversions = $(shell pyversions -vr)
 pydefaultversion = $(shell pyversions -vd)
 pyshared_nondefault = $(foreach v,$(filter-out $(pydefaultversion),$(pyversions)),\
     usr/lib/pyshared/python$v/PyKDE4 usr/lib/python$v/dist-packages/PyKDE4)
+py3versions = $(shell py3versions -vr)
+PYTHONDONTWRITEBYTECODE = True
+export PYTHONDONTWRITEBYTECODE
 
 define nl
 
@@ -20,16 +23,24 @@ override_dh_auto_configure:
 	    -DPYTHON_EXECUTABLE=/usr/bin/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_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:
 	$(foreach v,$(pyversions),$(overridden_command) --builddirectory=builddir-$v $(nl))
+	$(foreach v,$(py3versions),$(overridden_command) --builddirectory=builddir-$v $(nl))
 
 override_dh_python2:
 	$(overridden_command)
 	dh_sip -ppython-kde4
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=python-kde4-dbg
+	$(overridden_command) -ppython-kde4 --dbg-package=python-kde4-dbg
+	$(overridden_command) -ppython3-pykde4 --dbg-package=python3-pykde4-dbg
 
 override_dh_shlibdeps:
 	if [ -d debian/python-kde4 ]; then \

-- 
PyKDE4 packaging

