[med-svn] r16475 - in trunk/packages/insighttoolkit/branches/itk4-enable-python/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2014-03-19 11:20:27 +0000 (Wed, 19 Mar 2014)
New Revision: 16475

Added:
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/0005-make-gdcm-helper-library-static.patch
Modified:
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/series
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules
Log:
update the build to correct lintian errors and warnings

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog	2014-03-19 10:23:26 UTC (rev 16474)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog	2014-03-19 11:20:27 UTC (rev 16475)
@@ -4,6 +4,8 @@
   * new uptream
   * enable python2.7 bindings
   * update build dependencies to new wrapping method
+  * Add linker flags --as-needed to reduce dependencies
+  * make ITKGDCM a static library since it is only a dependency stub
 
  -- Gert Wollny <wollny at die.upm.es>  Wed, 05 Mar 2014 11:39:21 +0100
 

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in	2014-03-19 10:23:26 UTC (rev 16474)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in	2014-03-19 11:20:27 UTC (rev 16475)
@@ -86,8 +86,10 @@
 
 Package: insighttoolkit at VER_MAJOR@-python 
 Section: python 
-Architecture: all
+Architecture: amd64 i386
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: insighttoolkit-python
+Replaces: insighttoolkit-python
 Description: Image processing toolkit for registration and segmentation - examples
  ITK is an open-source software toolkit for performing registration and
  segmentation. Segmentation is the process of identifying and

Added: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/0005-make-gdcm-helper-library-static.patch
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/0005-make-gdcm-helper-library-static.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/0005-make-gdcm-helper-library-static.patch	2014-03-19 11:20:27 UTC (rev 16475)
@@ -0,0 +1,11 @@
+diff --git a/Modules/ThirdParty/GDCM/src/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/CMakeLists.txt
+index e98077c..70f4286 100644
+--- a/Modules/ThirdParty/GDCM/src/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ if(ITK_USE_SYSTEM_GDCM)
+-  add_library(ITKGDCM ITK-GDCM.cxx)
++  add_library(ITKGDCM STATIC ITK-GDCM.cxx)
+   target_link_libraries(ITKGDCM gdcmDICT gdcmMSFF)
+   itk_module_target(ITKGDCM)
+   return()

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/series	2014-03-19 10:23:26 UTC (rev 16474)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/series	2014-03-19 11:20:27 UTC (rev 16475)
@@ -5,3 +5,4 @@
 0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch
 0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch
 0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch
+0005-make-gdcm-helper-library-static.patch

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules	2014-03-19 10:23:26 UTC (rev 16474)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules	2014-03-19 11:20:27 UTC (rev 16475)
@@ -107,8 +107,11 @@
 	dh_installdocs -p$(pkg_dev) Documentation/*
 	dh_install -p$(pkg_dev) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so usr/lib
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/ITK-$(SOVERSION)/*
+	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/bin/itkTestDriver
+
+	# remove wrapping related cmake files, they should not be needed. 
+	rm -r debian/tmp/usr/lib/cmak/WrapITK
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/cmake
-	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/bin/itkTestDriver
 #	dh_install -p$(pkg_dev) Wrapping/WrapITK /usr/src
         #
         # pkg_python