[Python-modules-commits] r15673 - in packages/shiboken/trunk/debian/patches (2 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Mon Feb 14 15:27:50 UTC 2011
Date: Monday, February 14, 2011 @ 15:27:32
Author: odyx-guest
Revision: 15673
Remove the allowMultipleShibokenVersions patch; somehow incorporated upstream.
Deleted:
packages/shiboken/trunk/debian/patches/allowMultipleShibokenVersions.patch
packages/shiboken/trunk/debian/patches/series
Deleted: packages/shiboken/trunk/debian/patches/allowMultipleShibokenVersions.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/allowMultipleShibokenVersions.patch 2011-02-14 15:27:07 UTC (rev 15672)
+++ packages/shiboken/trunk/debian/patches/allowMultipleShibokenVersions.patch 2011-02-14 15:27:32 UTC (rev 15673)
@@ -1,44 +0,0 @@
-Description: Allow to specify the postfix when looking for shiboken.
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: not needed (distribution specific)
-Last-Update: 2010-11-30
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -4,8 +4,10 @@
- set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_RELEASE_POSTFIX})
- endif()
-
--configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
-+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig-indep.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" @ONLY)
-+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
-+ "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig at LIBRARY_OUTPUT_SUFFIX@.cmake" @ONLY)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfigVersion.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.cmake" @ONLY)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken.pc.in"
-@@ -13,6 +15,8 @@
-
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake"
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}")
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig at LIBRARY_OUTPUT_SUFFIX@.cmake"
-+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}")
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.cmake"
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}")
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken${shiboken_SUFFIX}.pc"
---- /dev/null
-+++ b/data/ShibokenConfig-indep.cmake.in
-@@ -0,0 +1,13 @@
-+# SHIBOKEN_INCLUDE_DIR - Directories to include to use SHIBOKEN
-+# SHIBOKEN_LIBRARIES - Files to link against to use SHIBOKEN
-+# SHIBOKEN_BUILD_TYPE - Tells if Shiboken was compiled in Release or Debug mode.
-+# SHIBOKEN_PYTHON_INTERPRETER - Python interpreter (regular or debug) to be used with the bindings.
-+# SHIBOKEN_PYTHON_LIBRARIES - Python libraries (regular or debug) Shiboken is linked against.
-+
-+# Parameters:
-+# SHIBOKEN_POSTFIX - Specific postfix
-+# (e.g. -py26 for the python 2.6 specific version;
-+# -py26_d for the python 2.6 with -DPy_DEBUG specific version )
-+
-+SET(SHIBOKEN_POSTFIX @DEFAULT_SHIBOKEN_POSTFIX@ CACHE STRING "Python specific shiboken postfix (e.g. @DEFAULT_SHIBOKEN_POSTFIX@ for the default python version)")
-+INCLUDE(@LIB_INSTALL_DIR@/cmake/Shiboken- at shiboken_VERSION@/ShibokenConfig${SHIBOKEN_POSTFIX}.cmake)
Deleted: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series 2011-02-14 15:27:07 UTC (rev 15672)
+++ packages/shiboken/trunk/debian/patches/series 2011-02-14 15:27:32 UTC (rev 15673)
@@ -1 +0,0 @@
-allowMultipleShibokenVersions.patch
More information about the Python-modules-commits
mailing list