Updated copyright.

diff --git a/debian/copyright b/debian/copyright
index 5ff32d6c25b20832667aa76200600270b7679dce..000cf119cba548b7002099e1b99ff44cb1f5ebf6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,14 @@ Sun, 28 Oct 2007 18:25:17 +0100.
 
 It was downloaded from <http://enblend.sourceforge.net/>.
 
 
 It was downloaded from <http://enblend.sourceforge.net/>.
 

-Upstream Author:
+Upstream Authors:
+       Pablo d'Angelo <dangelo@users.sourceforge.net>
+       Max Lyons

        Andrew Mihal <acmihal@users.sourceforge.net>
        Andrew Mihal <acmihal@users.sourceforge.net>

+       Christoph Spiel <cspiel@users.sourceforge.net>
+       Brent Townshend <btownshend@users.sourceforge.net>
+
+       For further credits, see AUTHORS.

 
 Copyright Holders (in alphabetical order):
        Andrew Mihal <acmihal@users.sourceforge.net>
 
 Copyright Holders (in alphabetical order):
        Andrew Mihal <acmihal@users.sourceforge.net>


@@ -12,7 +18,10 @@ Copyright Holders (in alphabetical order):
        Bruce Walter <bjw@graphics.cornell.edu>
        Christian-Dennis Rahn
        Dr. Christoph L. Spiel
        Bruce Walter <bjw@graphics.cornell.edu>
        Christian-Dennis Rahn
        Dr. Christoph L. Spiel

+       Dean Povey <povey@wedgetail.com>
+       Dustin J. Mitchell <dustin@cs.uchicago.edu>

        Erik de Castro Lopo <erikd@mega-nerd.com>
        Erik de Castro Lopo <erikd@mega-nerd.com>

+       Francesco Salvestrini <salvestrini@users.sourceforge.net>

        Free Software Foundation, Inc.
        Gunnar Kedenburg
        Hans Meine
        Free Software Foundation, Inc.
        Gunnar Kedenburg
        Hans Meine


@@ -26,8 +35,9 @@ Copyright Holders (in alphabetical order):
 
 License:
 
 
 License:
 

-       File doc/texinfo.tex
-       Copyright © 1985-2006 Free Software Foundation, Inc.
+       Files mdate-sh
+             doc/texinfo.tex
+       Copyright © 1985-2009 Free Software Foundation, Inc.

 
        File include/vigra_ext/Interpolators.h
        Copyright © Helmut Dersch <der@fh-furtwangen.de>
 
        File include/vigra_ext/Interpolators.h
        Copyright © Helmut Dersch <der@fh-furtwangen.de>


@@ -35,7 +45,7 @@ License:
 
        Files include/vigra_ext/NearestFeatureTransform.h
              include/vigra_ext/XMIWrapper.h
 
        Files include/vigra_ext/NearestFeatureTransform.h
              include/vigra_ext/XMIWrapper.h

-       Copyright © 2004-2005 Andrew Mihal
+       Copyright © 2004-2009 Andrew Mihal

 
        Files include/vigra_ext/ransac.h
              include/vigra_ext/RansacParameterEstimator.h
 
        Files include/vigra_ext/ransac.h
              include/vigra_ext/RansacParameterEstimator.h


@@ -44,12 +54,23 @@ License:
        All other files in include/vigra_ext/
        Copyright © Pablo d'Angelo <pablo.dangelo@web.de>
 
        All other files in include/vigra_ext/
        Copyright © Pablo d'Angelo <pablo.dangelo@web.de>
 

-       File src/float_cast.h
-       Copyright © 2001 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+       Files src/DefaultSig.pm
+             src/Sig.pm
+             src/error_message.{cc,h}
+             src/filenameparse.{cc,h}
+             src/filespec.{cc,h}
+             src/gen_sig
+             src/global.h
+             src/mga.h
+             src/nearest.h
+             src/openmp.h
+             src/self_test.{cc,h}
+             src/tiff_message.{cc,h}
+       Copyright © 2008-2009 Dr. Christoph L. Spiel

 
        All other files (except doc/*.{info,texi}, include/vigra/*, m4/*,
 
        All other files (except doc/*.{info,texi}, include/vigra/*, m4/*,

-               src/float_cast.h and src/vigra_impex/*)
-       Copyright © 2004-2007 Andrew Mihal
+               and src/vigra_impex/*)
+       Copyright © 2004-2009 Andrew Mihal

 
        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
 
        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


@@ -66,41 +87,28 @@ License:
        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
        USA.
 
        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
        USA.
 

-       File m4/acx_pthread.m4
-       Copyright © 2006 Steven G. Johnson <stevenj@alum.mit.edu>
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL'.

 
 

-       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.
+       File texinfo.tex
+       Copyright © 1985-2009 Free Software Foundation, Inc.

 
 

-       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.
+       This texinfo.tex file 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.

 
 

-       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.
+       This texinfo.tex file 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.

 
 

-       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.
+       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
-can be found in `/usr/share/common-licenses/GPL'.
+       As a special exception, when this file is read by TeX when processing
+       a Texinfo source document, you may use the result without
+       restriction.  (This has been our intent since Texinfo was invented.)

 
        Files doc/enblend.info
              doc/enblend.texi
 
        Files doc/enblend.info
              doc/enblend.texi


@@ -202,17 +210,54 @@ can be found in `/usr/share/common-licenses/GFDL'.
        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
        OTHER DEALINGS IN THE SOFTWARE.
 
        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
        OTHER DEALINGS IN THE SOFTWARE.
 

-       Files ax_check_gl.m4
-             ax_check_glu.m4
-             ax_check_glut.m4
-       Copyright © 2004 Braden McDaniel <braden@endoframe.com>
-
-       (The license of these files has been clarified by Braden McDaniel during a
-       private E-mail conversation.)
-
-       Copying and distribution of this file, with or without modification,
-       are permitted in any medium without royalty provided the copyright
-       notice and this notice are preserved
+       Files m4/ax_check_gl.m4
+             m4/ax_check_glu.m4
+             m4/ax_check_glut.m4
+       Copyright © 2009 Braden McDaniel <braden@endoframe.com>
+
+       Files m4/ax_openmp.m4
+             m4/ax_pthread.m4
+       Copyright © 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+
+       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 2 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/>.
+
+       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 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.
+
+       File m4/ax_lang_compiler_ms.m4
+       Copyright © 2009 Braden McDaniel <braden@endoframe.com>
+
+       File m4/ax_prog_perl_modules.m4
+       Copyright © 2009 Dean Povey <povey@wedgetail.com>
+
+       File m4/ax_with_prog.m4
+       Copyright © 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
+       Copyright © 2008 Dustin J. Mitchell <dustin@cs.uchicago.edu>
+
+       Copying and distribution of this file, with or without modification, are
+       permitted in any medium without royalty provided the copyright notice
+       and this notice are preserved.

 
        Files m4/lrint.m4
              m4/lrintf.m4
 
        Files m4/lrint.m4
              m4/lrintf.m4