[SCM] PyKDE4 packaging branch, master, updated. 39441f433ceb30f0c72cb62b77dd24b24a4739c5

[Modestas Vainius]

The following commit has been merged in the master branch:
commit d412a3f753e91d215aab951f1fabaa032f97e3b5
Author: Modestas Vainius <modax at debian.org>
Date:   Thu Jun 30 21:08:07 2011 +0300

    Document all Debian patches.
---
 debian/changelog                                   |    1 +
 debian/patches/fix_kpythonpluginfactory_build.diff |    6 ++++++
 debian/patches/make_pykde4_respect_sip_flags.diff  |    9 +++++++++
 debian/patches/optional_install_sip_files.diff     |    8 ++++++++
 ...python_modules_dont_link_against_libpython.diff |    6 ++++++
 ...thonpluginfactory_use_versioned_python_lib.diff |   10 ++++++++++
 6 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bd3315..e579eae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,5 +33,6 @@ pykde4 (4:4.6.80-0r1) UNRELEASED; urgency=low
     of documentation.
   * Add kdebindings-dbg to python-kde4-dbg Breaks/Replaces.
   * Update debian/coypright.
+  * Document all Debian patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Jun 2011 20:31:17 +0300
diff --git a/debian/patches/fix_kpythonpluginfactory_build.diff b/debian/patches/fix_kpythonpluginfactory_build.diff
index a712135..4fe6223 100644
--- a/debian/patches/fix_kpythonpluginfactory_build.diff
+++ b/debian/patches/fix_kpythonpluginfactory_build.diff
@@ -1,3 +1,9 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Include Python.h first as Qt includes steal "slots" keyword
+Forwarded: no
+Origin: vendor
+Last-Update: 2008-12-05
+
 --- a/kpythonpluginfactory/kpythonpluginfactory.cpp
 +++ b/kpythonpluginfactory/kpythonpluginfactory.cpp
 @@ -18,6 +18,7 @@
diff --git a/debian/patches/make_pykde4_respect_sip_flags.diff b/debian/patches/make_pykde4_respect_sip_flags.diff
index 84620bc..1962dc2 100644
--- a/debian/patches/make_pykde4_respect_sip_flags.diff
+++ b/debian/patches/make_pykde4_respect_sip_flags.diff
@@ -1,3 +1,12 @@
+From: Michael Casadevall <mcasadevall at debian.org>
+Subject: Respect Qt SIP flags
+Forwarded: no
+Origin:
+Last-Update: 2009-04-15
+
+Corrects FTBFS on armel by making sure pykde4 properly parses the python-qt4
+flags passed from PythonQt4's cmake file.
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -95,6 +95,9 @@ INCLUDE_DIRECTORIES(
diff --git a/debian/patches/optional_install_sip_files.diff b/debian/patches/optional_install_sip_files.diff
index d614c73..a1ba76f 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -1,3 +1,11 @@
+From: Sune Vuorela <sune at debian.org>
+Subject: Install sip files only when building for default python version
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2010-08-07
+
+Make it possible to only install the sip files under some conditions
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -261,15 +261,20 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DI
diff --git a/debian/patches/python_modules_dont_link_against_libpython.diff b/debian/patches/python_modules_dont_link_against_libpython.diff
index 3f4239e..d4929d1 100644
--- a/debian/patches/python_modules_dont_link_against_libpython.diff
+++ b/debian/patches/python_modules_dont_link_against_libpython.diff
@@ -1,3 +1,9 @@
+From: Adeodato Simó <adeodato at debian.org>
+Subject: Do not let python modules link against libpython.
+Forwarded: no
+Origin: vendor
+Last-Update: 2008-01-25
+
 Do not link python modules against -lpython2.X. Since KDE4's cmake file
 uses --no-undefined by default, we have to remove that from the default
 CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
diff --git a/debian/patches/pythonpluginfactory_use_versioned_python_lib.diff b/debian/patches/pythonpluginfactory_use_versioned_python_lib.diff
index b5fb693..7aa65a0 100644
--- a/debian/patches/pythonpluginfactory_use_versioned_python_lib.diff
+++ b/debian/patches/pythonpluginfactory_use_versioned_python_lib.diff
@@ -1,3 +1,13 @@
+From: Sune Vuorela <sune at debian.org>
+Subject: Make kpythonfactory dlopen versioned python library.
+Bug-Debian: http://bugs.debian.org/524685
+Bug-Debian: http://bugs.debian.org/541999
+Last-Update: 2009-09-19
+Forwarded: no
+Origin: vendor
+
+Otherwise, python-dev would be needed for Python Plugin factory to work.
+
 --- a/kpythonpluginfactory/kpythonpluginfactory.cpp
 +++ b/kpythonpluginfactory/kpythonpluginfactory.cpp
 @@ -307,7 +307,7 @@ QLibrary *LoadPythonLibrary()

-- 
PyKDE4 packaging