r7155 - in packages/trunk/libclaw/debian: . patches

[Julien Jorge]

Author: j-jorge-guest
Date: 2008-05-22 17:12:51 +0000 (Thu, 22 May 2008)
New Revision: 7155

Added:
   packages/trunk/libclaw/debian/patches/fix-link-warnings.diff
Modified:
   packages/trunk/libclaw/debian/libclaw-doc.install
   packages/trunk/libclaw/debian/patches/series
Log:
- Fix some link warnings.
- Add missing files in the installation of the documentation.

Modified: packages/trunk/libclaw/debian/libclaw-doc.install
===================================================================
--- packages/trunk/libclaw/debian/libclaw-doc.install	2008-05-22 16:23:59 UTC (rev 7154)
+++ packages/trunk/libclaw/debian/libclaw-doc.install	2008-05-22 17:12:51 UTC (rev 7155)
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/doc/libclaw1/html/*.html usr/share/doc/libclaw1/html
+debian/tmp/usr/share/doc/libclaw1/html usr/share/doc/libclaw1
 examples usr/share/doc/libclaw1/
 

Added: packages/trunk/libclaw/debian/patches/fix-link-warnings.diff
===================================================================
--- packages/trunk/libclaw/debian/patches/fix-link-warnings.diff	                        (rev 0)
+++ packages/trunk/libclaw/debian/patches/fix-link-warnings.diff	2008-05-22 17:12:51 UTC (rev 7155)
@@ -0,0 +1,31 @@
+Index: libclaw-1.5.2b/CMakeLists.txt
+===================================================================
+--- libclaw-1.5.2b.orig/CMakeLists.txt	2008-05-22 19:01:25.000000000 +0200
++++ libclaw-1.5.2b/CMakeLists.txt	2008-05-22 19:01:42.000000000 +0200
+@@ -1,7 +1,5 @@
+ cmake_minimum_required(VERSION 2.4)
+ 
+-cmake_minimum_required(VERSION 2.4)
+-
+ PROJECT(claw)
+ 
+ INCLUDE_DIRECTORIES(.)
+@@ -88,6 +86,7 @@
+   claw_dynamic_library-static
+   STATIC ${CLAW_DYNAMIC_LIBRARY_SOURCES}
+ )
++TARGET_LINK_LIBRARIES( claw_dynamic_library ${CMAKE_DL_LIBS} )
+ 
+ # log system
+ SET( CLAW_LOGGER_SOURCES
+@@ -159,7 +158,9 @@
+ TARGET_LINK_LIBRARIES(claw_graphic ${CLAW_GRAPHIC_LIBRARIES})
+ 
+ # extra flags for the link
+-SET_TARGET_PROPERTIES( ${CLAW_LIBRARIES} PROPERTIES LINK_FLAGS -s )
++SET_TARGET_PROPERTIES(
++ ${CLAW_LIBRARIES}
++ PROPERTIES LINK_FLAGS "-s -Wl,--as-needed" )
+ 
+ # all libraries
+ SET( CLAW_ALL_LIBRARIES ${CLAW_LIBRARIES} ${CLAW_GRAPHIC_LIBRARIES})

Modified: packages/trunk/libclaw/debian/patches/series
===================================================================
--- packages/trunk/libclaw/debian/patches/series	2008-05-22 16:23:59 UTC (rev 7154)
+++ packages/trunk/libclaw/debian/patches/series	2008-05-22 17:12:51 UTC (rev 7155)
@@ -2,3 +2,4 @@
 add-html-doc.diff
 fix-g++-4.3.diff
 cmake-version.diff
+fix-link-warnings.diff