[pyfai] 02/02: fix for real the fabio patch

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository pyfai.

commit 54d2ebef39fa4e9abb871cc014bee482e645c5bb
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sun Mar 27 15:52:59 2016 +0200

    fix for real the fabio patch
---
 debian/changelog                                         |  8 ++++++++
 .../patches/0003-fix-from-upstream-for-fabio-3.x.patch   | 16 +++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18599c9..91bcc92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pyfai (0.11.0+dfsg-5) unstable; urgency=medium
+
+  * debian/patch
+    + 0003-fix-from-upstream-for-fabio-3.x.patch (updated)
+      previous patch was wrong.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 27 Mar 2016 15:51:21 +0200
+
 pyfai (0.11.0+dfsg-4) unstable; urgency=medium
 
   * debian/control
diff --git a/debian/patches/0003-fix-from-upstream-for-fabio-3.x.patch b/debian/patches/0003-fix-from-upstream-for-fabio-3.x.patch
index 61cb8e3..3fbdbd8 100644
--- a/debian/patches/0003-fix-from-upstream-for-fabio-3.x.patch
+++ b/debian/patches/0003-fix-from-upstream-for-fabio-3.x.patch
@@ -1,16 +1,17 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sat, 26 Mar 2016 15:25:02 +0100
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Sun, 27 Mar 2016 15:50:40 +0200
 Subject: fix from upstream for fabio 3.x
 
 ---
- pyFAI-src/azimuthalIntegrator.py | 43 +++++++++++++++++++---------------------
- 1 file changed, 20 insertions(+), 23 deletions(-)
+ pyFAI-src/azimuthalIntegrator.py | 44 +++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 23 deletions(-)
 
 diff --git a/pyFAI-src/azimuthalIntegrator.py b/pyFAI-src/azimuthalIntegrator.py
-index 78b413a..36c8e62 100644
+index 78b413a..f064ba1 100644
 --- a/pyFAI-src/azimuthalIntegrator.py
 +++ b/pyFAI-src/azimuthalIntegrator.py
-@@ -3340,27 +3340,25 @@ class AzimuthalIntegrator(Geometry):
+@@ -3340,27 +3340,26 @@ class AzimuthalIntegrator(Geometry):
              return
  
          dim1_unit = units.to_unit(dim1_unit)
@@ -37,6 +38,7 @@ index 78b413a..36c8e62 100644
 -                  }
 +        try:
 +            from collections import OrderedDict
++            header = OrderedDict()
 +        except ImportError:
 +            header = {}
 +
@@ -57,7 +59,7 @@ index 78b413a..36c8e62 100644
  
          if self.splineFile:
              header["spline"] = str(self.splineFile)
-@@ -3380,8 +3378,7 @@ class AzimuthalIntegrator(Geometry):
+@@ -3380,8 +3379,7 @@ class AzimuthalIntegrator(Geometry):
              header["key"] = f2d[key]
          try:
              img = fabio.edfimage.edfimage(data=I.astype("float32"),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git