[SCM] PyKDE4 packaging branch, master, updated. debian/4.8.4-2
Maximiliano Curia
maxy at alioth.debian.org
Thu Jun 13 12:37:08 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/pykde4.git;a=commitdiff;h=adda50f
The following commit has been merged in the master branch:
commit adda50fcdc57d00b3f2106ed608c02802bda18f5
Author: Maximiliano Curia <maxy at debian.org>
Date: Thu Jun 13 14:34:45 2013 +0200
pykde4 (4:4.8.4-2) unstable; urgency=low
* Team upload
* Updates for sip4 transition and python multiarch (Closes: #708857)
- Bump minimum python-sip version to 4.14
- Add debian/patches/new_pyincludes.diff (based on Kubuntu patch) to
support multiple include directories for python3.3
- Add debian/patches/cmake_no_bytecode.diff to temporarily disable
byte compilation (which breaks python3 part of the build and is
not needed - upstream has a better solution for 4.9+)
- Add debian/patches/python3_sip_options.diff (from Kubuntu) to fix
duplicate typedef with current python-qt4
- Bump minimum python-qt4 and python-qt4-dev version to 4.9.4
- Add debian/patches/pythonpluginfactory_python3.diff and
kpythonpluginfactory_3.2support.diff, both from Kubuntu, to support
building kpythonpluginfactory for python3 too
- Adjust debian/rules to use the new include directories and to use
appropriate ABI tags for python3 (Closes: #707148)
* Add python-version-specific pykdeuic4 links to python-kde4-dev.install
-- Scott Kitterman <scott at kitterman.com> Fri, 17 May 2013 18:38:28 -0400
---
debian/changelog | 22 +++++++++
debian/control | 2 +-
debian/copyright | 3 ++
debian/not-installed | 53 +++++++++++++--------
debian/patches/make_pykde4_respect_sip_flags.diff | 4 +-
debian/patches/series | 5 ++
debian/python-kde4-dev.install | 1 +
debian/python3-pykde4.install | 1 +
debian/rules | 21 ++++++--
9 files changed, 84 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a9527e4..446d0ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+pykde4 (4:4.8.4-2) unstable; urgency=low
+
+ * Team upload
+ * Updates for sip4 transition and python multiarch (Closes: #708857)
+ - Bump minimum python-sip version to 4.14
+ - Add debian/patches/new_pyincludes.diff (based on Kubuntu patch) to
+ support multiple include directories for python3.3
+ - Add debian/patches/cmake_no_bytecode.diff to temporarily disable
+ byte compilation (which breaks python3 part of the build and is
+ not needed - upstream has a better solution for 4.9+)
+ - Add debian/patches/python3_sip_options.diff (from Kubuntu) to fix
+ duplicate typedef with current python-qt4
+ - Bump minimum python-qt4 and python-qt4-dev version to 4.9.4
+ - Add debian/patches/pythonpluginfactory_python3.diff and
+ kpythonpluginfactory_3.2support.diff, both from Kubuntu, to support
+ building kpythonpluginfactory for python3 too
+ - Adjust debian/rules to use the new include directories and to use
+ appropriate ABI tags for python3 (Closes: #707148)
+ * Add python-version-specific pykdeuic4 links to python-kde4-dev.install
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 17 May 2013 18:38:28 -0400
+
pykde4 (4:4.8.4-1) unstable; urgency=low
* Team upload
diff --git a/debian/control b/debian/control
index 22939e7..ca7f2a6 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Description: Python bindings for the KDE Development Platform
Package: python-kde4-dev
Architecture: all
-Depends: ${misc:Depends}, python-kde4 (>= ${source:Version}), python-qt4 (>= 4.8.3-3~)
+Depends: ${misc:Depends}, python-kde4 (>= ${source:Version}) | python3-pykde4 (>= ${source:Version})
Breaks: python-kde4 (<< ${source:Version})
Description: UIC compiler and SIP files for PyKDE
This package contains pykdeuic4, a wrapper around PyQt's own UIC (user
diff --git a/debian/copyright b/debian/copyright
index 9a699e3..058709c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,6 +32,9 @@ Upstream copyright holders:
Copyright: © 2008 David Boddie <david at boddie.org.uk>
Copyright: © 2006 Chusslove Illich <caslav.ilic at gmx.net>
+debian/patches/pythonpluginfactory_python3.diff
+ Copyright (C) 2012 Barry A. Warsaw <barry at python.org>
+
General licensing information (extracted from docs/html/General):
PyKDE4 is licensed under the GNU Lesser (or Library) General Public License
diff --git a/debian/not-installed b/debian/not-installed
index 30a470a..c0b5350 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,28 +1,39 @@
#Python *.pyc files.
-./usr/lib/python2.6/dist-packages/PyKDE4/__init__.pyc
-./usr/lib/python2.6/dist-packages/PyKDE4/pykdeconfig.pyc
-./usr/lib/python2.6/dist-packages/PyQt4/uic/pykdeuic4.pyc
-./usr/lib/python2.6/dist-packages/PyQt4/uic/widget-plugins/kde4.pyc
./usr/lib/python2.7/dist-packages/PyKDE4/__init__.pyc
./usr/lib/python2.7/dist-packages/PyKDE4/pykdeconfig.pyc
./usr/lib/python2.7/dist-packages/PyQt4/uic/pykdeuic4.pyc
./usr/lib/python2.7/dist-packages/PyQt4/uic/widget-plugins/kde4.pyc
# dh_python3 renames them
-./usr/lib/python3/dist-packages/PyKDE4/akonadi.so
-./usr/lib/python3/dist-packages/PyKDE4/dnssd.so
-./usr/lib/python3/dist-packages/PyKDE4/kdecore.so
-./usr/lib/python3/dist-packages/PyKDE4/kdeui.so
-./usr/lib/python3/dist-packages/PyKDE4/khtml.so
-./usr/lib/python3/dist-packages/PyKDE4/kio.so
-./usr/lib/python3/dist-packages/PyKDE4/knewstuff.so
-./usr/lib/python3/dist-packages/PyKDE4/kparts.so
-./usr/lib/python3/dist-packages/PyKDE4/kterminal.so
-./usr/lib/python3/dist-packages/PyKDE4/ktexteditor.so
-./usr/lib/python3/dist-packages/PyKDE4/kutils.so
-./usr/lib/python3/dist-packages/PyKDE4/nepomuk.so
-./usr/lib/python3/dist-packages/PyKDE4/phonon.so
-./usr/lib/python3/dist-packages/PyKDE4/plasma.so
-./usr/lib/python3/dist-packages/PyKDE4/solid.so
-./usr/lib/python3/dist-packages/PyKDE4/soprano.so
-
+./usr/lib/python3/dist-packages/PyKDE4/akonadi.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/dnssd.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/kdecore.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/kdeui.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/khtml.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/kio.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/knewstuff.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/kparts.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/kterminal.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/ktexteditor.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/kutils.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/nepomuk.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/phonon.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/plasma.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/solid.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/soprano.cpython-32mu.so
+./usr/lib/python3/dist-packages/PyKDE4/akonadi.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/dnssd.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/kdecore.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/kdeui.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/khtml.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/kio.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/knewstuff.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/kparts.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/kterminal.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/ktexteditor.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/kutils.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/nepomuk.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/phonon.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/plasma.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/solid.cpython-33m.so
+./usr/lib/python3/dist-packages/PyKDE4/soprano.cpython-33m.so
diff --git a/debian/patches/make_pykde4_respect_sip_flags.diff b/debian/patches/make_pykde4_respect_sip_flags.diff
index 107161f..a679f6b 100644
--- a/debian/patches/make_pykde4_respect_sip_flags.diff
+++ b/debian/patches/make_pykde4_respect_sip_flags.diff
@@ -9,8 +9,8 @@ flags passed from PythonQt4's cmake file.
Index: pykde4-4.8.4/CMakeLists.txt
===================================================================
---- pykde4-4.8.4.orig/CMakeLists.txt 2012-06-16 20:33:00.333497437 -0400
-+++ pykde4-4.8.4/CMakeLists.txt 2012-06-16 20:33:11.781497615 -0400
+--- pykde4-4.8.4.orig/CMakeLists.txt 2013-05-20 08:28:43.709423820 -0400
++++ pykde4-4.8.4/CMakeLists.txt 2013-05-20 08:28:43.705423820 -0400
@@ -86,6 +86,9 @@
${KDEPIMLIBS_INCLUDE_DIRS}
)
diff --git a/debian/patches/series b/debian/patches/series
index 0474e82..8ff5244 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,8 @@ fix_kpythonpluginfactory_build.diff
make_pykde4_respect_sip_flags.diff
pythonpluginfactory_use_versioned_python_lib.diff
optional_install_sip_files.diff
+new_pyincludes.diff
+cmake_no_bytecode.diff
+python3_sip_options.diff
+pythonpluginfactory_python3.diff
+kpythonpluginfactory_3.2support.diff
diff --git a/debian/python-kde4-dev.install b/debian/python-kde4-dev.install
index b8acf05..c89b8ac 100644
--- a/debian/python-kde4-dev.install
+++ b/debian/python-kde4-dev.install
@@ -1,2 +1,3 @@
usr/bin/pykdeuic4
+usr/bin/pykdeuic4-3.*
usr/share/sip/PyKDE4
diff --git a/debian/python3-pykde4.install b/debian/python3-pykde4.install
index 3367644..3e99c6e 100644
--- a/debian/python3-pykde4.install
+++ b/debian/python3-pykde4.install
@@ -1,3 +1,4 @@
+usr/lib/kde4/kpythonpluginfactory.cpython-*
usr/lib/python3/*-packages/PyKDE4/*.so
usr/lib/python3/*-packages/PyKDE4/__init__.py
usr/lib/python3/*-packages/PyKDE4/pykdeconfig.py
diff --git a/debian/rules b/debian/rules
index 6fa07f0..12c2760 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,8 @@ 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
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
define nl
@@ -21,18 +21,31 @@ 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 \
+ -DPYTHON_INCLUDE_DIR=/usr/include/python$v \
+ -DPYTHON_INCLUDE_DIR2=/usr/include/$(DEB_HOST_MULTIARCH)/python$v \
+ -DPYTHON_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(v).so \
-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_DIR=/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 --destdir=debian/tmp-$v $(nl) ABITAG=`python$(v) -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; for f in `find debian/tmp-$v/ -name '*.so' ! -name '*.cpython*.so'`; do mv $$f $${f%.so}.$$ABITAG.so; done;)
+ set -e && for i in $(py3versions); do \
+ mv debian/tmp-$$i/usr/bin/pykdeuic4 debian/tmp/usr/bin/pykdeuic4-$$i ; \
+ cp -rv debian/tmp-$$i/* debian/tmp/ ; \
+ done
override_dh_python3:
$(overridden_command)
--
PyKDE4 packaging
More information about the pkg-kde-commits
mailing list