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

[Steven Michael Robbins]

Author: smr
Date: 2015-07-19 23:00:51 +0000 (Sun, 19 Jul 2015)
New Revision: 19678

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:
Minimal changes to get new upstream 4.8.0 building.
Note: the external data must be unpacked within the source tree before building.


Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2015-07-19 15:00:00 UTC (rev 19677)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2015-07-19 23:00:51 UTC (rev 19678)
@@ -1,3 +1,14 @@
+insighttoolkit4 (4.8.0-1) UNRELEASED; urgency=medium
+
+  * New upstream.
+
+  * patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch:
+  * patches/vcl-dunno-about-this-gcc.patch: Remove.  Applied upstream.
+
+  * patches/0005-make-gdcm-helper-library-static.patch: Disabled at present.
+
+ -- Steve M. Robbins <smr at debian.org>  Wed, 15 Jul 2015 22:05:23 -0500
+
 insighttoolkit4 (4.7.2-2) unstable; urgency=medium
 
   * patches/vcl-dunno-about-this-gcc.patch: New.  Upstream patch to build

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2015-07-19 15:00:00 UTC (rev 19677)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2015-07-19 23:00:51 UTC (rev 19678)
@@ -6,9 +6,9 @@
 Uploaders: Steve M. Robbins <smr at debian.org>,
            Gert Wollny <gw.fossdev at gmail.com>
 Build-Depends: debhelper (>= 9),
- 	cmake, 
-	swig (>= 2.0), 
-	gccxml (>= 0.9.0+git20140716),
+ 	cmake (>= 2.8.9), 
+	swig3.0,
+	castxml,
 	zlib1g-dev (>= 1.2.2), 
 	libpng12-dev, 
 	libtiff-dev,
@@ -24,7 +24,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/insighttoolkit/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/insighttoolkit/trunk/
 
-Package: libinsighttoolkit4.7
+Package: libinsighttoolkit4.8
 Section: libs
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -44,7 +44,7 @@
 Package: libinsighttoolkit4-dev
 Section: libdevel
 Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.7 (= ${binary:Version}), libgdcm2-dev, libdcmtk2-dev, libhdf5-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.8 (= ${binary:Version}), libgdcm2-dev, libdcmtk2-dev, libhdf5-dev
 Recommends: libfftw3-dev, uuid-dev
 Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev
 Replaces: libinsighttoolkit-dev
@@ -67,7 +67,7 @@
 Priority: extra
 Section: debug
 Architecture: amd64 i386
-Depends: ${misc:Depends}, libinsighttoolkit4.7 (= ${binary:Version})
+Depends: ${misc:Depends}, libinsighttoolkit4.8 (= ${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

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2015-07-19 15:00:00 UTC (rev 19677)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2015-07-19 23:00:51 UTC (rev 19678)
@@ -6,9 +6,9 @@
 Uploaders: Steve M. Robbins <smr at debian.org>,
            Gert Wollny <gw.fossdev at gmail.com>
 Build-Depends: debhelper (>= 9),
- 	cmake, 
-	swig (>= 2.0), 
-	gccxml (>= 0.9.0+git20140716),
+ 	cmake (>= 2.8.9), 
+	swig3.0,
+	castxml,
 	zlib1g-dev (>= 1.2.2), 
 	libpng12-dev, 
 	libtiff-dev,

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2015-07-19 15:00:00 UTC (rev 19677)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2015-07-19 23:00:51 UTC (rev 19678)
@@ -1,5 +1,2 @@
 nrrdio-linking.patch
 bsd-hdf5.patch
-0005-make-gdcm-helper-library-static.patch
-0003_correct_bsplinecontrolpointimagefunction_pointtype.patch
-vcl-dunno-about-this-gcc.patch

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2015-07-19 15:00:00 UTC (rev 19677)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2015-07-19 23:00:51 UTC (rev 19678)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 VER_MAJOR = 4
-VER_MINOR = 7
+VER_MINOR = 8
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
@@ -37,10 +37,12 @@
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-DUSE_FFTWF=$(ENABLE_FFTW) \
+	-DITK_FORBID_DOWNLOADS:BOOL=ON \
 	-DITK_USE_FFTWD:BOOL=$(ENABLE_FFTW) \
 	-DITK_USE_FFTWF:BOOL=$(ENABLE_FFTW) \
 	-DITK_USE_SYSTEM_FFTW:BOOL=$(ENABLE_FFTW) \
 	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
+	-DITK_USE_SYSTEM_LIBRARIES:BOOL=ON \
 	-DITK_USE_SYSTEM_DCMTK:BOOL=ON \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 	-DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=OFF \
@@ -50,7 +52,6 @@
 	-DITK_USE_SYSTEM_TIFF:BOOL=ON \
 	-DITK_USE_SYSTEM_VXL:BOOL=OFF \
 	-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
-	-DITK_USE_SYSTEM_GCCXML:BOOL=ON \
 	-DModule_ITKDCMTK:BOOL=ON \
 	-DModule_ITKIOPhilipsREC:BOOL=OFF \
 	-DModule_ITKLevelSetsv4Visualization:BOOL=OFF \
@@ -61,8 +62,9 @@
 	-DModule_ITKDeprecated:BOOL=ON \
 	-DITKV3_COMPATIBILITY:BOOL=ON \
 	-DVCL_INCLUDE_CXX_0X:BOOL=ON \
-        -DITK_USE_SYSTEM_SWIG:BOOL=ON \
-        -DITK_WRAP_DIMS="2;3;4" \
+	-DITK_USE_SYSTEM_SWIG:BOOL=ON \
+	-DITK_USE_SYSTEM_CASTXML:BOOL=ON \
+	-DITK_WRAP_DIMS="2;3;4" \
 	-DITK_WRAP_unsigned_long:BOOL=ON \
 	-DITK_WRAP_double:BOOL=ON \
         -DITK_WRAP_vector_double:BOOL=ON \