Bug#853949: unblock: gnudatalanguage/0.9.7-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
please unblock gnudatalanguage in the upcoming (Feb 5) freeze.
It solves #852682 "[gnudatalanguage] Bug with defining arrays",
severity: important. Additionally, it completes the documentation.
Changelog entries:
gnudatalanguage (0.9.7-2) unstable; urgency=medium
* Revert an upstream patch that causes trouble with multidimensional
arrays. (Closes: #852682)
* Adjust failing CI tests
* Include PYTHON.txt in documentation
-- Ole Streicher <olebole@debian.org> Thu, 02 Feb 2017 10:02:21 +0100
The debdiff is attached. Requested commands:
unblock gnudatalanguage/0.9.7-2
diff -Nru gnudatalanguage-0.9.7/debian/changelog gnudatalanguage-0.9.7/debian/changelog
--- gnudatalanguage-0.9.7/debian/changelog 2017-01-22 10:26:18.000000000 +0100
+++ gnudatalanguage-0.9.7/debian/changelog 2017-02-02 10:02:21.000000000 +0100
@@ -1,3 +1,12 @@
+gnudatalanguage (0.9.7-2) unstable; urgency=medium
+
+ * Revert an upstream patch that causes trouble with multidimensional
+ arrays. (Closes: #852682)
+ * Adjust failing CI tests
+ * Include PYTHON.txt in documentation
+
+ -- Ole Streicher <olebole@debian.org> Thu, 02 Feb 2017 10:02:21 +0100
+
gnudatalanguage (0.9.7-1) unstable; urgency=low
* New upstream version 0.9.7. Switch back to unstable
diff -Nru gnudatalanguage-0.9.7/debian/gnudatalanguage.docs gnudatalanguage-0.9.7/debian/gnudatalanguage.docs
--- gnudatalanguage-0.9.7/debian/gnudatalanguage.docs 2017-01-07 10:20:33.000000000 +0100
+++ gnudatalanguage-0.9.7/debian/gnudatalanguage.docs 2017-02-02 10:01:57.000000000 +0100
@@ -1,3 +1,4 @@
AUTHORS
HACKING
README
+PYTHON.txt
diff -Nru gnudatalanguage-0.9.7/debian/patches/bugfix-852682.patch gnudatalanguage-0.9.7/debian/patches/bugfix-852682.patch
--- gnudatalanguage-0.9.7/debian/patches/bugfix-852682.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnudatalanguage-0.9.7/debian/patches/bugfix-852682.patch 2017-02-02 09:57:07.000000000 +0100
@@ -0,0 +1,52 @@
+From: Gilles Duvert <gilles-duvert@users.sourceforge.net>
+Date: Tue, 24 Jan 2017 10:05:41 +0000
+Subject: Reverted to previous version since correction of bug#709 was
+ making a mess with array dimensions.
+Bug: https://bugs.debian.org/852682
+
+---
+ src/accessdesc.hpp | 3 ++-
+ src/dimension.hpp | 16 +++++++++-------
+ 2 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/accessdesc.hpp b/src/accessdesc.hpp
+index 0309d11..b4d78a9 100644
+--- a/src/accessdesc.hpp
++++ b/src/accessdesc.hpp
+@@ -317,7 +317,8 @@ class DotAccessDescT
+ // dim >> topDim;
+ dim >> ix[d]->GetDim();
+ }
+- dim.Purge();
++// Was added to solve bug 709 but may have side effects.
++// dim.Purge();
+ }
+
+ private:
+diff --git a/src/dimension.hpp b/src/dimension.hpp
+index 6469648..1345ff5 100644
+--- a/src/dimension.hpp
++++ b/src/dimension.hpp
+@@ -378,13 +378,15 @@ class dimension
+ // throw away unused ranks (ie. ranks == 1)
+ void Purge()
+ {
+- //old version: produce bug #709
+-// for(; rank>1 && dim[rank-1] <= 1; --rank);
+- int m=rank-1;
+- for (; m>0; --m) if (dim[m]<=1) {
+- for (int j=m; j<rank-1; ++j) dim[j]=dim[j+1];
+- rank--;
+- }
++ //The following line produces bug #709
++ for(; rank>1 && dim[rank-1] <= 1; --rank);
++// However those following lines are too strict: test=fltarr(1, 1, 114) & help,test
++// gives: TEST FLOAT = Array[1, 114] instead of good answer TEST FLOAT = Array[1, 1, 114]
++// int m=rank-1;
++// for (; m>0; --m) if (dim[m]<=1) {
++// for (int j=m; j<rank-1; ++j) dim[j]=dim[j+1];
++// rank--;
++// }
+ }
+
+ // set the rank to r (pads 1s) if it is smaller than r
diff -Nru gnudatalanguage-0.9.7/debian/patches/series gnudatalanguage-0.9.7/debian/patches/series
--- gnudatalanguage-0.9.7/debian/patches/series 2017-01-22 10:23:10.000000000 +0100
+++ gnudatalanguage-0.9.7/debian/patches/series 2017-02-02 09:57:07.000000000 +0100
@@ -5,3 +5,4 @@
gdl-fun-fix
gdl-template.patch
hdf5-1.10.patch
+bugfix-852682.patch
diff -Nru gnudatalanguage-0.9.7/debian/python-gdl.docs gnudatalanguage-0.9.7/debian/python-gdl.docs
--- gnudatalanguage-0.9.7/debian/python-gdl.docs 1970-01-01 01:00:00.000000000 +0100
+++ gnudatalanguage-0.9.7/debian/python-gdl.docs 2017-02-02 10:01:57.000000000 +0100
@@ -0,0 +1 @@
+PYTHON.txt
diff -Nru gnudatalanguage-0.9.7/debian/tests/test-gdl.xfail gnudatalanguage-0.9.7/debian/tests/test-gdl.xfail
--- gnudatalanguage-0.9.7/debian/tests/test-gdl.xfail 2017-01-07 10:20:33.000000000 +0100
+++ gnudatalanguage-0.9.7/debian/tests/test-gdl.xfail 2017-02-02 09:57:07.000000000 +0100
@@ -1,4 +1,8 @@
# unknown why these tests fail
-test_bug_3285659
-test_routine_names
-test_la_least_squares
+test_bug_3275334
+test_fft_leak
+test_hdf5
+test_obj_isa
+test_qhull
+test_tv
+test_window_background
Reply to: