Author: malat-guest Date: 2011-04-26 09:59:21 +0000 (Tue, 26 Apr 2011) New Revision: 6618
Added: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch Modified: trunk/packages/vxl/trunk/debian/changelog trunk/packages/vxl/trunk/debian/patches/series Log: Aviod name conflict Modified: trunk/packages/vxl/trunk/debian/changelog =================================================================== --- trunk/packages/vxl/trunk/debian/changelog 2011-04-26 09:51:52 UTC (rev 6617) +++ trunk/packages/vxl/trunk/debian/changelog 2011-04-26 09:59:21 UTC (rev 6618) @@ -1,3 +1,9 @@ +vxl (1.14.0-5) unstable; urgency=low + + * Rename libs to prevent conflicts. Closes: #623511, Closes: #624174 + + -- Mathieu Malaterre <mathieu.malate...@gmail.com> Tue, 26 Apr 2011 11:56:39 +0200 + vxl (1.14.0-4) unstable; urgency=low * Add another patch for non-intel platform Added: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch =================================================================== --- trunk/packages/vxl/trunk/debian/patches/renamelibs.patch (rev 0) +++ trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2011-04-26 09:59:21 UTC (rev 6618) @@ -0,0 +1,55 @@ +Index: vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt +=================================================================== +--- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-04-26 11:54:14.000000000 +0200 ++++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-04-26 11:54:50.000000000 +0200 +@@ -44,11 +44,11 @@ + ) + AUX_SOURCE_DIRECTORY(Templates osl_sources) + +-ADD_LIBRARY(osl ${osl_sources}) +-SET_TARGET_PROPERTIES(osl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +-INSTALL_TARGETS(/lib osl) ++ADD_LIBRARY(oxl_osl ${osl_sources}) ++SET_TARGET_PROPERTIES(oxl_osl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) ++INSTALL_TARGETS(/lib oxl_osl) + INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources}) +-TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl) ++TARGET_LINK_LIBRARIES(oxl_osl vnl_algo vnl vgl vil1 vbl) + + IF (BUILD_EXAMPLES) + 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 11:55:16.000000000 +0200 ++++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-26 11:55:38.000000000 +0200 +@@ -22,9 +22,9 @@ + iowin32.c iowin32.h) + ENDIF(WIN32) + +-ADD_LIBRARY( minizip ${minizip_sources} ) +-SET_TARGET_PROPERTIES(minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +-INSTALL_TARGETS( /lib minizip ) ++ADD_LIBRARY( b3p_minizip ${minizip_sources} ) ++SET_TARGET_PROPERTIES(b3p_minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES}) ++INSTALL_TARGETS( /lib b3p_minizip ) + INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources}) + + 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 11:56:00.000000000 +0200 ++++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-04-26 11:56:22.000000000 +0200 +@@ -16,9 +16,9 @@ + + AUX_SOURCE_DIRECTORY(Templates gst_sources) + +-ADD_LIBRARY(gst ${gst_sources}) +-SET_TARGET_PROPERTIES(gst PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +-INSTALL_TARGETS(/lib gst) ++ADD_LIBRARY(gel_gst ${gst_sources}) ++SET_TARGET_PROPERTIES(gel_gst PROPERTIES ${VNL_LIBRARY_PROPERTIES}) ++INSTALL_TARGETS(/lib gel_gst) + INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources}) + +-TARGET_LINK_LIBRARIES(gst vbl) ++TARGET_LINK_LIBRARIES(gel_gst vbl) Modified: trunk/packages/vxl/trunk/debian/patches/series =================================================================== --- trunk/packages/vxl/trunk/debian/patches/series 2011-04-26 09:51:52 UTC (rev 6617) +++ trunk/packages/vxl/trunk/debian/patches/series 2011-04-26 09:59:21 UTC (rev 6618) @@ -5,3 +5,4 @@ video4linux.patch opencl_unix.patch sse2.patch +renamelibs.patch _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit