[med-svn] r6647 - in trunk/packages/vxl/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-26 15:48:19 +0000 (Tue, 26 Apr 2011)
New Revision: 6647

Modified:
   trunk/packages/vxl/trunk/debian/README.source
   trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
Log:
Add doc

Modified: trunk/packages/vxl/trunk/debian/README.source
===================================================================
--- trunk/packages/vxl/trunk/debian/README.source	2011-04-26 15:03:35 UTC (rev 6646)
+++ trunk/packages/vxl/trunk/debian/README.source	2011-04-26 15:48:19 UTC (rev 6647)
@@ -1,2 +1,10 @@
 This packages uses a patch system. Please read
 /usr/share/doc/quilt/README.source for more informations.
+
+To prevent conflicts with other libraries, common library name have been renamed.
+
+In particular:
+
+libosl.so became liboxl_osl.so (provided by libosl-dev)
+libminizip.so becamse libb3p_minizip.so (provided by libkml-dev)
+libgst.so became liboxl_gst.so (provided by libgst-dev)

Modified: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/renamelibs.patch	2011-04-26 15:03:35 UTC (rev 6646)
+++ trunk/packages/vxl/trunk/debian/patches/renamelibs.patch	2011-04-26 15:48:19 UTC (rev 6647)
@@ -1,7 +1,7 @@
 Index: vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt	2011-04-26 15:41:46.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt	2011-04-26 15:41:48.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
 @@ -44,11 +44,11 @@
  )
  AUX_SOURCE_DIRECTORY(Templates osl_sources)
@@ -20,8 +20,8 @@
    SUBDIRS(examples)
 Index: vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt	2011-04-26 15:41:46.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt	2011-04-26 15:41:48.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
++++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
 @@ -22,9 +22,9 @@
         iowin32.c    iowin32.h)
  ENDIF(WIN32)
@@ -37,8 +37,8 @@
  ENDIF(ZLIB_FOUND)
 Index: vxl-1.14.0/contrib/gel/gst/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt	2011-04-26 15:41:46.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt	2011-04-26 15:41:48.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
++++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
 @@ -16,9 +16,9 @@
  
  AUX_SOURCE_DIRECTORY(Templates gst_sources)
@@ -55,8 +55,8 @@
 +TARGET_LINK_LIBRARIES(gel_gst vbl)
 Index: vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/oxl/osl/tests/CMakeLists.txt	2011-04-26 15:41:46.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt	2011-04-26 15:41:48.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/tests/CMakeLists.txt	2011-04-26 16:12:54.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
 @@ -1,4 +1,4 @@
  # Nothing to be tested yet
  
@@ -65,8 +65,8 @@
 +TARGET_LINK_LIBRARIES( osl_test_include oxl_osl )
 Index: vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/oxl/xcv/CMakeLists.txt	2011-04-26 15:41:46.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt	2011-04-26 15:41:48.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/xcv/CMakeLists.txt	2011-04-26 16:12:54.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
 @@ -32,6 +32,6 @@
  
  ADD_EXECUTABLE(xcv ${xcv_sources})
@@ -77,8 +77,8 @@
  ENDIF (HAS_VGUI)
 Index: vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt	2011-04-26 15:41:46.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt	2011-04-26 15:41:48.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
++++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
 @@ -41,7 +41,7 @@
  
  IF(BUILD_OXL)
@@ -90,8 +90,8 @@
  IF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
 Index: vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt	2011-04-26 15:41:55.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt	2011-04-26 15:42:31.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt	2011-04-26 16:13:01.000000000 +0200
 @@ -36,10 +36,10 @@
        INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources})
  
@@ -105,3 +105,16 @@
        ENDIF(ZLIB_FOUND)
  
        IF( BUILD_TESTING )
+Index: vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt	2011-04-26 17:04:17.000000000 +0200
++++ vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt	2011-04-26 17:04:28.000000000 +0200
+@@ -6,7 +6,7 @@
+ ENDIF(BUILD_GEL)
+ IF(BUILD_OXL)
+   INCLUDE_DIRECTORIES(${OXL_INCLUDE_DIR})
+-  LINK_LIBRARIES( osl )
++  LINK_LIBRARIES( oxl_osl )
+ ENDIF(BUILD_OXL)
+ 
+ IF(BUILD_GEL)