[Pkg-octave-commit] [octave-image] 02/02: Refresh patches for new upstream version

Rafael Laboissière rlaboiss-guest at moszumanska.debian.org
Fri Jan 17 12:55:57 UTC 2014 

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-image.

commit 3bfe5a3ac73a377fd3af02f1f1df6b010522fb74
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri Jan 17 13:32:01 2014 +0100

    Refresh patches for new upstream version
    
    - autoload-yes.patch: refreshed
    - fftconv2-usage.patch: dropped (applied upstream)
    - use-imerode-and-imdilate.patch: dropped (applied upstream)
    - use-dpkg-buildflags.patch: refreshed
    - use__bwdist__.patch: dropped (applied upstream)
    
    Git-Dch: Full
---
 debian/patches/autoload-yes.patch             |  4 +--
 debian/patches/fftconv2-usage.patch           | 46 ---------------------------
 debian/patches/series                         |  3 --
 debian/patches/use-dpkg-buildflags.patch      |  6 ++--
 debian/patches/use-imerode-and-imdilate.patch | 30 -----------------
 debian/patches/use__bwdist__.patch            | 24 --------------
 6 files changed, 5 insertions(+), 108 deletions(-)

diff --git a/debian/patches/autoload-yes.patch b/debian/patches/autoload-yes.patch
index 64b95a7..619d3dc 100644
--- a/debian/patches/autoload-yes.patch
+++ b/debian/patches/autoload-yes.patch
@@ -1,12 +1,12 @@
 Description: Autoload the package
 Author: Rafael Laboissiere <rafael at laboissiere.net>
 Forwarded: not-needed
-Last-Update: 2012-11-10
+Last-Update: 2014-01-17
 
 --- a/DESCRIPTION
 +++ b/DESCRIPTION
 @@ -12,3 +12,4 @@
- Depends: octave (>= 3.6.0), signal (>= 1.2.0)
+ Depends: octave (>= 3.8.0), signal (>= 1.2.0), general (>= 1.3.0)
  License: GPLv3+, MIT, FreeBSD
  Url: http://octave.sf.net
 +Autoload: yes
diff --git a/debian/patches/fftconv2-usage.patch b/debian/patches/fftconv2-usage.patch
deleted file mode 100644
index faa6c2d..0000000
--- a/debian/patches/fftconv2-usage.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Drop usage of fftconv2 with two vectors and one matrix as arguments
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Bug: http://sourceforge.net/p/octave/bugs/130/
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664716
-Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=30084136
-Applied-Upstream: http://sourceforge.net/p/octave/image/ci/d1a33cc6897e3a504fa340b258a1537d2c6c08ba/
-Last-Update: 2013-06-25
-
---- octave-image-2.0.0.orig/inst/fftconv2.m
-+++ octave-image-2.0.0/inst/fftconv2.m
-@@ -23,7 +23,6 @@
- 
- ## -*- texinfo -*-
- ## @deftypefn {Function File} fftconv2 (@var{a}, @var{b}, @var{shape})
--## @deftypefnx{Function File} fftconv2 (@var{v1}, @var{v2}, @var{a}, @var{shape})
- ## Convolve 2 dimensional signals using the FFT.
- ##
- ## This method is faster but less accurate than @var{conv2} for large @var{a} and @var{b}.
-@@ -46,12 +45,8 @@ function X = fftconv2(varargin)
- 
-         ## usage: fftconv2(v1, v2, a[, shape])
- 
--        rowcolumn = 1;
--        v1 = varargin{1}(:)';
--        v2 = varargin{2}(:);
--        orig_a = varargin{3};
-+       error ("fftconv2: usage 'fftconv2(v1, v2, a[, shape])' is not yet implemented");
- 
--        if (nargin == 4) shape = varargin{4}; endif
-     else
-         ## usage: fftconv2(a, b[, shape])
- 
-@@ -106,13 +101,6 @@ endfunction
- %!assert(norm(fftconv2(b,a,'valid')-conv2(b,a,'valid')), 0, 1e6*eps)
- 
- %!# usage: fftconv2(v1, v2, a[, shape])
--%!##FIXME this usage seems to be broken...
--%!shared x,y,a
--%! x = 1:4; y = 4:-1:1; a = repmat(1:10, 5);
--%!assert(norm(fftconv2(x,y,a)-conv2(x,y,a)), 0, 1e6*eps)
--%!assert(norm(fftconv2(x,y,a,'full')-conv2(x,y,a,'full')), 0, 1e6*eps)
--%!assert(norm(fftconv2(x,y,a,'same')-conv2(x,y,a,'same')), 0, 1e6*eps)
--%!assert(norm(fftconv2(x,y,a,'valid')-conv2(x,y,a,'valid')), 0, 1e6*eps)
- 
- %!demo
- %! ## Draw a cross
diff --git a/debian/patches/series b/debian/patches/series
index 07872e6..d0dd8d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 autoload-yes.patch
-fftconv2-usage.patch
-use-imerode-and-imdilate.patch
 use-dpkg-buildflags.patch
