[SCM] PyKDE4 packaging branch, master, updated. debian/4.6.80-1-4-gcd9e8e3

[Pino Toscano]

The following commit has been merged in the master branch:
commit 6991612e95c57c73b830a863ca8870d0ff6cd8a3
Author: Pino Toscano <pino at kde.org>
Date:   Fri Jul 1 10:46:39 2011 +0200

    refresh all the patches
---
 debian/changelog                                  |    3 +++
 debian/patches/make_pykde4_respect_sip_flags.diff |    4 ++--
 debian/patches/optional_install_sip_files.diff    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bcfde5..4410f26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 pykde4 (4:4.6.80-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Update the patches:
+    - refresh
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 Jul 2011 10:44:19 +0200
 
diff --git a/debian/patches/make_pykde4_respect_sip_flags.diff b/debian/patches/make_pykde4_respect_sip_flags.diff
index 1962dc2..4107f58 100644
--- a/debian/patches/make_pykde4_respect_sip_flags.diff
+++ b/debian/patches/make_pykde4_respect_sip_flags.diff
@@ -9,7 +9,7 @@ flags passed from PythonQt4's cmake file.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -95,6 +95,9 @@ INCLUDE_DIRECTORIES(
+@@ -85,6 +85,9 @@ INCLUDE_DIRECTORIES(
      ${KDEPIMLIBS_INCLUDE_DIRS}
  )
  
@@ -19,7 +19,7 @@ flags passed from PythonQt4's cmake file.
  SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
  SET(SIP_CONCAT_PARTS 8)
  IF (WIN32)
-@@ -102,7 +105,7 @@ IF (WIN32)
+@@ -92,7 +95,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 a1ba76f..d9ade68 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -8,7 +8,7 @@ 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
+@@ -251,15 +251,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/.)

-- 
PyKDE4 packaging