* Carnë Draug <[email protected]> [2012-11-11 13:34]:
Fix with r11422. Can I further help with this by creating a proper
COPYRIGHT file for the package? I already tried to follow the debian
upstream guide http://wiki.debian.org/UpstreamGuide#Licenses that asks
to list each file and its license.
This is not really necessary, but may help. When putting together
Debian packages, We use a tool called licencecheck (in package
devscripts) that parses every upstream file and automatically generate a
copyright file according to DEP5 (http://dep.debian.net/deps/dep5/). This
file is further edited for reducing the number of stanzas. I am
attaching below the current debian/copyright file of the Debian package,
which gets installed as /usr/share/doc/octave-image/copyright.
On 11 November 2012 09:54, Rafael Laboissiere <[email protected]> wrote:
3) The function fftconv2 gives a wrong result when called like this:
"fftconv2 (vector1, vector2, matrix)", although this usage is advertised
in the help string. For the Debian package, I am planning to apply the
patch attached below, which (i) removes the advertisement from the help
string, (ii) gives an error message when the function is called with the
said usage and (iii) drop the tests with the said usage.
You forgot to attach the patch.
Sorry. Attached now.
I don't know what changed to make this usage stop working so I only
left a note on the source code and should not appear on the help
string (at least it doesn't on my system). Do not remove the tests,
mark them with xtest instead. I think I have done that before but
apparently forgot to commit. I'd give a warning instead of an error
since the reason it fails may be due to changes in the other functions
it uses and users with different versions may actually get the correct
results. Please see r11421.
Well, IMHO it is not a good idea to allow function to give results that
are known to be wrong. I will see with the other members of the DOG
(Debian Octave Group) how we should proceed while waiting for the fix
from upstream.
Thanks,
Rafael
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Image package for Octave
Upstream-Contact: The Octave Community <[email protected]>
Source: http://octave.sourceforge.net/image/
Files: *
Copyright: 1999-2001 Kai Habel <[email protected]>
1999, 2003 Andy Adler <[email protected]>
2000 Etienne Grossmann <[email protected]>
2000 Teemu Ikonen <[email protected]>
2000 Paul Kienzle <[email protected]>
2002 Jeff Orchard <[email protected]>
2002 Jeffrey E. Boyd <[email protected]>
2004 Josep Mones i Teixidor <[email protected]>
2004 Antti Niemistö <[email protected]>
2004 Stefan van der Walt <[email protected]>
2004, 2005, Justus H. Piater <[email protected]>
2005 Carvalho-Mariel
2005-2008, 2010 Søren Hauberg <[email protected]>
2007 Alexander Barth <[email protected]>
2008 Jonas Wagner <[email protected]>
2006, 2009 Stefan Gustavson <[email protected]>
2009 Roderick Koehle <[email protected]>
2009 Sergey Kirgizov
2010 Alex Opie <[email protected]>
2010 Andrew Kelly, IPS Radio & Space Services
2010-2012 Carnë Draug <[email protected]>
2011 Adrián del Pino <[email protected]>
2011 William Krekeler <[email protected]>
2011 Santiago Reyes González <[email protected]>
2011, 2012 Jordi Gutiérrez Hermoso <[email protected]>
2012 Adam H Aitkenhead <[email protected]>
2012 Rik Wehbring
2012 Pablo Rossi <[email protected]>
License: GPL-3+
Files: ./inst/immaximas.m
Copyright: 2003-2005, Peter Kovesi
License: MIT/X11 (BSD like)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, subject to the following conditions:
.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
.
The Software is provided "as is", without warranty of any kind.
Files: inst/bmpwrite.m inst/colfilt.m inst/colorgradient.m
Copyright: Paul Kienzle <[email protected]>
License: Public domain
This code is in the public domain.
Files: inst/fftconv2.m src/graycomatrix.cc src/hough_line.cc
Copyright: 2004, Stefan van der Walt <[email protected]>
License: BSD-2
This program is free software; redistribution and use in source and
binary forms, with or without modification, are permitted provided that
the following conditions are met:
.
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Files: debian/*
Copyright: 2008 Ólafur Jens Sigurðsson <[email protected]>
2008-2009, 2012 Rafael Laboissiere <[email protected]>
2008-2011 Thomas Weber <[email protected]>
License: GPL-3+
License: GPL-3+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General Public
License, version 3, can be found in the file
`/usr/share/common-licenses/GPL-3'.
Description: Drop usage of fftconv2 with two vectors and one matrix as arguments
Author: Rafael Laboissiere <[email protected]>
Last-Update: 2012-11-11
--- 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
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_nov
_______________________________________________
Octave-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/octave-dev
