[Pkg-octave-commit] r1635 - in octave-forge-pkgs: . octave-image/trunk/debian

Sat Apr 12 20:59:54 UTC 2008

Author: rafael
Date: 2008-04-12 20:59:54 +0000 (Sat, 12 Apr 2008)
New Revision: 1635

Modified:
   octave-forge-pkgs/TODO
   octave-forge-pkgs/octave-image/trunk/debian/copyright
Log:
Update copyright info for octave-image

Modified: octave-forge-pkgs/TODO
===================================================================

--- octave-forge-pkgs/TODO	2008-04-12 19:32:30 UTC (rev 1634)
+++ octave-forge-pkgs/TODO	2008-04-12 20:59:54 UTC (rev 1635)
@@ -17,11 +17,12 @@
 general
 gsl
 ident
-image
-informationtheory
-io
-irsa
 
+image:
+        src/__magick_read__.cc (no copyright statement)
+
+        bwimage.cc (no license conditions)
+
 linear-algebra:
         src/test_gsvd.m (no copyright statement, it is just a test script)
 

Modified: octave-forge-pkgs/octave-image/trunk/debian/copyright
===================================================================
--- octave-forge-pkgs/octave-image/trunk/debian/copyright	2008-04-12 19:32:30 UTC (rev 1634)
+++ octave-forge-pkgs/octave-image/trunk/debian/copyright	2008-04-12 20:59:54 UTC (rev 1635)
@@ -1,54 +1,156 @@
-This package was debianized by Olafur Jens Sigurdsson <ojsbug at gmail.com> on
-Sat, 09 Feb 2008 14:02:44 +0100
+Original source may be found at http://octave.sf.net.
 
-It was downloaded from http://octave.sf.net
+Files: inst/bwlabel.m, inst/bwborder.m
+Copyright: © 2000 Etienne Grossmann
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
 
-Upstream Authors:
+Files: inst/imginfo.m
+Copyright: © 2002 Etienne Grossmann
+License: GPL-2+
+ This files is under the GPL, version 2 or later.
 
-	 Josep Mones i Teixidor <jmones at puntbarra.com>
-	 Pedro Felzenszwalb <pff at cs.uchicago.edu>
-	 Søren Hauber <hauberg at gmail dot com>
-	 Andy Adler
-	 Jeffrey E. Boyd
-	 Teemu Ikonen <tpikonen at pcu.helsinki.fi>
-	 Jeff Orchard <jorchard at cs.uwaterloo.ca>
-	 Justus H. Piater <Justus.Piater at ULg.ac.be>
-	 Paul Kienzle <pkienzle at users.sf.net>
-	 Christian Kotz
-	 Stefan van der Walt <stefan at sun.ac.za>
-	 Nadav Rotem <nadav256 at hotmail.com>
-	 Etienne Grossmann <etienne at cs.uky.edu>
-	 Kai Habel <kai.habel at gmx.de>
-	 Barre-Piquot
+Files: inst/medfilt2.m, inst/ordfilt2.m, src/cordflt2.cc, inst/impad.m
+Copyright: © 2000 Teemu Ikonen
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
 
-Copyright: 
+Files: inst/imrotate_Fourier.m, inst/imshear.m, inst/imtranslate.m
+Copyright: © 2002 Jeff Orchard
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
 
-    Copyright (C) 2004 Josep Mones i Teixidor
-    Copyright (C) 2006 Pedro Felzenszwalb
-    Copyright (C) 1999 Andy Adler
-    Copyright (C) 2002 Jeffrey E. Boyd
-    Copyright (C) 2000 Teemu Ikonen
-    Copyright (C) 2006 Christian Kotz
-    Copyright (C) 2004 Stefan van der Walt
-    Copyright (C) 2003 Nadav Rotem
-    Copyright (C) 2007 Soren Hauberg
-    Copyright (C) 2005 Barre-Piquot
-    Copyright (C) 2002 Jeff Orchard
-    Copyright (C) 2004-2005 Justus H. Piater
-    Copyright (C) 2004 Stefan van der Walt
-    Copyright (C) 2000, 2001 Kai Habel
-    Copyright (C) 2002 Etienne Grossmann
+Files: inst/imrotate.m
+Copyright: © 2004-2005 Justus H. Piater
+License: GPL-2+
+ This files is under the GPL, version 2 or later.
 
+Files: inst/graythresh.m
+Copyright: © 2005  Barre-Piquot
 License: GPL-2+
