[med-svn] r4336 - in trunk/packages/gdcm/trunk/debian: . patches

Mathieu Malaterre malat-guest at alioth.debian.org
Mon Nov 16 11:02:48 UTC 2009


Author: malat-guest
Date: 2009-11-16 11:02:47 +0000 (Mon, 16 Nov 2009)
New Revision: 4336

Added:
   trunk/packages/gdcm/trunk/debian/patches/cmake28_namelink.patch
   trunk/packages/gdcm/trunk/debian/python-vtkgdcm.lintian-overrides
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install
   trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install
   trunk/packages/gdcm/trunk/debian/patches/series
   trunk/packages/gdcm/trunk/debian/python-vtkgdcm.install
Log:
Issue with cmake 2.8 on mipsel/buildd machine

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2009-11-16 09:54:29 UTC (rev 4335)
+++ trunk/packages/gdcm/trunk/debian/changelog	2009-11-16 11:02:47 UTC (rev 4336)
@@ -1,3 +1,10 @@
+gdcm (2.0.14-2) unstable; urgency=low
+
+  * Fix issue on buildd machine with cmake 2.8.
+  * Move the python library to the python-vtkgdcm package
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 16 Nov 2009 11:52:45 +0100
+
 gdcm (2.0.14-1) unstable; urgency=low
 
   * New upstream.

Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install	2009-11-16 09:54:29 UTC (rev 4335)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install	2009-11-16 11:02:47 UTC (rev 4336)
@@ -1,3 +1,2 @@
 usr/lib/libvtkgdcm.so
-usr/lib/libvtkgdcmPythonD.so
 usr/include/gdcm-2.*/vtk*

Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install	2009-11-16 09:54:29 UTC (rev 4335)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install	2009-11-16 11:02:47 UTC (rev 4336)
@@ -1 +1 @@
-usr/lib/libvtkgdcm*.so.*
+usr/lib/libvtkgdcm.so.*

