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

Sébastien Villemot sebastien.villemot at ens.fr
Tue Apr 17 13:35:10 UTC 2012


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

    linkage-clear-lastwarn.patch: remove patch, applied upstream

diff --git a/debian/patches/linkage-clear-lastwarn.patch b/debian/patches/linkage-clear-lastwarn.patch
deleted file mode 100644
index 1ccf126..0000000
--- a/debian/patches/linkage-clear-lastwarn.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Clear last warning state in linkage test
- This patch clears the state of the last warning before running warning-based
- tests in the linkage function. This is necessary when we run the whole package
- testsuite in a single shot: if a previous test emits a warning, the test in
- linkage will fail. This may be the symptom of a bug in Octave, see:
- https://savannah.gnu.org/bugs/index.php?35850
-Author: Sébastien Villemot <sebastien.villemot at ens.fr>
-Forwarded: http://comments.gmane.org/gmane.comp.gnu.octave.devel/6964
-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
-+++ b/inst/linkage.m
-@@ -217,6 +217,7 @@
- %!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);
-+%! 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/series b/debian/patches/series
index 86f34a0..68a7154 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 data-files-for-tests.diff
-linkage-clear-lastwarn.patch

-- 
Debian packaging for octave-statistics



More information about the Pkg-octave-commit mailing list