r10219 - in packages/trunk/plee-the-bear/debian: . patches

Wed Aug 26 21:56:24 UTC 2009

Author: j-jorge-guest
Date: 2009-08-26 21:56:24 +0000 (Wed, 26 Aug 2009)
New Revision: 10219

Added:
   packages/trunk/plee-the-bear/debian/patches/rpath-editors.diff
Modified:
   packages/trunk/plee-the-bear/debian/bear-factory.install
   packages/trunk/plee-the-bear/debian/changelog
   packages/trunk/plee-the-bear/debian/patches/series
   packages/trunk/plee-the-bear/debian/rules
Log:
- Install private libraries of the editor in /usr/lib/bear-factory.
- Set the correct rpath for the editors (patch rpath-editors.diff).
- Don't call dh_makeshlibs



Modified: packages/trunk/plee-the-bear/debian/bear-factory.install
===================================================================

--- packages/trunk/plee-the-bear/debian/bear-factory.install	2009-08-26 19:33:31 UTC (rev 10218)
+++ packages/trunk/plee-the-bear/debian/bear-factory.install	2009-08-26 21:56:24 UTC (rev 10219)
@@ -1,5 +1,5 @@
 debian/tmp/usr/bin/bf-* usr/bin/
-debian/tmp/usr/lib/libbear-editor.so usr/lib
+debian/tmp/usr/lib/bear-factory/libbear-editor.so usr/lib/bear-factory
 debian/tmp/usr/share/bear-factory usr/share/
 debian/tmp/usr/share/man/man1 usr/share/man
 debian/tmp/usr/share/locale/fr_FR/LC_MESSAGES/bear-factory.mo usr/share/locale/fr_FR/LC_MESSAGES/bear-factory.mo

Modified: packages/trunk/plee-the-bear/debian/changelog
===================================================================
--- packages/trunk/plee-the-bear/debian/changelog	2009-08-26 19:33:31 UTC (rev 10218)
+++ packages/trunk/plee-the-bear/debian/changelog	2009-08-26 21:56:24 UTC (rev 10219)
@@ -17,6 +17,8 @@
     (patch clear-selection-checks-layer.diff).
   * Add a -DNDEBUG on the compile line.
   * 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).
 
  -- Julien Jorge <julien_jorge at yahoo.fr>  Sat, 22 Aug 2009 10:59:56 +0200
 

Added: packages/trunk/plee-the-bear/debian/patches/rpath-editors.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/rpath-editors.diff	                        (rev 0)
+++ packages/trunk/plee-the-bear/debian/patches/rpath-editors.diff	2009-08-26 21:56:24 UTC (rev 10219)
@@ -0,0 +1,51 @@
+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
+@@ -19,6 +19,12 @@
+ 
+ ADD_EXECUTABLE( ${BF_AE_TARGET_NAME} ${BF_AE_SOURCE_FILES} )
+ 
++SET_TARGET_PROPERTIES(
++  ${BF_AE_TARGET_NAME}
++  PROPERTIES
++  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_FACTORY_INSTALL_LIBRARY_DIR}"
++  )
++
+ TARGET_LINK_LIBRARIES(
+   ${BF_AE_TARGET_NAME}
+   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
+@@ -69,6 +69,12 @@
+ 
+ ADD_EXECUTABLE( ${BF_LE_TARGET_NAME} ${BF_LE_SOURCE_FILES} )
+ 
++SET_TARGET_PROPERTIES(
++  ${BF_LE_TARGET_NAME}
++  PROPERTIES
++  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_FACTORY_INSTALL_LIBRARY_DIR}"
++  )
++
+ TARGET_LINK_LIBRARIES(
+   ${BF_LE_TARGET_NAME}
+   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
+@@ -66,6 +66,12 @@
+ 
+ ADD_EXECUTABLE( ${BF_ME_TARGET_NAME} ${BF_ME_SOURCE_FILES} )
+ 
++SET_TARGET_PROPERTIES(
++  ${BF_ME_TARGET_NAME}
++  PROPERTIES
++  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${BEAR_FACTORY_INSTALL_LIBRARY_DIR}"
++  )
++
+ TARGET_LINK_LIBRARIES(
+   ${BF_ME_TARGET_NAME}
+   bear-editor

Modified: packages/trunk/plee-the-bear/debian/patches/series
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/series	2009-08-26 19:33:31 UTC (rev 10218)
+++ packages/trunk/plee-the-bear/debian/patches/series	2009-08-26 21:56:24 UTC (rev 10219)
@@ -1 +1,2 @@
+rpath-editors.diff
 clear-selection-checks-layer.diff

Modified: packages/trunk/plee-the-bear/debian/rules
===================================================================
--- packages/trunk/plee-the-bear/debian/rules	2009-08-26 19:33:31 UTC (rev 10218)
+++ packages/trunk/plee-the-bear/debian/rules	2009-08-26 21:56:24 UTC (rev 10219)
@@ -28,14 +28,14 @@
 	cd $(BUILD_TREE); cmake .. \
 		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
 		-DCMAKE_C_FLAGS:STRING="$(CFLAGS) -DNDEBUG" \
-		-DBUILD_STATIC:BOOL=ON \
 		-DBEAR_ENGINE_INSTALL_LIBRARY_DIR:STRING="lib/games/plee-the-bear" \
-		-DPTB_INSTALL_CUSTOM_LIBRARY_DIR:STRING="lib/games/plee-the-bear" \
 		-DBEAR_ENGINE_INSTALL_EXECUTABLE_DIR:STRING="games" \
+		-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"
 	ln -s ../plee-the-bear/desktop/menu/plee-the-bear debian/plee-the-bear.menu
 	ln -s ../bear-factory/desktop/menu/bf-animation-editor debian/bf-animation-editor.menu
@@ -101,7 +101,6 @@
 	dh_strip -a
 	dh_compress  -a
 	dh_fixperms -a
-	dh_makeshlibs -a
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a


