[SCM] Quake 3 engine branch, master, updated. f9474eeba468251086e341ca4362614664280427

Simon McVittie smcv at debian.org
Fri Aug 13 23:51:31 UTC 2010


The following commit has been merged in the master branch:
commit 9265a9d42e752bd8f72e6119b4c6209948a2477f
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Aug 14 00:47:18 2010 +0100

    Convert debian/copyright to DEP-5 and generally chase copyright statements
    
    Currently awaiting confirmation from fuddl that the packaging can be
    considered to be under the same terms as the software itself.

diff --git a/debian/copyright b/debian/copyright
index ddb6a60..221b2fa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,46 +1,78 @@
-This package was debianized by Bruno "Fuddl" Kleinert <fuddl at debian.org> on
-Sat, 17 Jul 2010 22:49:30 +0200.
-
-ioQuake3 was downloaded from svn://svn.icculus.org/quake3
-
-The tarball was repacked to leave out the non-free code/tools/lcc directory
-and the code/libs directory containing libraries for Mac OS X and Win32
-without source.
-
-ioQuake3 is © 1999 - 2005 id Software Inc., 2005 - 2009 Zachary J. Slater
-
-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.
-
-
-You can find the GPL license text on a Debian system under
-/usr/share/common-licenses/GPL.
-
-
-NOTE: However, some parts of the source distribution are not covered by the GPL:
-
-IO on .zip files using portions of zlib
------------------------------------------------------------------------------
-lines   file(s)
-4299    code/qcommon/unzip.c
-4546    libs/pak/unzip.cpp
-Copyright (C) 1998 Gilles Vollant
-zlib is Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: ioquake3
+Maintainer:
+  http://ioquake3.org/
+  mailto:ioquake3 at lists.ioquake.org
+  irc://irc.freenode.net/ioquake3
+Source: svn://svn.icculus.org/quake3
+Comment:
+  This package was debianized by Bruno "Fuddl" Kleinert <fuddl at debian.org> on
+  Sat, 17 Jul 2010 22:49:30 +0200.
+  .
+  The tarball was repacked to leave out the non-free code/tools/lcc directory,
+  and the code/libs directory containing libraries for Mac OS X and Win32
+  without source.
+
+Files: *
+Copyright:
+  © 1999-2005 id Software Inc.
+  © 1994-2007 Free Software Foundation, Inc.
+  © 1997-1998 Andrew Tridgell
+  © 2005-2009 Zachary J. Slater
+  © 2005-2008 Joerg Dietrich
+  © 2005-2007 Ludwig Nussel / Novell Inc.
+  © 2005-2006 Tim Angus
+  © 2005 Stuart Dalton
+  © 2006 Tony J. White
+  © 2008 Przemyslaw Iskra
+  © 2009 David S. Miller
+License: GPL-2+
+  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.
+  .
+  You can find the GPL license text on a Debian system under
+  /usr/share/common-licenses/GPL-2.
+
+Files: debian/*
+Copyright:
+  © 2010 Bruno Kleinert
+  © 2010 Simon McVittie
+License: GPL-2+?
+  presumably GPL-2+, but awaiting confirmation from Bruno
+
+Files: code/qcommon/md5.c
+Copyright: no copyright is claimed
+License: not-applicable
+  The algorithm is due to Ron Rivest.  This code was
+  written by Colin Plumb in 1993, no copyright is claimed.
+
+Files:
+  code/qcommon/unzip.[ch],
+  code/qcommon/ioapi.[ch],
+  code/qcommon/puff.[ch],
+  code/client/libmumblelink.[ch],
+  code/zlib/*
+Copyright:
+  © 1990-2000 Info-ZIP
+  © 1995-2005 Mark Adler
+  © 1995-2005 Jean-loup Gailly
+  © 1998-2005 Gilles Vollant
+  © 2008 Ludwig Nussel
+License: ZLIB
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
   arising from the use of this software.
-
+  .
   Permission is granted to anyone to use this software for any purpose,
   including commercial applications, and to alter it and redistribute it
   freely, subject to the following restrictions:
-
+  .
   1. The origin of this software must not be misrepresented; you must not
      claim that you wrote the original software. If you use this software
      in a product, an acknowledgment in the product documentation would be
@@ -49,62 +81,95 @@ zlib is Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
-standard C library replacement routines
------------------------------------------------------------------------------
-lines   file(s)
-1324    code/game/bg_lib.c
-Copyright (c) 1992, 1993
-The Regents of the University of California. All rights reserved.
-
-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.
-3. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-
-ADPCM coder/decoder
------------------------------------------------------------------------------
-lines   file(s)
-330             code/client/snd_adpcm.c
-Copyright 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
-
+Files: code/game/bg_lib.c
+Copyright: © 1992, 1993 The Regents of the University of California
+License: BSD
+  All rights reserved.
+  .
+  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.
+  3. Neither the name of the University nor the names of its contributors
+     may be used to endorse or promote products derived from this software
+     without specific prior written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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: code/client/snd_adpcm.c
+Copyright: © 1992 Stichting Mathematisch Centrum, Amsterdam, The Netherlands
+License: other-adpcm
                         All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the names of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-For Debian GNU/Linux ioQuake3, precompiled binaries which are supplied by
-upstream, are removed from the Debian packages.
+  .
+  Permission to use, copy, modify, and distribute this software and its 
+  documentation for any purpose and without fee is hereby granted, 
+  provided that the above copyright notice appear in all copies and that
+  both that copyright notice and this permission notice appear in 
+  supporting documentation, and that the names of Stichting Mathematisch
+  Centrum or CWI not be used in advertising or publicity pertaining to
+  distribution of the software without specific, written prior permission.
+  .
+  STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+  THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+  FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+  OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: code/jpeg-6b/*
+Copyright: © 1991-1998 Thomas G. Lane
+License: other-jpeg
+  The authors make NO WARRANTY or representation, either express or implied,
+  with respect to this software, its quality, accuracy, merchantability, or
+  fitness for a particular purpose.  This software is provided "AS IS", and you,
+  its user, assume the entire risk as to its quality and accuracy.
+  .
+  This software is copyright (C) 1991-1998, Thomas G. Lane.
+  All Rights Reserved except as specified below.
+  .
+  Permission is hereby granted to use, copy, modify, and distribute this
+  software (or portions thereof) for any purpose, without fee, subject to these
+  conditions:
+  (1) If any part of the source code for this software is distributed, then this
+  README file must be included, with this copyright and no-warranty notice
+  unaltered; and any additions, deletions, or changes to the original files
+  must be clearly indicated in accompanying documentation.
+  (2) If only executable code is distributed, then the accompanying
+  documentation must state that "this software is based in part on the work of
+  the Independent JPEG Group".
+  (3) Permission for use of this software is granted only if the user accepts
+  full responsibility for any undesirable consequences; the authors accept
+  NO LIABILITY for damages of any kind.
+  .
+  These conditions apply to any software derived from or based on the IJG code,
+  not just to the unmodified library.  If you use our work, you ought to
+  acknowledge us.
+  .
+  Permission is NOT granted for the use of any IJG author's name or company name
+  in advertising or publicity relating to this software or products derived from
+  it.  This software may be referred to only as "the Independent JPEG Group's
+  software".
+  .
+  We specifically permit and encourage the use of this software as the basis of
+  commercial products, provided that all warranty or liability claims are
+  assumed by the product vendor.
+Comment:
+  The ioquake3 changes to libjpeg are summarized in
+  code/jpeg-6b/ioq3-changes.diff. Further Debian changes are indicated by
+  files in debian/patches. In the Debian version of ioquake3, only jmemnobs.c
+  is compiled: the system libjpeg is used for the remaining functionality.

-- 
Quake 3 engine



More information about the Pkg-games-commits mailing list