Author: gert-guest
Date: 2015-12-21 17:04:30 +0000 (Mon, 21 Dec 2015)
New Revision: 20853
Modified:
trunk/packages/insighttoolkit/trunk/debian/changelog
trunk/packages/insighttoolkit/trunk/debian/control
trunk/packages/insighttoolkit/trunk/debian/patches/series
trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Prepare compile against new gdcm-2.6
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2015-12-21
16:58:54 UTC (rev 20852)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2015-12-21
17:04:30 UTC (rev 20853)
@@ -1,9 +1,9 @@
insighttoolkit4 (4.8.2-2) UNRELEASED; urgency=medium
- * d/rules, d/control: Enable use of system double-conversion
- Closes: #733629
+ * Restrict dependencies to use gdcm-2.6 >= 2.6.1-3 or gdcm-2.4
+ Closes: #808491
- -- Gert Wollny <gw.foss...@gmail.com> Wed, 02 Dec 2015 15:45:56 +0100
+ -- Gert Wollny <gw.foss...@gmail.com> Wed, 21 Dec 2015 18:03:56 +0100
insighttoolkit4 (4.8.2-1) unstable; urgency=medium
Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control 2015-12-21 16:58:54 UTC
(rev 20852)
+++ trunk/packages/insighttoolkit/trunk/debian/control 2015-12-21 17:04:30 UTC
(rev 20853)
@@ -15,7 +15,7 @@
libtiff-dev,
libfftw3-dev,
libdcmtk-dev (>= 3.6.1~20150629-7),
- libgdcm2-dev,
+ libgdcm2-dev (>= 2.6.1-3 | < 2.6.0),
uuid-dev,
libcharls-dev,
libminc-dev,
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2015-12-21
16:58:54 UTC (rev 20852)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2015-12-21
17:04:30 UTC (rev 20853)
@@ -1,3 +1,3 @@
nrrdio-linking.patch
bsd-hdf5.patch
-itk-4.8.2-find-doubleconversion.patch
+#itk-4.8.2-find-doubleconversion.patch
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2015-12-21 16:58:54 UTC
(rev 20852)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2015-12-21 17:04:30 UTC
(rev 20853)
@@ -28,7 +28,7 @@
-DITK_USE_FFTWF:BOOL=$(ENABLE_FFTW) \
-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
-DITK_USE_SYSTEM_DCMTK:BOOL=ON \
- -DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=ON \
+ -DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=OFF \
-DITK_USE_SYSTEM_FFTW:BOOL=$(ENABLE_FFTW) \
-DITK_USE_SYSTEM_GDCM:BOOL=ON \
-DITK_USE_SYSTEM_HDF5:BOOL=ON \
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
