[med-svn] r16566 - in trunk/packages/insighttoolkit/branches/3.20.1/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2014-04-04 15:54:45 +0000 (Fri, 04 Apr 2014)
New Revision: 16566

Added:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/snan-sanity.patch
Modified:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
   trunk/packages/insighttoolkit/branches/3.20.1/debian/control
   trunk/packages/insighttoolkit/branches/3.20.1/debian/control.in
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
Log:
Prepare next upload

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2014-04-04 15:39:26 UTC (rev 16565)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2014-04-04 15:54:45 UTC (rev 16566)
@@ -1,3 +1,12 @@
+insighttoolkit (3.20.1+git20120521-5) unstable; urgency=low
+
+  * 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 <costamagnagianfranco at yahoo.it>  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

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/control
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/control	2014-04-04 15:39:26 UTC (rev 16565)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/control	2014-04-04 15:54:45 UTC (rev 16566)
@@ -34,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

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/control.in	2014-04-04 15:39:26 UTC (rev 16565)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/control.in	2014-04-04 15:54:45 UTC (rev 16566)
@@ -34,8 +34,8 @@
 Package: libinsighttoolkit at VER_MAJOR@-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libinsighttoolkit at SOVERSION@ (= ${binary:Version}), libgdcm2-dev
-Recommends: libfftw3-dev, uuid-dev
+Depends: ${misc:Depends}, libinsighttoolkit at SOVERSION@ (= ${binary:Version}), libgdcm2-dev, libfftw3-dev
+Recommends: uuid-dev
 Conflicts: libinsighttoolkit-dev
 Replaces: libinsighttoolkit-dev
 Suggests: insighttoolkit at VER_MAJOR@-examples

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series	2014-04-04 15:39:26 UTC (rev 16565)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series	2014-04-04 15:54:45 UTC (rev 16566)
@@ -15,3 +15,4 @@
 bug667417.patch
 nan-i386.patch
 #tiff5.patch
+snan-sanity.patch

Added: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/snan-sanity.patch
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/snan-sanity.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/snan-sanity.patch	2014-04-04 15:54:45 UTC (rev 16566)
@@ -0,0 +1,17 @@
+Index: insighttoolkit-3.20.1+git20120521/Utilities/NrrdIO/sane.c
+===================================================================
+--- insighttoolkit-3.20.1+git20120521.orig/Utilities/NrrdIO/sane.c	2012-09-11 17:25:06.000000000 +0000
++++ insighttoolkit-3.20.1+git20120521/Utilities/NrrdIO/sane.c	2012-09-11 17:39:19.196189762 +0000
+@@ -115,7 +115,11 @@
+  ( defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__  >= 7 )))
+          /* don't compare airFP_SNAN */
+ #else
+-         && airFP_SNAN == airFPClass_f(AIR_SNAN) 
++         /* we don't bother checking for 
++            airFP_SNAN == airFPClass_f(AIR_SNAN) because
++            the signal-ness of the NaN is not preserved in
++            float conversion */
++         /* && airFP_SNAN == airFPClass_f(AIR_SNAN) */
+ #endif
+          && airFP_QNAN == airFPClass_d(AIR_NAN)
+          && airFP_QNAN == airFPClass_d(AIR_QNAN) )) {