[Pkg-octave-commit] [SCM] octave-image branch, master, updated. ead4bf1b99e43245bcabc50dfa9d5a1a78b61167

[Thomas Weber]

The following commit has been merged in the master branch:
commit 0f76b4125a12cf9e36c37d42c1b74ef9bc061ef2
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sun May 2 18:20:11 2010 +0200

    Drop patches (applied upstream)

diff --git a/debian/changelog b/debian/changelog
index 8ae1fdb..742012a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ octave-image (1.0.12-1) UNRELEASED; urgency=low
     - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders 
   * Switch to dpkg-source 3.0 (quilt) format
   * Bump Standards-Version to 3.8.4 (no changes needed)
+  * Drop patches (applied upstream):
+    - fix_failing_test_in_qtdecomp
+    - fix_uppercase_variable
+    - replace_obsoleted_spfind
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 22:31:32 +0100
 
diff --git a/debian/patches/fix_failing_test_in_qtdecomp b/debian/patches/fix_failing_test_in_qtdecomp
deleted file mode 100644
index 19f95ca..0000000
--- a/debian/patches/fix_failing_test_in_qtdecomp
+++ /dev/null
@@ -1,53 +0,0 @@
-Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/image/inst/qtdecomp.m?r1=6784&r2=4585
-Description: Fix a failing test in qtdecomp, due to the use of whitespace.
---- a/inst/qtdecomp.m
-+++ b/inst/qtdecomp.m
-@@ -269,37 +269,28 @@
- %!test
- %! R=[[B4,[B2,B2;B2,B2]]; [[B2,B2;B2,B2],B4]];
- %! assert(full(qtdecomp(A,10,2)), R);
-+%!
-+%! assert(full(qtdecomp(A,100,[2, 4])), [B4,B4;B4,B4]);
- 
--%!assert(full(qtdecomp(A,100,[2, 4])), [B4,B4;B4,B4]);
--
--%!function y = f(A,c1,c2,c3)
--%! if (nargin < 2)
--%!   c1 = 54;
--%! endif
--%! if (nargin < 3)
--%!   c2 = 0;
--%! endif
--%! if (nargin < 4)
--%!   c3 = 0;
--%! endif
--%! y = (A(1,1,:)!=((c1+c2+c3)*ones(1,1,size(A,3))))(:);
--
--%!assert(full(qtdecomp(A, at f)),[ones(4),B4;ones(4,8)]); 
--%!assert(full(qtdecomp(A, at f,54)),[ones(4),B4;ones(4,8)]);
--%!assert(full(qtdecomp(A, at f,4,40,10)),[ones(4),B4;ones(4,8)]);
-+%!test
-+%! f = @(A, c1 = 54, c2 = 0, c3 = 0) y = (A (1, 1, :) != ((c1+c2+c3) * ones (1, 1, size (A, 3))))(:);
-+%!
-+%! assert(full(qtdecomp(A,f)),[ones(4),B4;ones(4,8)]);
-+%! assert(full(qtdecomp(A,f,54)),[ones(4),B4;ones(4,8)]);
-+%! assert(full(qtdecomp(A,f,4,40,10)),[ones(4),B4;ones(4,8)]);
- 
--%!# no params
- %!test
-+%!# no params
- %! first_eq=inline("(A(1,1,:)!=(54*ones(1,1,size(A,3))))(:)","A");
- %! assert(full(qtdecomp(A,first_eq)),[ones(4),B4;ones(4,8)]); 
- 
--%!# 1 param
- %!test
-+%!# 1 param
- %! first_eq=inline("(A(1,1,:)!=(c*ones(1,1,size(A,3))))(:)","A","c");
- %! assert(full(qtdecomp(A,first_eq,54)),[ones(4),B4;ones(4,8)]); 
- 
--%!# 3 params
- %!test
-+%!# 3 params
- %! first_eq=inline("(A(1,1,:)!=((c1+c2+c3)*ones(1,1,size(A,3))))(:)","A","c1","c2","c3");
- %! assert(full(qtdecomp(A,first_eq,4,40,10)),[ones(4),B4;ones(4,8)]); 
- 
diff --git a/debian/patches/fix_uppercase_variable b/debian/patches/fix_uppercase_variable
deleted file mode 100644
index a741002..0000000
--- a/debian/patches/fix_uppercase_variable
+++ /dev/null
@@ -1,21 +0,0 @@
-Subject: Fix wrongly uppercased variable name
-Origin: upstream,http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/image/inst/imtophat.m?pathrev=6692&view=diff&r1=6692&r2=4788&diff_format=h 
-Bug-Debian: http://bugs.debian.org/557579
---- a/inst/imtophat.m
-+++ b/inst/imtophat.m
-@@ -30,6 +30,14 @@
-   endif
-   
-   ## Perform filtering
--  retval = im & !imopen(im, SE);
-+  retval = im & !imopen(im, se);
- 
- endfunction
-+
-+%!test
-+%! I = [1 1 1; 1 1 1; 1 1 1;];
-+%! se = [1 1; 0 1;];
-+%! result = imtophat(I, se);
-+%! expected = 0.5 < [0 0 1; 0 0 1; 1 1 1];
-+%! assert(expected, result);
-+
diff --git a/debian/patches/replace_obsoleted_spfind b/debian/patches/replace_obsoleted_spfind
deleted file mode 100644
index f4897b1..0000000
--- a/debian/patches/replace_obsoleted_spfind
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/inst/qtgetblk.m
-+++ b/inst/qtgetblk.m
-@@ -47,7 +47,7 @@
-   endif
- 
-   ## get blocks
--  [i,j,v]=spfind(S);
-+  [i,j,v]=find(S);
- 
-   ## filter the ones which match dim
-   idx=find(v==dim);
---- a/inst/qtsetblk.m
-+++ b/inst/qtsetblk.m
-@@ -33,7 +33,7 @@
-   endif
- 
-   ## get blocks
--  [ii,ji,v]=spfind(S);
-+  [ii,ji,v]=find(S);
- 
-   ## filter the ones which match dim
-   idx=find(v==dim);
diff --git a/debian/patches/series b/debian/patches/series
index 5549e84..8d1c8b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-replace_obsoleted_spfind
-fix_uppercase_variable
-fix_failing_test_in_qtdecomp
+ 

-- 
octave-image