[SCM] PyKDE4 packaging branch, kde4.9, updated. debian/4.8.4-1-5-g627c634

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.9 branch:
commit 61bd9ec68ae9f57fde81d19fa0503175b18e5796
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Jan 22 13:59:24 2013 +0100

    Refresh some patches to make them apply without any offset.
---
 debian/changelog                                   |    1 +
 debian/patches/make_pykde4_respect_sip_flags.diff  |   10 ++++------
 debian/patches/optional_install_sip_files.diff     |    8 +++-----
 ...python_modules_dont_link_against_libpython.diff |    8 +++-----
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a50e9dd..3b16a95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pykde4 (4:4.9.5-0r0) UNRELEASED; urgency=low
   * New upstream release
 
   [ José Manuel Santamaría Lema ]
+  * Refresh some patches to make them apply without any offset.
   * Add watch file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jan 2013 13:53:10 +0100
diff --git a/debian/patches/make_pykde4_respect_sip_flags.diff b/debian/patches/make_pykde4_respect_sip_flags.diff
index 107161f..9468cfa 100644
--- a/debian/patches/make_pykde4_respect_sip_flags.diff
+++ b/debian/patches/make_pykde4_respect_sip_flags.diff
@@ -7,11 +7,9 @@ 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.
 
-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
-@@ -86,6 +86,9 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,6 +87,9 @@ INCLUDE_DIRECTORIES(
      ${KDEPIMLIBS_INCLUDE_DIRS}
  )
  
@@ -21,7 +19,7 @@ Index: pykde4-4.8.4/CMakeLists.txt
  SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
  SET(SIP_CONCAT_PARTS 8)
  IF (WIN32)
-@@ -93,7 +96,7 @@
+@@ -94,7 +97,7 @@ IF (WIN32)
  ELSE (WIN32)
      SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
  ENDIF (WIN32)
diff --git a/debian/patches/optional_install_sip_files.diff b/debian/patches/optional_install_sip_files.diff
index 77259af..601aafd 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -6,11 +6,9 @@ Last-Update: 2011-07-01
 
 Make it possible to only install the sip files under some conditions
 
-Index: pykde4-4.8.4/CMakeLists.txt
-===================================================================
---- pykde4-4.8.4.orig/CMakeLists.txt	2012-06-16 20:33:11.781497615 -0400
-+++ pykde4-4.8.4/CMakeLists.txt	2012-06-16 20:34:06.585498468 -0400
-@@ -252,15 +252,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -263,15 +263,20 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DI
  
  # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
  # (Don't forget the / at the end of sip/.)
diff --git a/debian/patches/python_modules_dont_link_against_libpython.diff b/debian/patches/python_modules_dont_link_against_libpython.diff
index 1f3b4d5..e3f6494 100644
--- a/debian/patches/python_modules_dont_link_against_libpython.diff
+++ b/debian/patches/python_modules_dont_link_against_libpython.diff
@@ -8,11 +8,9 @@ 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.
 
-Index: pykde4-4.8.4/CMakeLists.txt
-===================================================================
---- pykde4-4.8.4.orig/CMakeLists.txt	2011-07-27 14:37:12.549710782 -0400
-+++ pykde4-4.8.4/CMakeLists.txt	2012-06-16 20:32:09.389496643 -0400
-@@ -102,6 +102,9 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,6 +113,9 @@ ENDIF (PYTHON_3)
  
  ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
  

-- 
PyKDE4 packaging