[med-svn] r17518 - in trunk/packages/insighttoolkit/trunk/debian: . patches

Thu Jul 24 15:19:16 UTC 2014

Author: gert-guest
Date: 2014-07-24 15:19:16 +0000 (Thu, 24 Jul 2014)
New Revision: 17518

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
start preparation of the 4.6 package

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================

--- trunk/packages/insighttoolkit/trunk/debian/changelog	2014-07-24 13:52:49 UTC (rev 17517)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2014-07-24 15:19:16 UTC (rev 17518)
@@ -1,3 +1,12 @@
+insighttoolkit4 (4.6.0-1) UNRELEASED; urgency=medium
+
+  * Add patch to increase OtsuThreshold computation precision (added upstream) 
+  * Add patch to increase itkVoronoiPartitioningImageFilterTest1 tolerance (added upstream) 
+  * Revise patch to avoid including emmintr.h when __SSE2__ is not defined
+  * Add debug package 
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Thu, 24 Jul 2014 16:37:03 +0200
+
 insighttoolkit4 (4.5.2-4) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2014-07-24 13:52:49 UTC (rev 17517)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2014-07-24 15:19:16 UTC (rev 17518)
@@ -26,7 +26,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/insighttoolkit/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/insighttoolkit/trunk/
 
-Package: libinsighttoolkit4.5
+Package: libinsighttoolkit4.6
 Section: libs
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -46,7 +46,7 @@
 Package: libinsighttoolkit4-dev
 Section: libdevel
 Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.5 (= ${binary:Version}), libgdcm2-dev, libdcmtk2-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.6 (= ${binary:Version}), libgdcm2-dev, libdcmtk2-dev
 Recommends: libfftw3-dev, uuid-dev
 Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev
 Replaces: libinsighttoolkit-dev

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2014-07-24 13:52:49 UTC (rev 17517)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2014-07-24 15:19:16 UTC (rev 17518)
@@ -65,6 +65,23 @@
  This package contains the development files needed to build your own
  ITK applications.
 
+Package: libinsighttoolkit at VER_MAJOR@-dbg
+Section: libdevel
+Architecture: amd64 i386
+Depends: ${misc:Depends}, libinsighttoolkit at SOVERSION@ (= ${binary:Version})
+Description: Debugging information for the Insight Toolkit 
+ ITK is an open-source software toolkit for performing registration and
+ segmentation. Segmentation is the process of identifying and
+ classifying data found in a digitally sampled
+ representation. Typically the sampled representation is an image
+ acquired from such medical instrumentation as CT or MRI
+ scanners. Registration is the task of aligning or developing
+ correspondences between data. For example, in the medical
+ environment, a CT scan may be aligned with a MRI scan in order to
+ combine the information contained in both.
+ .
+ This package contains the debug files of the libraries. 
+
 Package: insighttoolkit at VER_MAJOR@-examples
 Section: devel
 Architecture: all

Added: trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch	2014-07-24 15:19:16 UTC (rev 17518)
@@ -0,0 +1,36 @@
+diff --git a/Modules/Core/Common/include/itkMathDetail.h b/Modules/Core/Common/include/itkMathDetail.h
+index 7db8727..6bd5739 100644
+--- a/Modules/Core/Common/include/itkMathDetail.h
++++ b/Modules/Core/Common/include/itkMathDetail.h
+@@ -39,10 +39,6 @@
+ #include <fenv.h> // should this be cfenv?
+ #endif /* ITK_HAVE_FENV_H */
+ 
+-#ifdef ITK_HAVE_EMMINTRIN_H
+-#include <emmintrin.h> // sse 2 intrinsics
+-#endif /* ITK_HAVE_EMMINTRIN_H */
+-
+ // assume no SSE2:
+ #define USE_SSE2_64IMPL 0
+ #define USE_SSE2_32IMPL 0
+@@ -104,6 +100,20 @@
+ #define VC_USE_ASM_64IMPL 0
+ #endif
+ 
++// Now that it has been established that SSE2 is available,
++// include the required header.
++// Note that at this point testing for emmintrin.h is superfluos,
++// if it can't be included now the compiler installation is borked.
++// Still, I keep the test because I don't know why it was put there.
++
++#if defined(USE_SSE2_32IMPL) || defined(USE_SSE2_64IMPL)
++# ifdef ITK_HAVE_EMMINTRIN_H
++#  include <emmintrin.h> // sse 2 intrinsics
++# else
++#  error "SSE2 is supported but emmintrin.h has not been found"
++# endif /* ITK_HAVE_EMMINTRIN_H  */
++#endif /* USE_SSE2_32IMPL || USE_SSE2_64IMPL */
++
+ namespace itk
+ {
+ namespace Math

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2014-07-24 13:52:49 UTC (rev 17517)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2014-07-24 15:19:16 UTC (rev 17518)
@@ -1,6 +1,5 @@
 nrrdio-linking.patch
 bsd-hdf5.patch
 0005-make-gdcm-helper-library-static.patch
-0001_donot_include_emmintr_without_sse2_enabled.patch
-0002_OtsuMultipleThresholdsCalculator-accurray.patch
-0003_VoronoiSegmentationTestTolerance.patch
+0001_avoid-includsion-of-emmintr_h_without_sse2.patch
+

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2014-07-24 13:52:49 UTC (rev 17517)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2014-07-24 15:19:16 UTC (rev 17518)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 VER_MAJOR = 4
-VER_MINOR = 5
+VER_MINOR = 6
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
@@ -99,6 +99,9 @@
 	echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
 	dh_lintian
 
+override_dh_strip:
+	dh_strip -plibinsighttoolkit$(SOVERSION) --dbg-package=libinsighttoolkit$(VER_MAJOR)-dbg
+
 override_dh_install: 
 	# pkg_lib
 	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so.* usr/lib