-use__bwdist__.patch
diff --git a/debian/patches/use-dpkg-buildflags.patch b/debian/patches/use-dpkg-buildflags.patch
index 01729d7..f6aa545 100644
--- a/debian/patches/use-dpkg-buildflags.patch
+++ b/debian/patches/use-dpkg-buildflags.patch
@@ -2,7 +2,7 @@ Description: Enforce dpkg build flags
  The right build flags are stored in mkoctfile, so reuse them.
 Author: Sébastien Villemot <sebastien at debian.org>
 Forwarded: no
-Last-Update: 2012-11-12
+Last-Update: 2014-01-17
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/Makefile
@@ -14,5 +14,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -	CXXFLAGS='-g -O2 -std=c++0x -Wall' $(MKOCTFILE) $<
 +	CXXFLAGS='$(shell mkoctfile -p CXXFLAGS) -std=c++0x -Wall' $(MKOCTFILE) $<
  
- clean:
- 	rm -f *.o octave-core core *.oct *~
+ imerode.oct: imerode.cc strel.cc
+ 	$(MKOCTFILE) $^ -o $@
diff --git a/debian/patches/use-imerode-and-imdilate.patch b/debian/patches/use-imerode-and-imdilate.patch
deleted file mode 100644
index 70ae957..0000000
--- a/debian/patches/use-imerode-and-imdilate.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Do not use deprecated functions erode and dilate in bwmorph.m
-Author: Carnë Draug <carandraug+dev at gmail.com>
-Origin: upstream, http://sourceforge.net/p/octave/code/11420/tree//trunk/octave-forge/main/image/inst/bwmorph.m?diff=505e333171b75b10eb655d97:11419
-Reviewed-By: Rafael Laboissiere <rafael at laboissiere.net>
-Last-Update: 2012-11-11
-
---- octave-image-2.0.0.orig/inst/bwmorph.m
-+++ octave-image-2.0.0/inst/bwmorph.m
-@@ -450,17 +450,17 @@ function BW2 = bwmorph (BW, operation, n
- 
-     case('skel-lantuejoul')
-       ## init values
--      se=ones(3,3);              ## structuring element used everywhere
--      BW2=zeros(size(BW));       ## skeleton result
-+      se=true(3,3);              ## structuring element used everywhere
-+      BW2=false(size(BW));       ## skeleton result
-       eBW=BW;                    ## eBW will hold k-times eroded BW
-       i=1;
-       while i<=n
-         if(!any(eBW))            ## if erosion result is 0-matrix then
-           break;                 ## we are over
-         endif
--        BW2|=eBW-dilate(erode(eBW, se), se); ## eBW - opening operation on eBW
-+        BW2|=eBW-imdilate(imerode(eBW, se), se); ## eBW - opening operation on eBW
-                                              ## contributes to skeleton
--        eBW=erode(eBW,se);
-+        eBW=imerode(eBW,se);
-         i++;
-       endwhile
-       return;                    ## no general loop in this case
diff --git a/debian/patches/use__bwdist__.patch b/debian/patches/use__bwdist__.patch
deleted file mode 100644
index bef07ff..0000000
--- a/debian/patches/use__bwdist__.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix typo in function name __bwdist__
- This patch does not need forwarding as the .m file bwdist.m (which is fixed by
- the patch) has been removed upstream.
-Author: David Pirotte <david at altosw.be>
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712995
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712995
-Forwarded: not-needed
-Last-Update: 2013-06-25
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/inst/bwdist.m
-+++ b/inst/bwdist.m
-@@ -53,9 +53,9 @@
-   endif
- 
-   if (nargout < 2)
--    D = __bwdist(bw, method);
-+    D = __bwdist__(bw, method);
-   else
--    [D, C] = __bwdist(bw, method);
-+    [D, C] = __bwdist__(bw, method);
-   endif
- 
- endfunction

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-image.git

More information about the Pkg-octave-commit mailing list