[SCM] KDE Development Platform Libraries module packaging branch, kde4.9, updated. debian/4.8.4-3-30-gf7ff1de
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Wed Jan 9 23:50:46 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=7e689bf
The following commit has been merged in the kde4.9 branch:
commit 7e689bfba322695705664f0fa52cf696d5e812d9
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed Dec 19 22:41:42 2012 +0100
Remove python3-support-bytecode.patch, applied upstream.
---
debian/changelog | 2 +-
debian/patches/python3-support-bytecode.patch | 114 -------------------------
debian/patches/series | 1 -
3 files changed, 1 insertions(+), 116 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index da15532..3bc927b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ kde4libs (4:4.9.4-0r0) UNRELEASED; urgency=low
[ José Manuel Santamaría Lema ]
* Update patches:
- drop fix-copying-of-files-with-extended-ACLs.patch, applied upstream.
- - update python3-support-bytecode.patch
+ - drop python3-support-bytecode.patch, applied upstream.
- refresh other patches to make them apply without any offset.
* Bump libsoprano-dev build dependency to >= 2.7.56.
* Add aspell to build dependencies, this is a workaround for a possible bug in
diff --git a/debian/patches/python3-support-bytecode.patch b/debian/patches/python3-support-bytecode.patch
deleted file mode 100644
index 114abc1..0000000
--- a/debian/patches/python3-support-bytecode.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Andreas K. Huettel <andreas.huettel at physik.uni-r.de>
-From: Chris Reffett <creffett at gentoo.org>
-Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable in PYTHON_INSTALL macro
-Bug-Gentoo: https://bugs.gentoo.org/372407
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672552 for
-Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch?revision=1.1&view=markup
-
-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.
-
---- a/cmake/modules/PythonMacros.cmake
-+++ b/cmake/modules/PythonMacros.cmake
-@@ -24,52 +24,54 @@ MACRO(PYTHON_INSTALL SOURCE_FILE DESTINA
- INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
-
- # Byte compile and install the .pyc file.
-- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
-- if(WIN32)
-- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-- endif(WIN32)
--
-- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--
-- # Python 3.2 changed the pyc file location
-- IF(PYTHON_SHORT_VERSION GREATER 3.1)
-- # To get the right version for suffix
-- STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-- ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-- ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
--
-- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
-- SET(_message "Byte-compiling ${_bin_py}")
--
-- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-- 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 ${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 copy ${_absfilename} ${_bin_py}
-- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-- DEPENDS ${_absfilename}
-- )
-- ENDIF(_abs_bin_py STREQUAL ${_absfilename})
--
-- IF(PYTHON_SHORT_VERSION GREATER 3.1)
-- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-- ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
-+ IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+ GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+ GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+ GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+ GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+
-+ if(WIN32)
-+ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+ endif(WIN32)
-+
-+ SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+
-+ # Python 3.2 changed the pyc file location
-+ IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+ # To get the right version for suffix
-+ STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+ ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+ ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-+
-+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+
-+ SET(_message "Byte-compiling ${_bin_py}")
-+
-+ GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-+ 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 ${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 copy ${_absfilename} ${_bin_py}
-+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+ DEPENDS ${_absfilename}
-+ )
-+ ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+
-+ IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-+ ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
-- ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+ ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-
-+ ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
- ENDMACRO(PYTHON_INSTALL)
diff --git a/debian/patches/series b/debian/patches/series
index 18d67be..0395be1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,4 +21,3 @@ findpythonlibrary_layout_deb_on_debian.diff
ktar_header_checksum_fix.diff
ktar_longlink_length_in_bytes.diff
glibc_filesystem.diff
-python3-support-bytecode.patch
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list