[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.10.5-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=0ca4b36

The following commit has been merged in the master branch:
commit 0ca4b369d87489a709ab134c77493df085d62b36
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Jan 31 20:16:57 2013 +0100

    Drop findpythonlibrary_layout_deb_on_debian.diff, no longer needed.
---
 debian/changelog                                   |    1 +
 .../findpythonlibrary_layout_deb_on_debian.diff    |   37 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e36d096..b7de3b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ kde4libs (4:4.10.0-0r0) UNRELEASED; urgency=low
   * Update patches:
     - drop fix-copying-of-files-with-extended-ACLs.patch, applied upstream.
     - drop python3-support-bytecode.patch, applied upstream.
+    - drop findpythonlibrary_layout_deb_on_debian.diff, no longer needed. 
     - update make_libkdeinit4_private.diff.
     - refresh other patches to make them apply without any offset.
   * Bump libsoprano-dev build dependency to >= 2.7.56.
diff --git a/debian/patches/findpythonlibrary_layout_deb_on_debian.diff b/debian/patches/findpythonlibrary_layout_deb_on_debian.diff
deleted file mode 100644
index 5ae60d9..0000000
--- a/debian/patches/findpythonlibrary_layout_deb_on_debian.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: FindPythonLibrary: pass --layout=deb to distutils if build type is Debian
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2011-06-30
-
-Python stuff should be installed to /usr/lib/python<version>/dist-packages/
-rather than /usr/lib/python<version>/site-packages/ when building debian
-packages (i.e. CMAKE_BUILD_TYPE is Debian).
-
-This affects both PYTHON_SITE_PACKAGES_DIR and PYTHON_SITE_PACKAGES_INSTALL_DIR
-variables.
-
---- a/cmake/modules/FindPythonLibrary.cmake
-+++ b/cmake/modules/FindPythonLibrary.cmake
-@@ -46,7 +46,10 @@ else(EXISTS PYTHON_LIBRARY)
-       message(FATAL_ERROR "The file FindLibPython.py does not exist in ${_py_cmake_module_dir} (the directory where FindPythonLibrary.cmake is located). Check your installation.")
-     endif(NOT EXISTS "${_py_cmake_module_dir}/FindLibPython.py")
- 
--    execute_process(COMMAND ${PYTHON_EXECUTABLE}  "${_py_cmake_module_dir}/FindLibPython.py" OUTPUT_VARIABLE python_config)
-+    if (CMAKE_BUILD_TYPE MATCHES "Debian")
-+      set(_findlibpython_args "--layout=deb")
-+    endif (CMAKE_BUILD_TYPE MATCHES "Debian")
-+    execute_process(COMMAND ${PYTHON_EXECUTABLE}  "${_py_cmake_module_dir}/FindLibPython.py" ${_findlibpython_args} OUTPUT_VARIABLE python_config)
-     if(python_config)
-       string(REGEX REPLACE ".*exec_prefix:([^
]+).*$" "\1" PYTHON_PREFIX ${python_config})
-       string(REGEX REPLACE ".*
short_version:([^
]+).*$" "\1" PYTHON_SHORT_VERSION ${python_config})
-@@ -60,7 +63,8 @@ else(EXISTS PYTHON_LIBRARY)
-       set(PYTHON_SITE_PACKAGES_DIR "${_TMP_PYTHON_SITE_PACKAGES_DIR}" CACHE PATH "The python site packages dir" FORCE)
- 
-       # This one is intended to be used and changed by the user for installing own modules:
--      set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/python${PYTHON_SHORT_VERSION}/site-packages CACHE PATH "The directory where python modules will be installed to.")
-+      get_filename_component(_python_site_packages_dir_name "${_TMP_PYTHON_SITE_PACKAGES_DIR}" NAME)
-+      set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/python${PYTHON_SHORT_VERSION}/${_python_site_packages_dir_name} CACHE PATH "The directory where python modules will be installed to.")
- 
-       string(REGEX REPLACE "([0-9]+).([0-9]+)" "\1\2" PYTHON_SHORT_VERSION_NO_DOT ${PYTHON_SHORT_VERSION})
-       set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION} python${PYTHON_SHORT_VERSION_NO_DOT})
diff --git a/debian/patches/series b/debian/patches/series
index 0395be1..fb475d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,6 @@ hurd_support.diff
 kfileshare_kdesu_fileshareset.diff
 relax_plugin_kde_version_check.diff
 add_dlrestrictions_support.diff
-findpythonlibrary_layout_deb_on_debian.diff
 ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff

-- 
KDE Development Platform Libraries module packaging