[SCM] PyKDE4 packaging branch, kde4.10, updated. debian/4.8.4-1-15-g6d0cf56

[Maximiliano Curia]

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

The following commit has been merged in the kde4.10 branch:
commit 8965bfa7afb50e63d22e9268167f7380f5d69dd2
Author: Diane Trout <diane at caltech.edu>
Date:   Sun Apr 7 10:30:37 2013 -0700

    Update to new release.
    
    A cmake variable was renamed from SIP_DEFAULT_SIP_DIR to
    SIP_FILES_INSTALL_DIR.
---
 debian/changelog                               |    2 +-
 debian/patches/optional_install_sip_files.diff |   18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e6693a..805b6b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pykde4 (4:4.10.1-0r0) UNRELEASED; urgency=low
+pykde4 (4:4.10.2-1) UNRELEASED; urgency=low
 
   * New upstream release
 
diff --git a/debian/patches/optional_install_sip_files.diff b/debian/patches/optional_install_sip_files.diff
index 8ee8ed6..bb54c50 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -6,25 +6,27 @@ Last-Update: 2013-02-12
 
 Make it possible to only install the sip files under some conditions
 
+Index: b/CMakeLists.txt
+===================================================================
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -278,15 +278,20 @@ python_install(${CMAKE_CURRENT_BINARY_DI
+@@ -280,15 +280,20 @@
  
  # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
  # (Don't forget the / at the end of sip/.)
--install(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
+-install(DIRECTORY sip/ DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4
 -    PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
 -    PATTERN ".svn" EXCLUDE
 -    PATTERN "*.in" EXCLUDE)
-+IF(DEFAULT_PYTHON_VERSION)
-+    INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
++if(DEFAULT_PYTHON_VERSION)
++    install(DIRECTORY sip/ DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4
 +        PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
 +        PATTERN ".svn" EXCLUDE
 +        PATTERN "*.in" EXCLUDE)
-+   MESSAGE("Installing sip files in this build pass")
-+ELSE(DEFAULT_PYTHON_VERSION)
-+   MESSAGE("Not installing sip files in this build pass")
-+ENDIF(DEFAULT_PYTHON_VERSION)
++    message("Installing sip files in this build pass")
++else(DEFAULT_PYTHON_VERSION)
++    message("Not installing sip files in this build pass")
++endif(DEFAULT_PYTHON_VERSION)
  
  add_subdirectory(tools)
  #add_subdirectory(docs)

-- 
PyKDE4 packaging