[Pkg-octave-commit] [SCM] Debian packaging for octave-statistics branch, master, updated. debian/1.1.0-1-14-g7247561

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 0b9693bc3c3b7022abe5fde9cd30aa300bde045c
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Tue Apr 17 14:48:15 2012 +0200

    normalise_distribution-index-scalar.patch: remove patch, applied upstream

diff --git a/debian/patches/normalise_distribution-index-scalar.patch b/debian/patches/normalise_distribution-index-scalar.patch
deleted file mode 100644
index ffc7780..0000000
--- a/debian/patches/normalise_distribution-index-scalar.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-Applied-Upstream: commit: 9887
-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 20d214c..d0b8f53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 data-files-for-tests.diff
-normalise_distribution-index-scalar.patch
 remove-zscore.patch
 combnk-cells.patch
 linkage-clear-lastwarn.patch

-- 
Debian packaging for octave-statistics