Updated debian/copyright for version 3.2.

Outstanding issues (which have to be clarified by upstream):
  * unclear licensing of m4/ax_check_gl.m4, m4/ax_check_glu.m4 and
    m4/ax_check_glut.m4
  * missing license in doc/enfuse-focus-stacking.{info,texi}

diff --git a/debian/copyright b/debian/copyright
index 77590216249064e5eb68b0cc4f30c84548c16d42..c26b53610c90342e80c1dfb6e71c1ef29c22cd60 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,16 +11,21 @@ Copyright Holders (in alphabetical order):
        Bruce Walter <bjw@graphics.cornell.edu>
        Christian-Dennis Rahn
        Erik de Castro Lopo <erikd@mega-nerd.com>
+       Free Software Foundation, Inc.
        Gunnar Kedenburg
        Hans Meine
        Helmut Dersch <der@fh-furtwangen.de>
        Pablo d'Angelo <pablo.dangelo@web.de>
+       Steven G. Johnson <stevenj@alum.mit.edu>
        Tom Lane
        Ullrich Koethe
        Ziv Yaniv
 
 License:
 
+       File doc/texinfo.tex
+       Copyright (C) 1985-2006 Free Software Foundation, Inc.
+
        File include/vigra_ext/Interpolators.h
        Copyright (C) Helmut Dersch <der@fh-furtwangen.de>
        Copyright (C) Pablo d'Angelo <pablo.dangelo@web.de>
@@ -39,8 +44,9 @@ License:
        File src/float_cast.h
        Copyright (C) 2001 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
 
-       All other files (except include/vigra/*, m4/*, src/float_cast.h and
-               src/vigra_impex/*)
+       All other files (except doc/enblend.info, doc/enblend.texi,
+               doc/enfuse.info, doc/enfuse.texi, include/vigra/*, m4/*,
+               src/float_cast.h and src/vigra_impex/*)
        Copyright (C) 2004-2007 Andrew Mihal
 
        This package is free software; you can redistribute it and/or modify
@@ -58,9 +64,57 @@ License:
        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
        USA.
 
+       File m4/acx_pthread.m4
+       Copyright (C) 2006 Steven G. Johnson <stevenj@alum.mit.edu>
+
+       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.
+
+       This package 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 package; if not, write to the Free Software
+       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+       USA.
+
+       As a special exception, the respective Autoconf Macro's copyright
+       owner gives unlimited permission to copy, distribute and modify the
+       configure scripts that are the output of Autoconf when processing
+       the Macro. You need not follow the terms of the GNU General Public
+       License when using or distributing such scripts, even though
+       portions of the text of the Macro appear in them. The GNU General
+       Public License (GPL) does govern all other use of the material that
+       constitutes the Autoconf Macro.
+
+       This special exception to the GPL applies to versions of the
+       Autoconf Macro released by the Autoconf Macro Archive. When you
+       make and distribute a modified version of the Autoconf Macro, you
+       may extend this special exception to the GPL to apply to your
+       modified version as well.
+
 On Debian systems, the complete text of the GNU General Public License
 can be found in `/usr/share/common-licenses/GPL'.
 
+       Files doc/enblend.info
+             doc/enblend.texi
+             doc/enfuse.info
+             doc/enfuse.texi
+       Copyright (C) 2004-2008 Andrew Mihal
+
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.2
+       or any later version published by the Free Software Foundation;
+       with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+       Texts.
+
+On Debian systems, the complete text of the GNU Free Documentation License
+can be found in `/usr/share/common-licenses/GFDL'.
+
        Files include/vigra/cachedfileimage.hxx
              include/vigra/stdcachedfileimage.hxx
        Copyright (C) 2004 Andrew Mihal
@@ -100,14 +154,16 @@ can be found in `/usr/share/common-licenses/GPL'.
        Copyright (C) 2002-2004 Ullrich Koethe
        Copyright (C) 2002-2004 Gunnar Kedenburg
 
+       Files src/vigra_impex/exr.cxx
+             src/vigra_impex/exr.hxx
+             src/vigra_impex/hdr.cxx
+             src/vigra_impex/hdr.hxx
+       Copyright (C) 1998-2007 Pablo d'Angelo
+
        Files src/vigra_impex/gif.cxx
              src/vigra_impex/gif.hxx
        Copyright (C) 2002 Ullrich Koethe
 
-       Files src/vigra_impex/hdr.cxx
-             src/vigra_impex/hdr.hxx
-       Copyright (C) 1998-2002 Pablo d'Angelo
-
        Files src/vigra_impex/iccjpeg.c
              src/vigra_impex/iccjpeg.h
        Copyright (C) Tom Lane
@@ -139,7 +195,8 @@ can be found in `/usr/share/common-licenses/GPL'.
        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
        OTHER DEALINGS IN THE SOFTWARE.
 
-       Files m4/*
+       Files m4/lrint.m4
+             m4/lrintf.m4
              src/float_cast.h
        Copyright (C) Erik de Castro Lopo <erikd@mega-nerd.com>