[med-svn] [Git][med-team/simpleitk][master] 5 commits: Cherry-pick upstream fix for FTBFS on i386

[Ghislain Antony Vaillant]

Ghislain Antony Vaillant pushed to branch master at Debian Med / simpleitk


Commits:
2b4c44a2 by Ghislain Antony Vaillant at 2018-03-11T09:36:58+00:00
Cherry-pick upstream fix for FTBFS on i386

Gbp-Dch: Short
Thanks: Adrian Bunk for reporting
Closes: #892459

- - - - -
7641e4df by Ghislain Antony Vaillant at 2018-03-11T09:38:21+00:00
Point the VCS URIs to salsa.debian.org

- - - - -
f05be5fc by Ghislain Antony Vaillant at 2018-03-11T09:38:55+00:00
Bump the debhelper version to 11

- - - - -
f7dd90a8 by Ghislain Antony Vaillant at 2018-03-11T09:39:19+00:00
Bump the standards version to 4.1.3

- - - - -
9402c474 by Ghislain Antony Vaillant at 2018-03-11T09:39:47+00:00
Release to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/Relax-the-short-image-testing-tolerance.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+simpleitk (1.0.1-2) unstable; urgency=medium
+
+  * Cherry-pick upstream fix for FTBFS on i386.
+    Thanks to Adrian Bunk for reporting (Closes: #892459)
+  * Point the VCS URIs to salsa.debian.org
+  * Bump the debhelper version to 11
+  * Bump the standards version to 4.1.3
+
+ -- Ghislain Antony Vaillant <ghisvail at gmail.com>  Sun, 11 Mar 2018 09:39:38 +0000
+
 simpleitk (1.0.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #740296)


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Ghislain Antony Vaillant <ghisvail at gmail.com>
 Section: libs
 Priority: optional
 Build-Depends: cmake (>= 3.0),
-               debhelper (>= 10),
+               debhelper (>= 11),
                dh-python,
                dpkg-dev (>= 1.17.14),
                googletest <!nocheck>,
@@ -15,9 +15,9 @@ Build-Depends: cmake (>= 3.0),
                python3-numpy,
                python3-setuptools,
                swig (>= 3.0.12)
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/simpleitk.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/simpleitk.git
+Standards-Version: 4.1.3
+Vcs-Browser: https://salsa.debian.org/med-team/simpleitk
+Vcs-Git: https://salsa.debian.org/med-team/simpleitk.git
 Homepage: http://www.simpleitk.org/
 
 Package: libsimpleitk1.0


=====================================
debian/patches/Relax-the-short-image-testing-tolerance.patch
=====================================
--- /dev/null
+++ b/debian/patches/Relax-the-short-image-testing-tolerance.patch
@@ -0,0 +1,31 @@
+From: Bradley Lowekamp <blowekamp at mail.nih.gov>
+Date: Thu, 8 Mar 2018 09:14:49 -0500
+Subject: Relax the "short" image testing tolerance for discrete Gaussian
+
+
+On the i386 Debian build, it has been reported that the
+BasicFilters.DiscreteGaussianImageFilter_short test is failing with a
+RMS difference of 0.513965. This tolerance has already been relaxed
+once, and further relaxing seems reasonable due to intermediate image
+of float being converted to short without proper rounding.
+
+While this is an indication the internal ITK algorithm could be
+improved for portability and accuracy in ITK, it is not an indication
+of a problem with the SimpleITK build.
+---
+ Code/BasicFilters/json/DiscreteGaussianImageFilter.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Code/BasicFilters/json/DiscreteGaussianImageFilter.json b/Code/BasicFilters/json/DiscreteGaussianImageFilter.json
+index ee9f677..3c23348 100644
+--- a/Code/BasicFilters/json/DiscreteGaussianImageFilter.json
++++ b/Code/BasicFilters/json/DiscreteGaussianImageFilter.json
+@@ -57,7 +57,7 @@
+       "tag" : "short",
+       "description" : "Simply run with a short image with default settings",
+       "settings" : [],
+-      "tolerance" : "0.5",
++      "tolerance" : "0.6",
+       "inputs" : [
+         "Input/RA-Slice-Short.nrrd"
+       ]


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Fix-build-with-ITKV3_COMPATIBILITY-enabled.patch
 Fix-path-created-for-output-of-4D-images-in-test.patch
+Relax-the-short-image-testing-tolerance.patch



View it on GitLab: https://salsa.debian.org/med-team/simpleitk/compare/1c197193c232322d9cade3a8eb3b397731858bc3...9402c474cd4e95a1174acd592e9b6d6346c52585

---
View it on GitLab: https://salsa.debian.org/med-team/simpleitk/compare/1c197193c232322d9cade3a8eb3b397731858bc3...9402c474cd4e95a1174acd592e9b6d6346c52585
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180311/ba51f3e9/attachment-0001.html>