Author: smr Date: 2012-08-25 05:34:53 +0000 (Sat, 25 Aug 2012) New Revision: 12122
Removed: trunk/packages/insighttoolkit/trunk/debian/patches/gcc4.7.patch trunk/packages/insighttoolkit/trunk/debian/patches/tiff-big-endian.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: Update to ITK 4.2.0. Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2012-08-24 22:32:26 UTC (rev 12121) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2012-08-25 05:34:53 UTC (rev 12122) @@ -1,3 +1,16 @@ +insighttoolkit4 (4.2.0-1) unstable; urgency=low + + * New upstream version. + - build with gcc 4.7. + - set ITK_USE_REVIEW = ON. + - upstream tarball no longer contains directories that must be + deleted; remove target get-orig-source. + + * patches/gcc4.7.patch: + * patches/tiff-big-endian.patch: Removed. Applied upstream. + + -- Steve M. Robbins <[email protected]> Sat, 25 Aug 2012 00:14:06 -0500 + insighttoolkit4 (4.1.0-2) experimental; urgency=low * control.in: Dev package conflicts with libinsighttoolkit3-dev. Modified: trunk/packages/insighttoolkit/trunk/debian/control =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/control 2012-08-24 22:32:26 UTC (rev 12121) +++ trunk/packages/insighttoolkit/trunk/debian/control 2012-08-25 05:34:53 UTC (rev 12122) @@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team <[email protected]> DM-Upload-Allowed: yes Uploaders: Steve M. Robbins <[email protected]>, Mathieu Malaterre <[email protected]> -Build-Depends: debhelper (>= 8), gcc-4.6, g++-4.6, +Build-Depends: debhelper (>= 8), cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723), zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev, libfftw3-dev, @@ -15,7 +15,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.1 +Package: libinsighttoolkit4.2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -35,7 +35,7 @@ Package: libinsighttoolkit4-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libinsighttoolkit4.1 (= ${binary:Version}), libgdcm2-dev +Depends: ${misc:Depends}, libinsighttoolkit4.2 (= ${binary:Version}), libgdcm2-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 2012-08-24 22:32:26 UTC (rev 12121) +++ trunk/packages/insighttoolkit/trunk/debian/control.in 2012-08-25 05:34:53 UTC (rev 12122) @@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team <[email protected]> DM-Upload-Allowed: yes Uploaders: Steve M. Robbins <[email protected]>, Mathieu Malaterre <[email protected]> -Build-Depends: debhelper (>= 8), gcc-4.6, g++-4.6, +Build-Depends: debhelper (>= 8), cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723), zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev, libfftw3-dev, Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/gcc4.7.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/gcc4.7.patch 2012-08-24 22:32:26 UTC (rev 12121) +++ trunk/packages/insighttoolkit/trunk/debian/patches/gcc4.7.patch 2012-08-25 05:34:53 UTC (rev 12122) @@ -1,10 +0,0 @@ ---- insighttoolkit4-4.1.0.orig/Modules/Core/Common/include/itkSize.h -+++ insighttoolkit4-4.1.0/Modules/Core/Common/include/itkSize.h -@@ -20,6 +20,7 @@ - - #include "itkMacro.h" - #include "itkIntTypes.h" -+#include <cstring> - - namespace itk - { Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/series 2012-08-24 22:32:26 UTC (rev 12121) +++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2012-08-25 05:34:53 UTC (rev 12122) @@ -1,2 +0,0 @@ -gcc4.7.patch -tiff-big-endian.patch Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/tiff-big-endian.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/tiff-big-endian.patch 2012-08-24 22:32:26 UTC (rev 12121) +++ trunk/packages/insighttoolkit/trunk/debian/patches/tiff-big-endian.patch 2012-08-25 05:34:53 UTC (rev 12122) @@ -1,19 +0,0 @@ -Description: Build fix for non-apple big-endian - See full explanation in http://lists.debian.org/debian-med/2012/04/msg00070.html -Author: Paul Novotny <[email protected]> -Checked-By: Steve M. Robbins <[email protected]> -Forwarded: https://issues.itk.org/jira/browse/ITK-2926 -Last-Update: 2012-04-23 - - ---- a/Modules/ThirdParty/TIFF/src/itktiff/tif_predict.c -+++ b/Modules/ThirdParty/TIFF/src/itktiff/tif_predict.c -@@ -560,7 +560,7 @@ - for (count = 0; count < wc; count++) { - uint32 byte; - for (byte = 0; byte < bps; byte++) { -- #if WORDS_BIGENDIAN -+ #ifdef WORDS_BIGENDIAN - cp[byte * wc + count] = tmp[bps * count + byte]; - #else - cp[(bps - byte - 1) * wc + count] = Modified: trunk/packages/insighttoolkit/trunk/debian/rules =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/rules 2012-08-24 22:32:26 UTC (rev 12121) +++ trunk/packages/insighttoolkit/trunk/debian/rules 2012-08-25 05:34:53 UTC (rev 12122) @@ -1,7 +1,7 @@ #!/usr/bin/make -f VER_MAJOR = 4 -VER_MINOR = 1 +VER_MINOR = 2 VER_PATCH = 0 # TODO: turn on the following: @@ -16,8 +16,6 @@ # Module_ITKVtkGlue (https://issues.itk.org/jira/browse/ITK-2856) CMAKE_FLAGS = \ - -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-4.6 \ - -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-4.6 \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \ @@ -25,6 +23,7 @@ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DITKV3_COMPATIBILITY:BOOL=ON \ -DITK_USE_MINC2:BOOL=ON \ + -DITK_USE_REVIEW:BOOL=ON \ -DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \ -DITK_USE_SYSTEM_GDCM:BOOL=ON \ -DITK_USE_SYSTEM_HDF5:BOOL=OFF \ @@ -48,10 +47,6 @@ VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) SOVERSION = $(VER_MAJOR).$(VER_MINOR) -UPSTREAM_SRC = InsightToolkit-$(VER_FULL) -DEBIAN_SRC_DIR = insighttoolkit-$(VER_FULL) -DEBIAN_SRC_TAR = insighttoolkit_$(VER_FULL).orig.tar.gz - pkg_lib = libinsighttoolkit$(SOVERSION) pkg_dev = libinsighttoolkit$(VER_MAJOR)-dev pkg_examples = insighttoolkit$(VER_MAJOR)-examples @@ -72,7 +67,7 @@ override_dh_lintian: echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides - echo "$(pkg_lib): embedded-library usr/lib/libitktiff-4.1.so.1: tiff" >> debian/$(pkg_lib).lintian-overrides + echo "$(pkg_lib): embedded-library usr/lib/libitktiff-4.2.so.1: tiff" >> debian/$(pkg_lib).lintian-overrides dh_lintian override_dh_install: @@ -98,15 +93,6 @@ -type f -print0 | xargs -0 chmod 644 endif -$(UPSTREAM_SRC).tar.gz: - wget http://voxel.dl.sourceforge.net/sourceforge/itk/$@ - -get-orig-source: $(UPSTREAM_SRC).tar.gz - tar xzf $(UPSTREAM_SRC).tar.gz - find $(UPSTREAM_SRC) -name CVS -o -name Patented | xargs rm -rf - mv $(UPSTREAM_SRC) $(DEBIAN_SRC_DIR) - GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR) - control-file: sed -e "s/@VER_MAJOR@/$(VER_MAJOR)/g" \ -e "s/@SOVERSION@/$(SOVERSION)/g" \ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
