[Pkg-octave-commit] [SCM] Debian packaging for octave-statistics branch, master, updated. upstream/1.1.0-21-g6f80f80

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 6aa530c046faa7c4ba66d4ef8c494f552cea6805
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Wed Mar 14 21:22:51 2012 +0100

    debian/patches/normalise_distribution-index-scalar.patch: new patch

diff --git a/debian/patches/normalise_distribution-index-scalar.patch b/debian/patches/normalise_distribution-index-scalar.patch
new file mode 100644
index 0000000..8646ec0
--- /dev/null
+++ b/debian/patches/normalise_distribution-index-scalar.patch
@@ -0,0 +1,22 @@
+Description: Fix normalise_distribution under Octave 3.6
+ Upstream applied (in r9016) a workaround for a regression in Octave core 3.4
+ (bug#34765 in savannah). In r9028, upstream made this workaround apply to
+ Octave 3.4, but not to Octave 3.6, assuming that the bug has been fixed in
+ Octave 3.6. But obviously this is not the case as of Octave 3.6.1, so we still
+ need the workaround.
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Forwarded: http://comments.gmane.org/gmane.comp.gnu.octave.devel/6964
+Last-Update: 2012-04-13
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/inst/normalise_distribution.m
++++ b/inst/normalise_distribution.m
+@@ -198,7 +198,7 @@
+       ## differently depending on octave version. This applies the fix for all
+       ## 3.4 releases but it probably only appeared on 3.4.3 (can someone check?)
+       ## See https://savannah.gnu.org/bugs/index.php?34765
+-      if (compare_versions (OCTAVE_VERSION, "3.4", "<") || compare_versions (OCTAVE_VERSION, "3.6", ">"))
++      if (compare_versions (OCTAVE_VERSION, "3.4", "<"))
+         ## this is how it should work
+         f_remap = @( k ) ( normal ( k ) );
+         normalised ( :, k ) = arrayfun ( f_remap, target_indices );
diff --git a/debian/patches/series b/debian/patches/series
index d06deb4..5ee188d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 data-files-for-tests.diff
+normalise_distribution-index-scalar.patch
 remove-zscore.patch

-- 
Debian packaging for octave-statistics