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

[Mathieu Malaterre]

Author: malat
Date: 2014-02-12 13:37:13 +0000 (Wed, 12 Feb 2014)
New Revision: 16018

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/doubleconv.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Use convenient copy for now

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2014-02-12 12:47:41 UTC (rev 16017)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2014-02-12 13:37:13 UTC (rev 16018)
@@ -3,7 +3,6 @@
   * Team upload.
   * Prefer system install GDCM. Closes: #728121
   * Depends on dcmtk headers. Closes: #734590
-  * Prefer system installed double conversion. Closes: #733629
   * Use Depends: libtiff-dev. Closes: #736128
 
  -- Mathieu Malaterre <malat at debian.org>  Wed, 12 Feb 2014 12:49:24 +0100

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/doubleconv.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/doubleconv.patch	2014-02-12 12:47:41 UTC (rev 16017)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/doubleconv.patch	2014-02-12 13:37:13 UTC (rev 16018)
@@ -1,36 +1,9 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- insighttoolkit4 (4.5.0-3) unstable; urgency=low
- .
-   * Team upload.
-   * Prefer system install GDCM. Closes: #728121
-   * Depends on dcmtk headers. Closes: #734590
-   * Prefer system installed double conversion. Closes: #733629
-   * Use Depends: libtiff-dev. Closes: #736128
+Description: Upstream provides an option to build against
+ a system installed double conversion but it appears as
+ broken at least on Debian
 Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/728121
 Bug-Debian: http://bugs.debian.org/733629
-Bug-Debian: http://bugs.debian.org/734590
-Bug-Debian: http://bugs.debian.org/736128
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
 --- insighttoolkit4-4.5.0.orig/Modules/Core/Common/src/CMakeLists.txt
 +++ insighttoolkit4-4.5.0/Modules/Core/Common/src/CMakeLists.txt
 @@ -108,6 +108,7 @@ endif()

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2014-02-12 12:47:41 UTC (rev 16017)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2014-02-12 13:37:13 UTC (rev 16018)
@@ -1,4 +1,3 @@
 nrrdio-linking.patch
 bsd-hdf5.patch
-
-doubleconv.patch
+#doubleconv.patch

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2014-02-12 12:47:41 UTC (rev 16017)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2014-02-12 13:37:13 UTC (rev 16018)
@@ -27,7 +27,7 @@
 	-DITK_USE_SYSTEM_DCMTK:BOOL=ON \
 	-DITK_USE_SYSTEM_FFTW:BOOL=OFF \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
-	-DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=ON \
+	-DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=OFF \
 	-DITK_USE_SYSTEM_HDF5:BOOL=OFF \
 	-DITK_USE_SYSTEM_JPEG:BOOL=ON \
 	-DITK_USE_SYSTEM_PNG:BOOL=ON \