[Pkg-octave-commit] [SCM] Debian packaging for octave-image branch, master, updated. 2a33af7f881f52ceee040f929e4823ecea4342c7

Rafael Laboissiere rafael at laboissiere.net
Sun Mar 11 12:16:21 UTC 2012


The following commit has been merged in the master branch:
commit 957f8400a1c588790d959f51107582aca7a4b73e
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 11 11:46:03 2012 +0100

    Drop patch fix-tests (applied upstream)

diff --git a/debian/patches/fix-tests b/debian/patches/fix-tests
deleted file mode 100644
index c1e5d80..0000000
--- a/debian/patches/fix-tests
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Thomas Weber <tweber at debian.org>
-Subject: Fix test failures due to strict type checking of matrices
-Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave?view=revision&revision=8203
---- a/src/bwlabel.cc
-+++ b/src/bwlabel.cc
-@@ -298,7 +298,7 @@
- }
- 
- /*
--%!assert(bwlabel([0 1 0; 0 0 0; 1 0 1]),[0 1 0; 0 0 0; 2 0 3]);
-+%!assert(bwlabel(logical([0 1 0; 0 0 0; 1 0 1])),[0 1 0; 0 0 0; 2 0 3]);
- */
- 
- 
---- a/inst/imtophat.m
-+++ b/inst/imtophat.m
-@@ -56,7 +56,7 @@
- %!test
- %! I = [1 1 1; 1 1 1; 1 1 1;];
- %! se = [1 1; 0 1;];
--%! result = imtophat(I, se);
-+%! result = logical(imtophat(I, se));
- %! expected = 0.5 < [0 0 1; 0 0 1; 1 1 1];
- %! assert(expected, result);
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fefe0ff..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-fix-tests

-- 
Debian packaging for octave-image



More information about the Pkg-octave-commit mailing list