[med-svn] r2660 - trunk/packages/insighttoolkit/trunk/debian/patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-12 05:17:57 +0000 (Wed, 12 Nov 2008)
New Revision: 2660

Removed:
   trunk/packages/insighttoolkit/trunk/debian/patches/nifti-versioning.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Remove patch; applied upstream in version 3.10.0

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/nifti-versioning.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/nifti-versioning.patch	2008-11-11 22:37:34 UTC (rev 2659)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/nifti-versioning.patch	2008-11-12 05:17:57 UTC (rev 2660)
@@ -1,110 +0,0 @@
-This patch ensures that all NIFTI shared libraries are built using
-following the ITK versioning, if built under ITK.  Otherwise, they
-follow the NIFTI versioning.
-
-Reported in ITK tracker as http://www.gccxml.org/Bug/view.php?id=7530
-
---- insighttoolkit-3.8.0.orig/Utilities/nifti/CMakeLists.txt
-+++ insighttoolkit-3.8.0/Utilities/nifti/CMakeLists.txt
-@@ -7,14 +7,6 @@
- SUBDIRS(znzlib niftilib)
- ADD_DEFINITIONS(-DHAVE_ZLIB)
- 
--# Set default shared library version
--# This library version will be applied to all libraries in the package
--# unless it is not explicitely for a certain lib.
--IF (NOT DEFINED NIFTI_SHAREDLIB_VERSION)
--  SET ( NIFTI_SHAREDLIB_VERSION 1.0.0 )
--  STRING( REGEX MATCH "^[0-9]+" NIFTI_SHAREDLIB_SOVERSION ${NIFTI_SHAREDLIB_VERSION})
--ENDIF (NOT DEFINED NIFTI_SHAREDLIB_VERSION)
--
- # add option to build shared libraries. The default is OFF to maintain the
- # current build behavior
- OPTION ( BUILD_SHARED_LIBS "Toggle building shared libraries")
-@@ -30,6 +22,7 @@
-   ADD_DEFINITIONS(-DHAVE_ZLIB)
-   ADD_DEFINITIONS(-DITKZLIB)
-   SET(PACKAGE_PREFIX "ITK")
-+  SET(NIFTI_LIBRARY_PROPERTIES ${ITK_LIBRARY_PROPERTIES})
-   SET(NIFTI_INSTALL_BIN_DIR "${ITK_INSTALL_BIN_DIR_CM24}")
-   SET(NIFTI_INSTALL_LIB_DIR "${ITK_INSTALL_LIB_DIR_CM24}")
-   SET(NIFTI_INSTALL_INCLUDE_DIR "${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities")
-@@ -81,6 +74,18 @@
- 
- ENDIF("${ITK_VERSION_MAJOR}" GREATER 0.0)
- 
-+# Set default shared library version, unless set above.
-+# This library version will be applied to all libraries in the package
-+# unless it is not explicitly for a certain lib.
-+IF (NOT DEFINED NIFTI_LIBRARY_PROPERTIES)
-+  SET ( NIFTI_SHAREDLIB_VERSION 1.0.0 )
-+  STRING( REGEX MATCH "^[0-9]+" NIFTI_SHAREDLIB_SOVERSION ${NIFTI_SHAREDLIB_VERSION})
-+  SET(NIFTI_LIBRARY_PROPERTIES
-+      VERSION   ${NIFTI_SHAREDLIB_VERSION}
-+      SOVERSION ${NIFTI_SHAREDLIB_SOVERSION}
-+     )
-+ENDIF (NOT DEFINED NIFTI_LIBRARY_PROPERTIES)
-+
- IF(NOT DEFINED NIFTI_INSTALL_LIB_DIR)
-   MESSAGE(FATAL_ERROR "Must set NIFTI_INSTALL_LIB_DIR.")
- ENDIF(NOT DEFINED NIFTI_INSTALL_LIB_DIR)
---- insighttoolkit-3.8.0.orig/Utilities/nifti/fsliolib/CMakeLists.txt
-+++ insighttoolkit-3.8.0/Utilities/nifti/fsliolib/CMakeLists.txt
-@@ -14,7 +14,7 @@
- 
- # Set lib version when buildung shared libs.
- IF (BUILD_SHARED_LIBS)
--  SET_TARGET_PROPERTIES(${NIFTI_FSLIOLIB_NAME} PROPERTIES SOVERSION ${NIFTI_SHAREDLIB_SOVERSION} VERSION ${NIFTI_SHAREDLIB_VERSION})
-+  SET_TARGET_PROPERTIES(${NIFTI_FSLIOLIB_NAME} PROPERTIES ${NIFTI_LIBRARY_PROPERTIES})
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF(NOT NIFTI_INSTALL_NO_LIBRARIES)
---- insighttoolkit-3.8.0.orig/Utilities/nifti/nifticdf/CMakeLists.txt
-+++ insighttoolkit-3.8.0/Utilities/nifti/nifticdf/CMakeLists.txt
-@@ -9,7 +9,7 @@
- ADD_LIBRARY(${NIFTI_CDFLIB_NAME} ${NIFTICDFLIB_SRC} )
- 
- IF (BUILD_SHARED_LIBS)
--  SET_TARGET_PROPERTIES(${NIFTI_CDFLIB_NAME} PROPERTIES SOVERSION ${NIFTI_SHAREDLIB_SOVERSION} VERSION ${NIFTI_SHAREDLIB_VERSION})
-+  SET_TARGET_PROPERTIES(${NIFTI_CDFLIB_NAME} PROPERTIES ${NIFTI_LIBRARY_PROPERTIES})
- ENDIF (BUILD_SHARED_LIBS)
- 
- 
---- insighttoolkit-3.8.0.orig/Utilities/nifti/niftilib/CMakeLists.txt
-+++ insighttoolkit-3.8.0/Utilities/nifti/niftilib/CMakeLists.txt
-@@ -11,17 +11,13 @@
- 
- # Set library version when building shared libs.
- IF (BUILD_SHARED_LIBS)
--  SET_TARGET_PROPERTIES(${NIFTI_NIFTILIB_NAME} PROPERTIES SOVERSION ${NIFTI_SHAREDLIB_SOVERSION} VERSION ${NIFTI_SHAREDLIB_VERSION})
-+  SET_TARGET_PROPERTIES(${NIFTI_NIFTILIB_NAME} PROPERTIES ${NIFTI_LIBRARY_PROPERTIES})
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(${NIFTI_NIFTILIB_NAME} -lm)
- ENDIF(UNIX)
- 
--IF(ITK_LIBRARY_PROPERTIES)
--  SET_TARGET_PROPERTIES(${NIFTI_NIFTILIB_NAME} PROPERTIES ${ITK_LIBRARY_PROPERTIES})
--ENDIF(ITK_LIBRARY_PROPERTIES)
--
- IF(NOT NIFTI_INSTALL_NO_LIBRARIES)
-   INSTALL(TARGETS ${NIFTI_NIFTILIB_NAME}
-     RUNTIME DESTINATION ${NIFTI_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
---- insighttoolkit-3.8.0.orig/Utilities/nifti/znzlib/CMakeLists.txt
-+++ insighttoolkit-3.8.0/Utilities/nifti/znzlib/CMakeLists.txt
-@@ -8,13 +8,10 @@
- 
- ADD_LIBRARY(${NIFTI_ZNZLIB_NAME} ${ZNZLIB_SRC} )
- TARGET_LINK_LIBRARIES( ${NIFTI_ZNZLIB_NAME} ${NIFTI_ZLIB_LIBRARIES} )
--IF(ITK_LIBRARY_PROPERTIES)
--  SET_TARGET_PROPERTIES(${NIFTI_ZNZLIB_NAME} PROPERTIES ${ITK_LIBRARY_PROPERTIES})
--ENDIF(ITK_LIBRARY_PROPERTIES)
- 
- # Set library version if building shared libs.
- IF (BUILD_SHARED_LIBS)
--  SET_TARGET_PROPERTIES(${NIFTI_ZNZLIB_NAME} PROPERTIES SOVERSION ${NIFTI_SHAREDLIB_SOVERSION} VERSION ${NIFTI_SHAREDLIB_VERSION})
-+  SET_TARGET_PROPERTIES(${NIFTI_ZNZLIB_NAME} PROPERTIES ${NIFTI_LIBRARY_PROPERTIES})
- ENDIF (BUILD_SHARED_LIBS)
- 
- 

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2008-11-11 22:37:34 UTC (rev 2659)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2008-11-12 05:17:57 UTC (rev 2660)
@@ -3,4 +3,3 @@
 03_examples.patch
 tcl-install.patch
 pythonfiles-install.patch
-nifti-versioning.patch