diff -Nru insighttoolkit-3.20.1+git20120521/debian/changelog insighttoolkit-3.20.1+git20120521/debian/changelog --- insighttoolkit-3.20.1+git20120521/debian/changelog 2012-09-11 17:40:27.000000000 +0000 +++ insighttoolkit-3.20.1+git20120521/debian/changelog 2014-04-04 15:54:45.000000000 +0000 @@ -1,10 +1,23 @@ -insighttoolkit (3.20.1+git20120521-3ubuntu1) quantal; urgency=low +insighttoolkit (3.20.1+git20120521-5) unstable; urgency=low - * Merge with Debian; remaining changes: - - debian/patches/snan-sanity.patch. - - Adjust to a tiff4 -> tiff5 API incompatibility + * Team upload + * d/c.in: moving libfftw3-dev from Recommends to Depends + for libinsighttoolkit3-dev (Closes: #740628) + * Cherry-picked snan-sanity.patch from ubuntu (Closes: #740705) + + -- Gianfranco Costamagna Sun, 09 Mar 2014 07:41:21 +0100 + +insighttoolkit (3.20.1+git20120521-4) unstable; urgency=low + + * Use dch/9 to get hardening flags correct + * Do not use cmake build system flags. Closes: #732288 + * Fix TIFF5 compilation. Closes: #732709 + Use libtiff copy, remove B-D libtiff-dev + * Use XZ compression + * Remove obsolete DMUA flag + - Bump Std-Vers to 3.9.5 - -- Matthias Klose Tue, 11 Sep 2012 19:35:20 +0200 + -- Mathieu Malaterre Mon, 30 Dec 2013 11:28:43 +0100 insighttoolkit (3.20.1+git20120521-3) unstable; urgency=low @@ -20,37 +33,6 @@ -- Mathieu Malaterre Thu, 26 Jul 2012 17:38:47 +0200 -insighttoolkit (3.20.1+git20120521-1ubuntu3) quantal; urgency=low - - * debian/patches/snan-sanity.patch: - - In sanity checks done by the nrrd utility code, don't bother - testing signal NaN clases, because GCC does not guarantee to - preserve signal-ness across float conversions. This was - contributing to a FTBFS for plastimatch. - - -- Michael Terry Wed, 25 Jul 2012 14:08:00 -0400 - -insighttoolkit (3.20.1+git20120521-1ubuntu2) quantal; urgency=low - - * Another rebuild for libgdcm2.2, since armel was so slow it got stuck - with the old one - * debian/patches/tiff5.patch: - - Adjust to a tiff4 -> tiff5 API incompatibility - - -- Michael Terry Tue, 24 Jul 2012 13:05:37 -0400 - -insighttoolkit (3.20.1+git20120521-1ubuntu1) quantal; urgency=low - - * Adapt headers to gcc 4.7, fixing build failure of wrapitk-python. - - -- Ilya Barygin Sat, 16 Jun 2012 23:31:48 +0400 - -insighttoolkit (3.20.1+git20120521-1build1) quantal; urgency=low - - * No-change rebuild for libgdcm2.0 -> libgdcm2.2 transition. - - -- Ilya Barygin Tue, 05 Jun 2012 21:42:35 +0400 - insighttoolkit (3.20.1+git20120521-1) unstable; urgency=low * New upstream. Includes many GCC 4.7 fixes. Closes: #673816, #673768. diff -Nru insighttoolkit-3.20.1+git20120521/debian/compat insighttoolkit-3.20.1+git20120521/debian/compat --- insighttoolkit-3.20.1+git20120521/debian/compat 2011-09-17 17:32:04.000000000 +0000 +++ insighttoolkit-3.20.1+git20120521/debian/compat 2013-12-17 17:12:51.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru insighttoolkit-3.20.1+git20120521/debian/control insighttoolkit-3.20.1+git20120521/debian/control --- insighttoolkit-3.20.1+git20120521/debian/control 2012-09-11 17:37:13.000000000 +0000 +++ insighttoolkit-3.20.1+git20120521/debian/control 2014-04-04 15:54:45.000000000 +0000 @@ -2,17 +2,15 @@ Homepage: http://www.itk.org/ Section: science Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team -DM-Upload-Allowed: yes +Maintainer: Debian Med Packaging Team Uploaders: Steve M. Robbins , Mathieu Malaterre -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 9), cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723), - zlib1g-dev (>= 1.2.2), libpng-dev, libtiff-dev, + zlib1g-dev (>= 1.2.2), libpng-dev, libfftw3-dev, uuid-dev, libgdcm2-dev, libvtk5-dev, python-vtk -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 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/ @@ -36,8 +34,8 @@ Package: libinsighttoolkit3-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libinsighttoolkit3.20 (= ${binary:Version}), libgdcm2-dev -Recommends: libfftw3-dev, uuid-dev +Depends: ${misc:Depends}, libinsighttoolkit3.20 (= ${binary:Version}), libgdcm2-dev, libfftw3-dev +Recommends: uuid-dev Conflicts: libinsighttoolkit-dev Replaces: libinsighttoolkit-dev Suggests: insighttoolkit3-examples diff -Nru insighttoolkit-3.20.1+git20120521/debian/control.in insighttoolkit-3.20.1+git20120521/debian/control.in --- insighttoolkit-3.20.1+git20120521/debian/control.in 2012-09-11 17:37:13.000000000 +0000 +++ insighttoolkit-3.20.1+git20120521/debian/control.in 2014-04-04 15:54:45.000000000 +0000 @@ -2,17 +2,15 @@ Homepage: http://www.itk.org/ Section: science Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team -DM-Upload-Allowed: yes +Maintainer: Debian Med Packaging Team Uploaders: Steve M. Robbins , Mathieu Malaterre -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 9), cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723), - zlib1g-dev (>= 1.2.2), libpng-dev, libtiff-dev, + zlib1g-dev (>= 1.2.2), libpng-dev, libfftw3-dev, uuid-dev, libgdcm2-dev, libvtk5-dev, python-vtk -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 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/ @@ -36,8 +34,8 @@ Package: libinsighttoolkit@VER_MAJOR@-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libinsighttoolkit@SOVERSION@ (= ${binary:Version}), libgdcm2-dev -Recommends: libfftw3-dev, uuid-dev +Depends: ${misc:Depends}, libinsighttoolkit@SOVERSION@ (= ${binary:Version}), libgdcm2-dev, libfftw3-dev +Recommends: uuid-dev Conflicts: libinsighttoolkit-dev Replaces: libinsighttoolkit-dev Suggests: insighttoolkit@VER_MAJOR@-examples diff -Nru insighttoolkit-3.20.1+git20120521/debian/patches/series insighttoolkit-3.20.1+git20120521/debian/patches/series --- insighttoolkit-3.20.1+git20120521/debian/patches/series 2012-09-11 17:38:53.000000000 +0000 +++ insighttoolkit-3.20.1+git20120521/debian/patches/series 2014-04-04 15:54:45.000000000 +0000 @@ -14,5 +14,5 @@ ITKNrrdIOmath.patch bug667417.patch nan-i386.patch -tiff5.patch +#tiff5.patch snan-sanity.patch diff -Nru insighttoolkit-3.20.1+git20120521/debian/patches/tiff5.patch insighttoolkit-3.20.1+git20120521/debian/patches/tiff5.patch --- insighttoolkit-3.20.1+git20120521/debian/patches/tiff5.patch 2012-09-11 17:37:13.000000000 +0000 +++ insighttoolkit-3.20.1+git20120521/debian/patches/tiff5.patch 2013-12-30 10:14:50.000000000 +0000 @@ -1,32 +1,61 @@ +Description: Move to TIFF5 API + As explained at: http://bugs.debian.org/732709#35 + This patch will not be applied, instead use a lintian override for + embedded TIFF lib +Author: Mathieu Malaterre +Bug-Debian: http://bugs.debian.org/732709 + Index: insighttoolkit-3.20.1+git20120521/Code/IO/itkTIFFImageIO.cxx =================================================================== ---- insighttoolkit-3.20.1+git20120521.orig/Code/IO/itkTIFFImageIO.cxx 2012-05-03 12:11:41.000000000 -0400 -+++ insighttoolkit-3.20.1+git20120521/Code/IO/itkTIFFImageIO.cxx 2012-07-24 15:32:00.711663898 -0400 -@@ -1866,7 +1866,7 @@ +--- insighttoolkit-3.20.1+git20120521.orig/Code/IO/itkTIFFImageIO.cxx 2013-12-29 12:39:32.362971598 +0100 ++++ insighttoolkit-3.20.1+git20120521/Code/IO/itkTIFFImageIO.cxx 2013-12-29 19:22:14.375503955 +0100 +@@ -1856,6 +1856,21 @@ + TIFFClose(tif); + } + ++// With the TIFF 4.0 (aka bigtiff ) interface the tiff field structure ++// was renamed and became an opaque type requiring function to ++// access. The follow are some macros for portable access. ++#ifdef TIFF_INT64_T // detect if libtiff4 ++#define itkTIFFFieldReadCount( TIFFField ) TIFFFieldReadCount( TIFFField ) ++#define itkTIFFFieldPassCount( TIFFField ) TIFFFieldPassCount( TIFFField ) ++#define itkTIFFFieldDataType( TIFFField ) TIFFFieldDataType( TIFFField ) ++#define itkTIFFField TIFFField ++#else ++#define itkTIFFFieldReadCount( TIFFFieldInfo ) ((TIFFFieldInfo)->field_readcount) ++#define itkTIFFFieldPassCount( TIFFFieldInfo ) ((TIFFFieldInfo)->field_passcount) ++#define itkTIFFFieldDataType( TIFFFieldInfo ) ((TIFFFieldInfo)->field_type) ++#define itkTIFFField TIFFFieldInfo ++#endif ++ + bool TIFFImageIO::CanFindTIFFTag( unsigned int t ) + { + // m_InternalImage needs to be valid +@@ -1866,7 +1881,7 @@ } ttag_t tag = t; // 32bits integer - const TIFFFieldInfo *fld = TIFFFieldWithTag( m_InternalImage->m_Image, tag ); -+ const TIFFField *fld = TIFFFieldWithTag( m_InternalImage->m_Image, tag ); ++ const itkTIFFField *fld = TIFFFieldWithTag(m_InternalImage->m_Image, tag); if( fld == NULL ) { return false; -@@ -1884,30 +1884,16 @@ +@@ -1884,7 +1899,7 @@ } ttag_t tag = t; void *raw_data = NULL; - const TIFFFieldInfo *fld = TIFFFieldWithTag( m_InternalImage->m_Image, tag ); -+ const TIFFField *fld = TIFFFindField( m_InternalImage->m_Image, tag, TIFF_BYTE ); ++ const itkTIFFField *fld = TIFFFieldWithTag( m_InternalImage->m_Image, tag ); if( fld == NULL ) { itkExceptionMacro( << "fld is NULL" ); - return NULL; +@@ -1892,21 +1907,10 @@ } -- else -+ else if( TIFFGetField( m_InternalImage->m_Image, tag, &value_count, &raw_data ) != 1 ) + else { - if( fld->field_passcount ) -- { ++ if ( itkTIFFFieldDataType( fld ) != TIFF_BYTE ) + { - if( TIFFGetField( m_InternalImage->m_Image, tag, &value_count, &raw_data ) != 1 ) - { - itkExceptionMacro( << "Tag cannot be found" ); @@ -40,9 +69,8 @@ - return NULL; - } - } -- } -+ itkExceptionMacro( << "Tag cannot be found" ); -+ return NULL; ++ itkExceptionMacro(<< "Tag is not of type TIFF_BYTE"); ++ return NULL; + } } return raw_data; - } diff -Nru insighttoolkit-3.20.1+git20120521/debian/rules insighttoolkit-3.20.1+git20120521/debian/rules --- insighttoolkit-3.20.1+git20120521/debian/rules 2012-05-14 10:16:21.000000000 +0000 +++ insighttoolkit-3.20.1+git20120521/debian/rules 2013-12-30 10:14:50.000000000 +0000 @@ -1,8 +1,7 @@ #!/usr/bin/make -f export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -DPKG_EXPORT_BUILDFLAGS = 1 --include /usr/share/dpkg/buildflags.mk +export DEB_CXXFLAGS_MAINT_APPEND = -Wno-deprecated VER_MAJOR = 3 VER_MINOR = 20 @@ -13,9 +12,8 @@ -DBUILD_EXAMPLES:BOOL=OFF \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ - -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_BUILD_TYPE:STRING=None \ -DBUILD_DOXYGEN:BOOL=OFF \ - -DCMAKE_CXX_FLAGS:STRING=-Wno-deprecated \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DITK_USE_REVIEW:BOOL=ON \ -DITK_USE_REVIEW_STATISTICS:BOOL=ON \ @@ -23,7 +21,7 @@ -DITK_USE_TRANSFORM_IO_FACTORIES:BOOL=ON \ -DITK_USE_SYSTEM_GDCM:BOOL=ON \ -DITK_USE_SYSTEM_PNG:BOOL=ON \ - -DITK_USE_SYSTEM_TIFF:BOOL=ON \ + -DITK_USE_SYSTEM_TIFF:BOOL=OFF \ -DITK_USE_SYSTEM_ZLIB:BOOL=ON \ -DITK_USE_SYSTEM_VXL:BOOL=OFF \ -DUSE_FFTWD:BOOL=ON \ diff -Nru insighttoolkit-3.20.1+git20120521/debian/source/options insighttoolkit-3.20.1+git20120521/debian/source/options --- insighttoolkit-3.20.1+git20120521/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ insighttoolkit-3.20.1+git20120521/debian/source/options 2013-12-20 14:31:32.000000000 +0000 @@ -0,0 +1,3 @@ +compression = xz +compression-level = 9 +