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

[Modestas Vainius]

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

    Define Qt/KDE definition when building standalone.
    
    Actually replace include_default_settings_in_python_cmakelist.diff patch with
    add_qt_kde_definitions.diff. Only add_definitions() part moved to the proper
    place remains.
---
 debian/changelog                                   |    3 ++
 debian/patches/add_qt_kde_definitions.diff         |   18 +++++++++++++++++
 ...clude_default_settings_in_python_cmakelist.diff |   21 --------------------
 debian/patches/series                              |    2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e579eae..543ab69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,5 +34,8 @@ pykde4 (4:4.6.80-0r1) UNRELEASED; urgency=low
   * Add kdebindings-dbg to python-kde4-dbg Breaks/Replaces.
   * Update debian/coypright.
   * Document all Debian patches.
+  * Replace include_default_settings_in_python_cmakelist.diff patch with
+    add_qt_kde_definitions.diff. Only add_definitions() part moved to the
+    proper place remains.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Jun 2011 20:31:17 +0300
diff --git a/debian/patches/add_qt_kde_definitions.diff b/debian/patches/add_qt_kde_definitions.diff
new file mode 100644
index 0000000..3777c9c
--- /dev/null
+++ b/debian/patches/add_qt_kde_definitions.diff
@@ -0,0 +1,18 @@
+From: Sune Vuorela <sune at debian.org>
+From: Modestas Vainius <modax at debian.org>
+Subject: define Qt/KDE definitions when building standalone
+Forwarded: no
+Last-Update: 2011-06-30
+Origin: vendor
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_
+ 
+     include_directories (${KDE4_INCLUDES})
+ 
++    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
++
+ endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ # This module can be built independant from the rest of kdebindings.
diff --git a/debian/patches/include_default_settings_in_python_cmakelist.diff b/debian/patches/include_default_settings_in_python_cmakelist.diff
deleted file mode 100644
index 0578413..0000000
--- a/debian/patches/include_default_settings_in_python_cmakelist.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,6 +22,18 @@ ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMA
-     SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde)
- ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
- 
-+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
-+
-+# search packages used by KDE
-+find_package(KDE4 REQUIRED)
-+include (KDE4Defaults)
-+include (MacroLibrary)
-+include(MacroOptionalAddSubdirectory)
-+
-+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
-+
-+
- FIND_PACKAGE(PythonLibrary REQUIRED)
- INCLUDE(PythonMacros)
- 
diff --git a/debian/patches/series b/debian/patches/series
index ecbebd7..0474e82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 python_modules_dont_link_against_libpython.diff
-include_default_settings_in_python_cmakelist.diff
+add_qt_kde_definitions.diff
 fix_kpythonpluginfactory_build.diff
 make_pykde4_respect_sip_flags.diff
 pythonpluginfactory_use_versioned_python_lib.diff

-- 
PyKDE4 packaging