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

Mathieu Malaterre malat at alioth.debian.org
Wed Jun 6 10:27:41 UTC 2012 

Author: malat
Date: 2012-06-06 10:27:41 +0000 (Wed, 06 Jun 2012)
New Revision: 11227

Added:
   trunk/packages/vxl/trunk/debian/patches/bits.patch
Modified:
   trunk/packages/vxl/trunk/debian/patches/fixosl.patch
   trunk/packages/vxl/trunk/debian/patches/series
Log:
update patches

Added: trunk/packages/vxl/trunk/debian/patches/bits.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/bits.patch	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/bits.patch	2012-06-06 10:27:41 UTC (rev 11227)
@@ -0,0 +1,74 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vxl (1.17.0-1) UNRELEASED; urgency=low
+ .
+   * New upstream
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
++++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+@@ -36,10 +36,10 @@ IF(EXPAT_FOUND)
+       INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources})
+ 
+       TARGET_LINK_LIBRARIES(bmdl_pro bmdl bprb vil vil_io vpgl_file_formats vgl_io
+-                            vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
++                            vsol brip vpgl_pro vgl vul vpl imesh_algo b3p_minizip)
+ 
+       IF(ZLIB_FOUND)
+-         TARGET_LINK_LIBRARIES( bmdl_pro minizip )
++         TARGET_LINK_LIBRARIES( bmdl_pro b3p_minizip )
+       ENDIF(ZLIB_FOUND)
+ 
+       IF( BUILD_TESTING )
+--- vxl-1.17.0.orig/contrib/oxl/osl/tests/CMakeLists.txt
++++ vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ ADD_EXECUTABLE( osl_test_include test_include.cxx )
+-TARGET_LINK_LIBRARIES( osl_test_include osl )
++TARGET_LINK_LIBRARIES( osl_test_include oxl_osl )
+ ADD_EXECUTABLE( osl_test_template_include test_template_include.cxx )
+-TARGET_LINK_LIBRARIES( osl_test_template_include osl )
++TARGET_LINK_LIBRARIES( osl_test_template_include oxl_osl )
+--- vxl-1.17.0.orig/contrib/mul/msm/CMakeLists.txt
++++ vxl-1.17.0/contrib/mul/msm/CMakeLists.txt
+@@ -38,7 +38,7 @@ SET(msm_sources
+ 
+ AUX_SOURCE_DIRECTORY(Templates msm_sources)
+ ADD_LIBRARY(msm ${msm_sources} )
+-TARGET_LINK_LIBRARIES(msm mcal vimt vnl_algo vnl_io vnl vgl vul vsl)
++TARGET_LINK_LIBRARIES(msm mul_mcal vimt vnl_algo vnl_io vnl vgl vul vsl)
+ 
+ SUBDIRS(utils)
+ SUBDIRS(tools)
+--- vxl-1.17.0.orig/contrib/mul/mcal/CMakeLists.txt
++++ vxl-1.17.0/contrib/mul/mcal/CMakeLists.txt
+@@ -20,8 +20,9 @@ SET(mcal_sources
+ )
+ AUX_SOURCE_DIRECTORY(Templates mcal_sources)
+ 
+-ADD_LIBRARY(mcal ${mcal_sources})
+-TARGET_LINK_LIBRARIES(mcal mbl vnl vnl_algo vnl_io vul)
++ADD_LIBRARY(mul_mcal ${mcal_sources})
++TARGET_LINK_LIBRARIES(mul_mcal mbl vnl vnl_algo vnl_io vul)
++INSTALL_TARGETS(/lib mul_mcal)
+ 
+ IF (BUILD_TESTING)
+   SUBDIRS(tests)

Modified: trunk/packages/vxl/trunk/debian/patches/fixosl.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fixosl.patch	2012-06-06 07:42:37 UTC (rev 11226)
+++ trunk/packages/vxl/trunk/debian/patches/fixosl.patch	2012-06-06 10:27:41 UTC (rev 11227)
@@ -1,18 +1,7 @@
-Index: vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt
-===================================================================
---- vxl-1.17.0.orig/contrib/oxl/osl/tests/CMakeLists.txt	2012-06-06 07:39:19.000000000 +0000
-+++ vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt	2012-06-06 07:39:56.828090871 +0000
-@@ -1,4 +1,4 @@
- ADD_EXECUTABLE( osl_test_include test_include.cxx )
--TARGET_LINK_LIBRARIES( osl_test_include osl )
-+TARGET_LINK_LIBRARIES( osl_test_include oxl_osl )
- ADD_EXECUTABLE( osl_test_template_include test_template_include.cxx )
--TARGET_LINK_LIBRARIES( osl_test_template_include osl )
-+TARGET_LINK_LIBRARIES( osl_test_template_include oxl_osl )
 Index: vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt
 ===================================================================
---- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt	2012-06-06 07:39:19.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt	2012-06-06 07:39:56.828090871 +0000
+--- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt	2012-06-06 07:44:51.000000000 +0000
++++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt	2012-06-06 07:44:58.308086711 +0000
 @@ -42,7 +42,7 @@
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources})
  
