[med-svn] r7917 - trunk/packages/vxl/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-24 16:07:13 +0000 (Sat, 24 Sep 2011)
New Revision: 7917

Modified:
   trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
Log:
refresh patch. missing location

Modified: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/renamelibs.patch	2011-09-24 09:37:42 UTC (rev 7916)
+++ trunk/packages/vxl/trunk/debian/patches/renamelibs.patch	2011-09-24 16:07:13 UTC (rev 7917)
@@ -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-28 12:09:40.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt	2011-04-28 12:09:40.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -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-28 12:09:40.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt	2011-04-28 12:09:40.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -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-28 12:09:40.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt	2011-04-28 12:09:40.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -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-28 12:09:32.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt	2011-04-28 12:09:40.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/tests/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -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-28 12:09:32.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt	2011-04-28 12:09:40.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/xcv/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -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-28 12:09:40.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt	2011-04-28 12:09:40.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -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-28 12:09:40.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt	2011-04-28 12:09:40.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -36,10 +36,10 @@
        INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources})
  
@@ -107,8 +107,8 @@
        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-28 12:09:32.000000000 +0200
-+++ vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt	2011-04-28 12:09:40.000000000 +0200
+--- vxl-1.14.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -6,7 +6,7 @@
  ENDIF(BUILD_GEL)
  IF(BUILD_OXL)
@@ -120,8 +120,8 @@
  IF(BUILD_GEL)
 Index: vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/mul/mcal/CMakeLists.txt	2011-08-26 11:12:16.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt	2011-08-26 11:13:14.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/mcal/CMakeLists.txt	2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt	2011-09-24 15:35:31.000000000 +0000
 @@ -18,11 +18,11 @@
  )
  AUX_SOURCE_DIRECTORY(Templates mcal_sources)
@@ -138,3 +138,21 @@
  
  IF (BUILD_TESTING)
    SUBDIRS(tests)
+Index: vxl-1.14.0/contrib/mul/mcal/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/mul/mcal/tests/CMakeLists.txt	2011-09-24 15:36:14.000000000 +0000
++++ vxl-1.14.0/contrib/mul/mcal/tests/CMakeLists.txt	2011-09-24 16:05:59.000000000 +0000
+@@ -6,11 +6,11 @@
+   test_trivial_ca.cxx
+   test_general_ca.cxx
+   )
+-TARGET_LINK_LIBRARIES( mcal_test_all mcal vnl testlib )
++TARGET_LINK_LIBRARIES( mcal_test_all mul_mcal vnl testlib )
+ 
+ ADD_TEST( mcal_test_pca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_pca)
+ ADD_TEST( mcal_test_trivial_ca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_trivial_ca)
+ ADD_TEST( mcal_test_general_ca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_general_ca)
+ 
+ ADD_EXECUTABLE( mcal_test_include test_include.cxx )
+-TARGET_LINK_LIBRARIES( mcal_test_include mcal )
++TARGET_LINK_LIBRARIES( mcal_test_include mul_mcal )