r10220 - in packages/trunk/plee-the-bear/debian: . patches
Julien Jorge
j-jorge-guest at alioth.debian.org
Wed Aug 26 22:28:07 UTC 2009
Author: j-jorge-guest
Date: 2009-08-26 22:28:06 +0000 (Wed, 26 Aug 2009)
New Revision: 10220
Added:
packages/trunk/plee-the-bear/debian/patches/rpath-game.diff
Modified:
packages/trunk/plee-the-bear/debian/changelog
packages/trunk/plee-the-bear/debian/patches/rpath-editors.diff
packages/trunk/plee-the-bear/debian/patches/series
packages/trunk/plee-the-bear/debian/rules
Log:
Set the correct rpath for the game (patch rpath-game.diff).
Modified: packages/trunk/plee-the-bear/debian/changelog
===================================================================
--- packages/trunk/plee-the-bear/debian/changelog 2009-08-26 21:56:24 UTC (rev 10219)
+++ packages/trunk/plee-the-bear/debian/changelog 2009-08-26 22:28:06 UTC (rev 10220)
@@ -19,6 +19,7 @@
* Add libboost-thread in the dependencies (required by version 0.4).
* Install private libraries of the editor in /usr/lib/bear-factory.
* Set the correct rpath for the editors (patch rpath-editors.diff).
+ * Set the correct rpath for the game (patch rpath-game.diff).
-- Julien Jorge <julien_jorge at yahoo.fr> Sat, 22 Aug 2009 10:59:56 +0200
Modified: packages/trunk/plee-the-bear/debian/patches/rpath-editors.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/rpath-editors.diff 2009-08-26 21:56:24 UTC (rev 10219)
+++ packages/trunk/plee-the-bear/debian/patches/rpath-editors.diff 2009-08-26 22:28:06 UTC (rev 10220)
@@ -1,7 +1,7 @@
Index: plee-the-bear-0.4/bear-factory/animation-editor/src/bf/CMakeLists.txt
===================================================================
---- plee-the-bear-0.4.orig/bear-factory/animation-editor/src/bf/CMakeLists.txt 2009-08-26 23:05:45.000000000 +0200
-+++ plee-the-bear-0.4/bear-factory/animation-editor/src/bf/CMakeLists.txt 2009-08-26 23:48:19.000000000 +0200
+--- plee-the-bear-0.4.orig/bear-factory/animation-editor/src/bf/CMakeLists.txt 2009-08-27 00:21:21.000000000 +0200
++++ plee-the-bear-0.4/bear-factory/animation-editor/src/bf/CMakeLists.txt 2009-08-27 00:21:32.000000000 +0200
@@ -19,6 +19,12 @@
ADD_EXECUTABLE( ${BF_AE_TARGET_NAME} ${BF_AE_SOURCE_FILES} )
@@ -17,8 +17,8 @@
bear-editor
Index: plee-the-bear-0.4/bear-factory/level-editor/src/bf/CMakeLists.txt
===================================================================
---- plee-the-bear-0.4.orig/bear-factory/level-editor/src/bf/CMakeLists.txt 2009-08-26 23:05:45.000000000 +0200
-+++ plee-the-bear-0.4/bear-factory/level-editor/src/bf/CMakeLists.txt 2009-08-26 23:48:34.000000000 +0200
+--- plee-the-bear-0.4.orig/bear-factory/level-editor/src/bf/CMakeLists.txt 2009-08-27 00:21:21.000000000 +0200
++++ plee-the-bear-0.4/bear-factory/level-editor/src/bf/CMakeLists.txt 2009-08-27 00:21:32.000000000 +0200
@@ -69,6 +69,12 @@
ADD_EXECUTABLE( ${BF_LE_TARGET_NAME} ${BF_LE_SOURCE_FILES} )
@@ -34,8 +34,8 @@
bear-editor
Index: plee-the-bear-0.4/bear-factory/model-editor/src/bf/CMakeLists.txt
===================================================================
---- plee-the-bear-0.4.orig/bear-factory/model-editor/src/bf/CMakeLists.txt 2009-08-26 23:05:45.000000000 +0200
-+++ plee-the-bear-0.4/bear-factory/model-editor/src/bf/CMakeLists.txt 2009-08-26 23:48:07.000000000 +0200
+--- plee-the-bear-0.4.orig/bear-factory/model-editor/src/bf/CMakeLists.txt 2009-08-27 00:21:21.000000000 +0200
++++ plee-the-bear-0.4/bear-factory/model-editor/src/bf/CMakeLists.txt 2009-08-27 00:21:32.000000000 +0200
@@ -66,6 +66,12 @@
ADD_EXECUTABLE( ${BF_ME_TARGET_NAME} ${BF_ME_SOURCE_FILES} )
@@ -49,3 +49,20 @@
TARGET_LINK_LIBRARIES(
${BF_ME_TARGET_NAME}
bear-editor
+Index: plee-the-bear-0.4/bear-factory/bear-editor/src/bf/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-factory/bear-editor/src/bf/CMakeLists.txt 2009-08-27 00:21:21.000000000 +0200
++++ plee-the-bear-0.4/bear-factory/bear-editor/src/bf/CMakeLists.txt 2009-08-27 00:22:35.000000000 +0200
+@@ -81,6 +81,12 @@
+ ADD_LIBRARY( ${BF_E_TARGET_NAME} SHARED ${BF_E_SOURCE_FILES} )
+ ENDIF( WIN32 )
+
++SET_TARGET_PROPERTIES(
++ ${BF_E_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_FACTORY_INSTALL_LIBRARY_DIR}"
++ )
++
+ TARGET_LINK_LIBRARIES(
+ ${BF_E_TARGET_NAME}
+ ${wxWidgets_LIBRARIES}
Added: packages/trunk/plee-the-bear/debian/patches/rpath-game.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/rpath-game.diff (rev 0)
+++ packages/trunk/plee-the-bear/debian/patches/rpath-game.diff 2009-08-26 22:28:06 UTC (rev 10220)
@@ -0,0 +1,220 @@
+Index: plee-the-bear-0.4/bear-engine/core/src/audio/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/audio/CMakeLists.txt 2009-08-26 23:58:47.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/audio/CMakeLists.txt 2009-08-27 00:01:58.000000000 +0200
+@@ -18,6 +18,12 @@
+ ${AUDIO_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${AUDIO_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${AUDIO_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+Index: plee-the-bear-0.4/bear-engine/core/src/communication/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/communication/CMakeLists.txt 2009-08-26 23:58:47.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/communication/CMakeLists.txt 2009-08-27 00:02:18.000000000 +0200
+@@ -13,6 +13,12 @@
+ ${COMMUNICATION_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${COMMUNICATION_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${COMMUNICATION_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+Index: plee-the-bear-0.4/bear-engine/core/src/debug/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/debug/CMakeLists.txt 2009-08-26 23:58:48.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/debug/CMakeLists.txt 2009-08-27 00:02:34.000000000 +0200
+@@ -11,6 +11,12 @@
+ ${DEBUG_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${DEBUG_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${DEBUG_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+Index: plee-the-bear-0.4/bear-engine/core/src/engine/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/engine/CMakeLists.txt 2009-08-26 23:58:48.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/engine/CMakeLists.txt 2009-08-27 00:00:30.000000000 +0200
+@@ -63,6 +63,12 @@
+ ${ENGINE_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${ENGINE_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${ENGINE_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR} )
+Index: plee-the-bear-0.4/bear-engine/core/src/gui/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/gui/CMakeLists.txt 2009-08-26 23:58:48.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/gui/CMakeLists.txt 2009-08-27 00:00:40.000000000 +0200
+@@ -19,6 +19,12 @@
+ ${GUI_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${GUI_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${GUI_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+@@ -28,4 +34,4 @@
+ ${GUI_TARGET_NAME}
+ bear_input
+ bear_visual
+-)
+\ No newline at end of file
++)
+Index: plee-the-bear-0.4/bear-engine/core/src/input/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/input/CMakeLists.txt 2009-08-26 23:58:48.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/input/CMakeLists.txt 2009-08-27 00:00:52.000000000 +0200
+@@ -22,6 +22,12 @@
+ ${INPUT_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${INPUT_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${INPUT_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+Index: plee-the-bear-0.4/bear-engine/core/src/time/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/time/CMakeLists.txt 2009-08-26 23:58:48.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/time/CMakeLists.txt 2009-08-27 00:01:05.000000000 +0200
+@@ -11,6 +11,12 @@
+ ${TIME_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${TIME_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${TIME_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+Index: plee-the-bear-0.4/bear-engine/core/src/universe/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/universe/CMakeLists.txt 2009-08-26 23:58:14.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/universe/CMakeLists.txt 2009-08-27 00:01:25.000000000 +0200
+@@ -48,12 +48,13 @@
+ ${UNIVERSE_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${UNIVERSe_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${UNIVERSE_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+ )
+-
+-TARGET_LINK_LIBRARIES(
+- ${UNIVERSE_TARGET_NAME}
+- ${CLAW_LOGGER_LIBRARIES}
+- )
+Index: plee-the-bear-0.4/bear-engine/core/src/visual/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/core/src/visual/CMakeLists.txt 2009-08-26 23:58:48.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/core/src/visual/CMakeLists.txt 2009-08-27 00:01:38.000000000 +0200
+@@ -31,6 +31,12 @@
+ ${VISUAL_SOURCE_FILES}
+ )
+
++SET_TARGET_PROPERTIES(
++ ${VISUAL_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${VISUAL_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+Index: plee-the-bear-0.4/bear-engine/running_bear/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/running_bear/CMakeLists.txt 2009-08-27 00:03:43.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/running_bear/CMakeLists.txt 2009-08-27 00:04:08.000000000 +0200
+@@ -12,6 +12,13 @@
+ )
+
+ ADD_EXECUTABLE( ${RUNNING_BEAR_TARGET_NAME} ${RUNNING_BEAR_SOURCE_FILES} )
++
++SET_TARGET_PROPERTIES(
++ ${RUNNING_BEAR_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${RUNNING_BEAR_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_EXECUTABLE_DIR}
+Index: plee-the-bear-0.4/bear-engine/lib/src/generic_items/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/bear-engine/lib/src/generic_items/CMakeLists.txt 2009-08-27 00:04:39.000000000 +0200
++++ plee-the-bear-0.4/bear-engine/lib/src/generic_items/CMakeLists.txt 2009-08-27 00:05:06.000000000 +0200
+@@ -70,6 +70,13 @@
+ )
+
+ ADD_LIBRARY( ${GENERIC_ITEM_TARGET_NAME} SHARED ${GENERIC_ITEM_SOURCE_FILES} )
++
++SET_TARGET_PROPERTIES(
++ ${GENERIC_ITEM_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${GENERIC_ITEM_TARGET_NAME}
+ DESTINATION ${BEAR_ENGINE_INSTALL_LIBRARY_DIR}
+Index: plee-the-bear-0.4/plee-the-bear/src/ptb/CMakeLists.txt
+===================================================================
+--- plee-the-bear-0.4.orig/plee-the-bear/src/ptb/CMakeLists.txt 2009-08-27 00:05:40.000000000 +0200
++++ plee-the-bear-0.4/plee-the-bear/src/ptb/CMakeLists.txt 2009-08-27 00:06:13.000000000 +0200
+@@ -145,6 +145,13 @@
+ )
+
+ ADD_LIBRARY( ${LIBPTB_TARGET_NAME} MODULE ${LIBPTB_SOURCE_FILES} )
++
++SET_TARGET_PROPERTIES(
++ ${LIBPTB_TARGET_NAME}
++ PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PTB_INSTALL_CUSTOM_LIBRARY_DIR}"
++ )
++
+ INSTALL(
+ TARGETS ${LIBPTB_TARGET_NAME}
+ DESTINATION ${PTB_INSTALL_CUSTOM_LIBRARY_DIR}
Modified: packages/trunk/plee-the-bear/debian/patches/series
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/series 2009-08-26 21:56:24 UTC (rev 10219)
+++ packages/trunk/plee-the-bear/debian/patches/series 2009-08-26 22:28:06 UTC (rev 10220)
@@ -1,2 +1,3 @@
rpath-editors.diff
clear-selection-checks-layer.diff
+rpath-game.diff
Modified: packages/trunk/plee-the-bear/debian/rules
===================================================================
--- packages/trunk/plee-the-bear/debian/rules 2009-08-26 21:56:24 UTC (rev 10219)
+++ packages/trunk/plee-the-bear/debian/rules 2009-08-26 22:28:06 UTC (rev 10220)
@@ -33,7 +33,6 @@
-DBEAR_FACTORY_INSTALL_LIBRARY_DIR:STRING="lib/bear-factory" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--as-needed" \
-DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,--as-needed" \
- -DCMAKE_INSTALL_RPATH:STRING="/usr/lib/games/plee-the-bear" \
-DPTB_INSTALL_DATA_DIR:STRING="share/games/plee-the-bear" \
-DPTB_INSTALL_CUSTOM_LIBRARY_DIR:STRING="lib/games/plee-the-bear" \
-DPTB_INSTALL_EXECUTABLE_DIR:STRING="games"
More information about the Pkg-games-commits
mailing list