@@ -24,8 +13,8 @@
  IF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
 Index: vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt
 ===================================================================
---- vxl-1.17.0.orig/contrib/mul/mcal/tests/CMakeLists.txt	2012-06-06 07:39:19.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt	2012-06-06 07:39:56.828090871 +0000
+--- vxl-1.17.0.orig/contrib/mul/mcal/tests/CMakeLists.txt	2012-06-06 07:44:53.000000000 +0000
++++ vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt	2012-06-06 07:44:58.308086711 +0000
 @@ -6,11 +6,11 @@
    test_trivial_ca.cxx
    test_general_ca.cxx
@@ -40,44 +29,16 @@
  ADD_EXECUTABLE( mcal_test_include test_include.cxx )
 -TARGET_LINK_LIBRARIES( mcal_test_include mul_mcal )
 +TARGET_LINK_LIBRARIES( mcal_test_include mul_mcal vnl_algo)
-Index: vxl-1.17.0/contrib/mul/mcal/CMakeLists.txt
-===================================================================
---- vxl-1.17.0.orig/contrib/mul/mcal/CMakeLists.txt	2012-06-06 07:39:19.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mcal/CMakeLists.txt	2012-06-06 07:39:56.828090871 +0000
-@@ -20,8 +20,9 @@
- )
- AUX_SOURCE_DIRECTORY(Templates mcal_sources)
- 
--ADD_LIBRARY(mcal ${mcal_sources})
--TARGET_LINK_LIBRARIES(mcal mbl vnl vnl_algo vnl_io vul)
-+ADD_LIBRARY(mul_mcal ${mcal_sources})
-+TARGET_LINK_LIBRARIES(mul_mcal mbl vnl vnl_algo vnl_io vul)
-+INSTALL_TARGETS(/lib mul_mcal)
- 
- IF (BUILD_TESTING)
-   SUBDIRS(tests)
-Index: vxl-1.17.0/contrib/mul/msm/CMakeLists.txt
-===================================================================
---- vxl-1.17.0.orig/contrib/mul/msm/CMakeLists.txt	2012-06-06 07:39:19.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/msm/CMakeLists.txt	2012-06-06 07:39:56.828090871 +0000
-@@ -38,7 +38,7 @@
- 
- AUX_SOURCE_DIRECTORY(Templates msm_sources)
- ADD_LIBRARY(msm ${msm_sources} )
--TARGET_LINK_LIBRARIES(msm mcal vimt vnl_algo vnl_io vnl vgl vul vsl)
-+TARGET_LINK_LIBRARIES(msm mul_mcal vimt vnl_algo vnl_io vnl vgl vul vsl)
- 
- SUBDIRS(utils)
- SUBDIRS(tools)
 Index: vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx
 ===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/baio/baio_unix.cxx	2012-06-06 07:30:15.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx	2012-06-06 07:40:09.184090704 +0000
-@@ -13,7 +13,6 @@
+--- vxl-1.17.0.orig/contrib/brl/bbas/baio/baio_unix.cxx	2010-11-22 16:11:21.000000000 +0000
++++ vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx	2012-06-06 07:46:51.784085147 +0000
+@@ -11,7 +11,7 @@
+ #include <aio.h>     //for aio_read
+ //#include <fcntl.h>   // for open (not really necessary
  #include <strings.h> //includes bzero
- #include <unistd.h> // close()
- 
 -
++#include <unistd.h> //close
+ 
  //: baio_info struct: wrapper for status variables
  struct baio_info {
-   aiocb my_aiocb;

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2012-06-06 07:42:37 UTC (rev 11226)
+++ trunk/packages/vxl/trunk/debian/patches/series	2012-06-06 10:27:41 UTC (rev 11227)
@@ -5,3 +5,5 @@
 install_doxygen.patch
 ffmpeg_C99.patch
 fixosl.patch
+insane.patch
+bits.patch

More information about the debian-med-commit mailing list