[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.8.3-1-15-g5af3b20

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.8 branch:
commit 6910926dab1e8fb071d1cf7b0c322e3125db4548
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Jun 4 22:29:31 2012 +0200

    Refresh python3-support-bytecode.patch.
---
 debian/patches/python3-support-bytecode.patch |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/python3-support-bytecode.patch b/debian/patches/python3-support-bytecode.patch
index 1e643c0..1046d26 100644
--- a/debian/patches/python3-support-bytecode.patch
+++ b/debian/patches/python3-support-bytecode.patch
@@ -8,10 +8,9 @@ Add support for PYTHONDONTWRITEBYTECODE environment variable to allow bytecode
 compilation to be disabled.  Work around for lack of Python 3 bytecode support,
 but since Debian packages don't ship bytecode files this is OK for Debian.
 
-diff -ruN kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake kdelibs-4.6.3/cmake/modules/PythonMacros.cmake
---- kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake	2011-04-01 15:55:50.000000000 +0200
-+++ kdelibs-4.6.3/cmake/modules/PythonMacros.cmake	2011-06-21 22:30:18.957765437 +0200
-@@ -23,40 +23,42 @@
+--- a/cmake/modules/PythonMacros.cmake
++++ b/cmake/modules/PythonMacros.cmake
+@@ -23,40 +23,42 @@ MACRO(PYTHON_INSTALL SOURCE_FILE DESINAT
    # Install the source file.
    INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
  
@@ -36,19 +35,21 @@ diff -ruN kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake kdelibs-4.6.3/cmak
 -  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
 -    ADD_CUSTOM_COMMAND(
 -      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${message}
+-      COMMAND ${CMAKE_COMMAND} -E echo ${_message}
 -      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 -      DEPENDS ${_absfilename}
 -    )
 -  ELSE(_abs_bin_py STREQUAL ${_absfilename})
 -    ADD_CUSTOM_COMMAND(
 -      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${message} 
+-      COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
 -      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
 -      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 -      DEPENDS ${_absfilename}
 -    )
 -  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+-
+-  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
 +  # Byte compile and install the .pyc file.
 +  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
 +    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
@@ -84,8 +85,7 @@ diff -ruN kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake kdelibs-4.6.3/cmak
 +        DEPENDS ${_absfilename}
 +      )
 +    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
- 
--  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++ 
 +    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
 +  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
  ENDMACRO(PYTHON_INSTALL)

-- 
KDE Development Platform Libraries module packaging