Added: trunk/packages/gdcm/trunk/debian/patches/cmake28_namelink.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/cmake28_namelink.patch	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/cmake28_namelink.patch	2009-11-16 11:02:47 UTC (rev 4336)
@@ -0,0 +1,259 @@
+Index: trunk/Source/DataDictionary/CMakeLists.txt
+===================================================================
+--- trunk/Source/DataDictionary/CMakeLists.txt	(revision 6244)
++++ trunk/Source/DataDictionary/CMakeLists.txt	(working copy)
+@@ -107,9 +107,11 @@
+     ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
+   )
+   #Development
+-  #INSTALL(TARGETS gdcmDICT
+-  #  LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #)
++  if(NAMELINK_ONLY)
++    INSTALL(TARGETS gdcmDICT
++      LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++    )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+Index: trunk/Source/MediaStorageAndFileFormat/CMakeLists.txt
+===================================================================
+--- trunk/Source/MediaStorageAndFileFormat/CMakeLists.txt	(revision 6244)
++++ trunk/Source/MediaStorageAndFileFormat/CMakeLists.txt	(working copy)
+@@ -158,9 +158,11 @@
+     LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries ${NAMELINK_SKIP}
+     ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
+   )
+-  #INSTALL(TARGETS gdcmMSFF
+-  #  LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #  )
++  if(NAMELINK_ONLY)
++    INSTALL(TARGETS gdcmMSFF
++      LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++      )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+Index: trunk/Source/InformationObjectDefinition/CMakeLists.txt
+===================================================================
+--- trunk/Source/InformationObjectDefinition/CMakeLists.txt	(revision 6244)
++++ trunk/Source/InformationObjectDefinition/CMakeLists.txt	(working copy)
+@@ -48,9 +48,11 @@
+     ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
+   )
+   #Development
+-  #INSTALL(TARGETS gdcmIOD
+-  #  LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #  )
++  if(NAMELINK_ONLY)
++    INSTALL(TARGETS gdcmIOD
++      LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++      )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+Index: trunk/Source/Common/CMakeLists.txt
+===================================================================
+--- trunk/Source/Common/CMakeLists.txt	(revision 6244)
++++ trunk/Source/Common/CMakeLists.txt	(working copy)
+@@ -145,9 +145,11 @@
+     ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
+   )
+   #Development
+-  #INSTALL(TARGETS gdcmCommon
+-  #  LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #)
++  if(NAMELINK_ONLY)
++    INSTALL(TARGETS gdcmCommon
++      LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++    )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+Index: trunk/Source/DataStructureAndEncodingDefinition/CMakeLists.txt
+===================================================================
+--- trunk/Source/DataStructureAndEncodingDefinition/CMakeLists.txt	(revision 6244)
++++ trunk/Source/DataStructureAndEncodingDefinition/CMakeLists.txt	(working copy)
+@@ -68,9 +68,11 @@
+     ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
+   )
+   #Development
+-  #INSTALL(TARGETS gdcmDSED
+-  #  LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #)
++  if(NAMELINK_ONLY)
++    INSTALL(TARGETS gdcmDSED
++      LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++    )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+Index: trunk/Utilities/gdcmjpeg/12/CMakeLists.txt
+===================================================================
+--- trunk/Utilities/gdcmjpeg/12/CMakeLists.txt	(revision 6244)
++++ trunk/Utilities/gdcmjpeg/12/CMakeLists.txt	(working copy)
+@@ -11,9 +11,11 @@
+     LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Libraries ${NAMELINK_SKIP}
+     ARCHIVE DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development
+   )
+-  #INSTALL(TARGETS ${JPEG_LIBRARY_NAME}12
+-  #  LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #)
++  if(NAMELINK_ONLY)
++    INSTALL(TARGETS ${JPEG_LIBRARY_NAME}12
++      LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++    )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT JPEG_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+Index: trunk/Utilities/gdcmjpeg/16/CMakeLists.txt
+===================================================================
+--- trunk/Utilities/gdcmjpeg/16/CMakeLists.txt	(revision 6244)
++++ trunk/Utilities/gdcmjpeg/16/CMakeLists.txt	(working copy)
+@@ -11,9 +11,11 @@
+     LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Libraries ${NAMELINK_SKIP}
+     ARCHIVE DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development
+   )
+-  #INSTALL(TARGETS ${JPEG_LIBRARY_NAME}16
+-  #  LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #)
++  if(NAMELINK_ONLY)
++  INSTALL(TARGETS ${JPEG_LIBRARY_NAME}16
++    LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++  )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT JPEG_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+Index: trunk/Utilities/gdcmjpeg/8/CMakeLists.txt
+===================================================================
+--- trunk/Utilities/gdcmjpeg/8/CMakeLists.txt	(revision 6244)
++++ trunk/Utilities/gdcmjpeg/8/CMakeLists.txt	(working copy)
+@@ -11,9 +11,11 @@
+     LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Libraries ${NAMELINK_SKIP}
+     ARCHIVE DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development
+   )
+-  #INSTALL(TARGETS ${JPEG_LIBRARY_NAME}8
+-  #  LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #)
++  if(NAMELINK_ONLY)
++  INSTALL(TARGETS ${JPEG_LIBRARY_NAME}8
++    LIBRARY DESTINATION ${JPEG_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++  )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT JPEG_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
+Index: trunk/Utilities/VTK/CMakeLists.txt
+===================================================================
+--- trunk/Utilities/VTK/CMakeLists.txt	(revision 6261)
++++ trunk/Utilities/VTK/CMakeLists.txt	(working copy)
+@@ -123,12 +123,14 @@
+ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+   INSTALL(TARGETS ${VTKGDCM_NAME}
+     RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT VTKLibraries
+-    LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKLibraries ${NAMELINK_SKIP}
++    LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKLibraries #${NAMELINK_SKIP}
+     ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKDevelopment
+   )
+-  #INSTALL(TARGETS vtkgdcm
+-  #  LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-  #)
++#if(NAMELINK_ONLY)
++#  INSTALL(TARGETS vtkgdcm
++#    LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++#  )
++#  endif(NAMELINK_ONLY)
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+@@ -174,9 +176,15 @@
+ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+   INSTALL(TARGETS ${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME}
+     RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Applications
+-    LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries
++    LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries #${NAMELINK_SKIP}
+     ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
+   )
++#if(NAMELINK_ONLY)
++#  INSTALL(TARGETS ${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME}
++#    LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++#  )
++#  endif(NAMELINK_ONLY)
++
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+   CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
+@@ -291,9 +299,16 @@
+     IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+       INSTALL(TARGETS ${VTKGDCM_NAME}Java
+         RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT VTKJavaModule
+-        LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKJavaModule
++        LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKJavaModule #${NAMELINK_SKIP}
+         ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKJavaModule
+       )
++  #Development
++  #if(NAMELINK_ONLY)
++  #  INSTALL(TARGETS ${VTKGDCM_NAME}Java
++  #    LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKJavaModule ${NAMELINK_ONLY}
++  #  )
++  #endif(NAMELINK_ONLY)
++
+     # because vtkgdcm.jar is constructed with custom commands, it need the INSTALL(FILES signature:
+     INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
+       DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKJavaModule
+@@ -346,17 +361,19 @@
+     IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+         INSTALL(TARGETS ${VTKGDCM_NAME}Python
+           RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT                        VTKPythonModule
+-          LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT VTKPythonModule
++          LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT VTKPythonModule #${NAMELINK_SKIP}
+           ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT VTKPythonModule
+         )
+         INSTALL(TARGETS ${VTKGDCM_NAME}PythonD
+           RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT VTKPythonModule
+-          LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKPythonModule
++          LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKPythonModule #${NAMELINK_ONLY}
+           ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKPythonModule
+         )
+-#        INSTALL(TARGETS ${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME}Python
+-#          LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT VTKDevelopment ${NAMELINK_ONLY}
+-#  )
++      #  if(NAMELINK_ONLY)
++      #      INSTALL(TARGETS ${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME}Python
++      #        LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT VTKDevelopment ${NAMELINK_ONLY}
++      #        )
++      #  endif(NAMELINK_ONLY)
+     # the python file is not a dev file, but part of the gdcm module...
+       INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/vtkgdcm.py 
+         DESTINATION ${GDCM_INSTALL_LIB_DIR}/${python_site_package} COMPONENT VTKPythonModule
+Index: trunk/Utilities/gdcmcharls/CMakeLists.txt
+===================================================================
+--- trunk/Utilities/gdcmcharls/CMakeLists.txt	(revision 6244)
++++ trunk/Utilities/gdcmcharls/CMakeLists.txt	(working copy)
+@@ -53,11 +53,18 @@
+ 
+ # Install library
+ IF(NOT CHARLS_INSTALL_NO_LIBRARIES)
++  # Runtime
+   INSTALL(TARGETS ${CHARLS_LIBRARY_NAME}
+     RUNTIME DESTINATION ${CHARLS_INSTALL_BIN_DIR} COMPONENT Applications
+-    LIBRARY DESTINATION ${CHARLS_INSTALL_LIB_DIR} COMPONENT Libraries
++    LIBRARY DESTINATION ${CHARLS_INSTALL_LIB_DIR} COMPONENT Libraries ${NAMELINK_SKIP}
+     ARCHIVE DESTINATION ${CHARLS_INSTALL_LIB_DIR} COMPONENT Development
+   )
++  #Development
++  if(NAMELINK_ONLY)
++    INSTALL(TARGETS ${CHARLS_LIBRARY_NAME}
++      LIBRARY DESTINATION ${CHARLS_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
++    )
++  endif(NAMELINK_ONLY)
+ ENDIF(NOT CHARLS_INSTALL_NO_LIBRARIES)
+ 
+ IF(NOT CHARLS_INSTALL_NO_DEVELOPMENT)


Property changes on: trunk/packages/gdcm/trunk/debian/patches/cmake28_namelink.patch
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2009-11-16 09:54:29 UTC (rev 4335)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2009-11-16 11:02:47 UTC (rev 4336)
@@ -1 +1,2 @@
 poppler_breaks_api.patch
+cmake28_namelink.patch

Modified: trunk/packages/gdcm/trunk/debian/python-vtkgdcm.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/python-vtkgdcm.install	2009-11-16 09:54:29 UTC (rev 4335)
+++ trunk/packages/gdcm/trunk/debian/python-vtkgdcm.install	2009-11-16 11:02:47 UTC (rev 4336)
@@ -1,2 +1,3 @@
 usr/lib/python*/site-packages/vtkgdcm.py
 usr/lib/python*/site-packages/libvtkgdcmPython.so*
+usr/lib/libvtkgdcmPythonD.so*

Added: trunk/packages/gdcm/trunk/debian/python-vtkgdcm.lintian-overrides
===================================================================
--- trunk/packages/gdcm/trunk/debian/python-vtkgdcm.lintian-overrides	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/python-vtkgdcm.lintian-overrides	2009-11-16 11:02:47 UTC (rev 4336)
@@ -0,0 +1,2 @@
+python-vtkgdcm: non-dev-pkg-with-shlib-symlink usr/lib/libvtkgdcmPythonD.so.2.0.14 usr/lib/libvtkgdcmPythonD.so
+python-vtkgdcm: package-name-doesnt-match-sonames libvtkgdcmPythonD2.0




More information about the debian-med-commit mailing list