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

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 8cdd6a001773134bc2a6e65ff66353cb025c0851
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Thu Mar 15 08:21:07 2012 +0100

    Indicate that patches have been applied upstream
    
    Git-Dch: Ignore

diff --git a/debian/patches/combnk-cells.patch b/debian/patches/combnk-cells.patch
index 54be094..b4012c3 100644
--- a/debian/patches/combnk-cells.patch
+++ b/debian/patches/combnk-cells.patch
@@ -5,6 +5,7 @@ Description: Fix combnk with cell arrays
  %! assert (c, {1, 2; 1, 3; 2, 3});
 Author: Sébastien Villemot <sebastien.villemot at ens.fr>
 Forwarded: http://comments.gmane.org/gmane.comp.gnu.octave.devel/6964
+Applied-Upstream: commit: 9888
 Last-Update: 2012-03-14
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/linkage-clear-lastwarn.patch b/debian/patches/linkage-clear-lastwarn.patch
index ba51a2d..2e6b4a3 100644
--- a/debian/patches/linkage-clear-lastwarn.patch
+++ b/debian/patches/linkage-clear-lastwarn.patch
@@ -6,7 +6,8 @@ Description: Clear last warning state in linkage test
  totally sure.
 Author: Sébastien Villemot <sebastien.villemot at ens.fr>
 Forwarded: http://comments.gmane.org/gmane.comp.gnu.octave.devel/6964
-Last-Update: 2012-03-14
+Applied-Upstream: commit: 9891
+Last-Update: 2012-03-15
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/inst/linkage.m
@@ -15,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  %!assert (cond (linkage (pdist (x), "complete")),  21.793345,t);
  %!assert (cond (linkage (pdist (x), "average")),   27.045012,t);
  %!assert (cond (linkage (pdist (x), "weighted")),  27.412889,t);
-+%!test lastwarn() % Clear last warning
++%! lastwarn(); # Clear last warning before the test
  %!warning <monotonically> linkage (pdist (x), "centroid");
  %!test warning off clustering
  %! assert (cond (linkage (pdist (x), "centroid")), 27.457477,t);
diff --git a/debian/patches/normalise_distribution-index-scalar.patch b/debian/patches/normalise_distribution-index-scalar.patch
index 8646ec0..ffc7780 100644
--- a/debian/patches/normalise_distribution-index-scalar.patch
+++ b/debian/patches/normalise_distribution-index-scalar.patch
@@ -6,6 +6,7 @@ Description: Fix normalise_distribution under Octave 3.6
  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/

-- 
Debian packaging for octave-statistics