- This package 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 2 of the License, or
- (at your option) any later version.
-    
-On Debian systems, the complete text of the GNU General Public License,
-version 2, can be found in file `/usr/share/common-licenses/GPL-2.
+ This files is under the GPL, version 2 or later.
 
+Files: inst/fftconv2.m, src/graycomatrix.cc, src/houghtf.cc
+Copyright: © 2004 Stefan van der Walt
+License: other
+ 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.
 
-The Debian packaging is (C) 2007, Olafur Jens Sigurdsson <ojsbug at gmail.com> and
-is licensed under the GNU General Public License, version 3 or later,
-see `/usr/share/common-licenses/GPL-3'.
+Files: inst/mat2gray.m, inst/imhist.m
+Copyright: © 1999,2000  Kai Habel
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: inst/imadjust.m
+Copyright: © 1999, 2000 Kai Habel
+           © 2004 Josep Mones i Teixidor
+License: GPL-2+
+ This files is under the GPL, version 2 or later.
+
+Files: inst/corr2.m, inst/isbw.m, inst/grayslice.m, inst/isind.m,
+ inst/histeq.m, inst/isgray.m, inst/mean2.m, inst/im2bw.m, inst/std2.m,
+Copyright: © 2000 Kai Habel
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: inst/rgb2gray.m
+Copyright: © 2000, 2001 Kai Habel
+License: GPL-2+
+ This files is under the GPL, version 2 or later.
+
+Files: inst/imnoise.m
+Copyright: © 2000 Paul Kienzle
+License: GPL-2+
+ This files is under the GPL, version 2 or later.
+
+Files: inst/edge.m, inst/bwselect.m, src/bwfill.cc
+Copyright: © 1999 Andy Adler
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: inst/imread.m inst/imwrite.m
+Copyright: © 2002 Andy Adler
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: src/rotate_scale.cc
+Copyright: © 2003 Andy Adler
+License: other
+ This code has no warrany whatsoever.  Do what you like with this code
+ as long as you leave this copyright in place.
+
+Files: src/__bwdist.cc
+Copyright: © 2006 Pedro Felzenszwalb
+License: GPL-2+
+ This files is under the GPL, version 2 or later.
+
+Files: src/pngcanvas.h, src/pngwrite.cc, src/pngread.cc
+Copyright: © 2003 Nadav Rotem
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: inst/qtdecomp.m, inst/qtgetblk.m, inst/blkproc.m,
+ inst/col2im.m, inst/uintlut.m, inst/cmpermute.m, inst/poly2mask.m,
+ inst/makelut.m, inst/roicolor.m, inst/conndef.m, inst/cmunique.m,
+ inst/qtsetblk.m, inst/bweuler.m, inst/bestblk.m, inst/im2col.m,
+ inst/bwmorph.m, inst/erode.m, inst/isrgb.m, inst/stretchlim.m,
+ inst/applylut.m, inst/nlfilter.m, inst/dilate.m, inst/padarray.m
+Copyright: © 2004 Josep Mones i Teixidor
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: inst/bwarea.m, inst/imresize.m, inst/fspecial.m
+Copyright: © 2005 Søren Hauberg
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: inst/bwdist.m, inst/imperspectivewarp.m, inst/imremap.m,
+ inst/label2rgb.m, inst/bwperim.m
+Copyright: © 2006 Søren Hauberg
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: inst/imfilter.m, inst/im2uint16.m, inst/im2double.m,
+ inst/im2uint8.m, inst/imsmooth.m
+Copyright: © 2007 Søren Hauberg
+License: GPL-2+
+ These files are under the GPL, version 2 or later.
+
+Files: inst/bmpwrite.m, inst/colfilt.m, inst/colorgradient.m
+Copyright: © Paul Kienzle
+License: PD
+ This code is in the public domain.
+
+Files: inst/bwselect.m, inst/edge.m
+Copyright: © 1999 Andy Adler
+License: other
+ This code has no warranty whatsoever. Do what you like with this code
+ as long as you leave this copyright in place.
+
+Files: src/deriche.cc
+Copyright: © Christian Kotz 2006
+License: other
+ This code has no warranty whatsover. Do what you like with this code
+ as long as you leave this copyright in place.
+
+Files: src/jpgread.cc, src/jpgwrite.cc
+Copyright: © 1998 Andy Adler
+License: PD
+ This code is in the public domain
+
+Files: debian/*
+Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+License: GPL-3+
+ The Debian packaging information is under the GPL, version 3 or later.
+
+On Debian systems, the complete text of the GNU General Public License,
+version 2, can be found in the file `/usr/share/common-licenses/GPL-2. The
+complete text of the GNU General Public License, version 3, can be found
+in the file `/usr/share/common-licenses/GPL-3.


