[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-5+exp3-6-g244dd8c

Simon McVittie smcv at debian.org
Sat Feb 5 22:33:41 UTC 2011


The following commit has been merged in the master branch:
commit 244dd8cfaae3dc115de0c88753ea1248566a8ef1
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Feb 5 22:23:04 2011 +0000

    Convert debian/copyright to machine-readable format

diff --git a/debian/changelog b/debian/changelog
index bc6e607..95adb0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openarena (0.8.5-6) UNRELEASED; urgency=low
   * Add an openarena-dbg package
   * Don't strcpy a buffer into itself, squashing a valgrind warning
   * Declare CG_FairCvars properly, squashing a compiler warning
+  * Convert debian/copyright to machine-readable format
 
  -- Simon McVittie <smcv at debian.org>  Fri, 04 Feb 2011 22:11:01 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 04edfa5..9c380a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,65 +1,125 @@
-This package was debianized by Bruno "Fuddl" Kleinert <fuddl at debian.org> on
-Sat, 30 Sep 2006 17:23:34 +0200.
-
-It was downloaded from http://openarena.ws/svn/source/076/ioquake3svn1288plus4.tar.bz2
-
-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.
-
-Copyright 2005-2008  OpenArena Team
-
-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.
-
-
-OpenArena uses a modified ioQuake3 engine, which contains parts under other 
-licenses than the GNU GPL:
-
-ioQuake3 is copyright 1999 - 2005 id Software Inc., 2005, 2006 Zachary J. Slater
-
-   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; version 2 dated June, 1991.
-
-   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.
-
-
-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: http://dep.debian.net/deps/dep5/
+Upstream-Name: oax
+Upstream-Contact: http://openarena.ws/
+Source:
+  The current "orig" tarball is a combination of two projects; see
+  README.source for full details.
+  .
+  game/ is oax, from the svn repository at
+  <http://oax.googlecode.com/svn/trunk/>. This ends up in the openarena-server
+  binary package.
+  .
+  engine/ is ioquake3, from the svn repository at
+  <svn://svn.icculus.org/quake3>. This isn't used in the binary packages any
+  more, and will be removed with the next upstream release.
+  .
+  Non-free tools and sourceless libraries have been removed from both.
+
+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: game/*
+Copyright:
+  © 1999-2005 id Software Inc.
+  © 2005-2010 OpenArena Team
+  © 2008-2010 Poul Sander
+  © 2000-2006 Tim Angus
+  © 2004-2006 Tony J. White
+  © 2006 Neil Toronto
+  © 2008 Przemyslaw Iskra
+  © 2009 Karl Kuglin
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+  © 2010 Bruno Kleinert
+  © 2010 Simon McVittie
+License: GPL-2+
+
+Files:
+  engine/code/game/bg_lib.c
+  game/code/game/bg_lib.c
+Copyright: © 1992, 1993 The Regents of the University of California
+License: BSD-3-clause
+  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: engine/*
+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+
+Comment: This code is not present in the binary packages.
+
+Files: engine/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.
+Comment: This code is not present in the binary packages.
+
+Files:
+  engine/code/qcommon/unzip.?
+  engine/code/qcommon/ioapi.?
+  engine/code/qcommon/puff.?
+  engine/code/client/libmumblelink.?
+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
@@ -67,94 +127,68 @@ zlib is Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
   2. Altered source versions must be plainly marked as such, and must not be
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
+Comment: This code is not present in the binary packages.
 
-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: engine/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.
-
-JPEG library
------------------------------------------------------------------------------
-code/jpeg-6
-libs/jpeg6
-Copyright (C) 1991-1995, Thomas G. Lane
-
-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.
-
-NOTE: unfortunately the README that came with our copy of the library has
-been lost, so the one from release 6b is included instead. There are a few
-'glue type' modifications to the library to make it easier to use from
-the engine, but otherwise the dependency can be easily cleaned up to a
-better release of the library.
-
-
-For Debian GNU/Linux OpenArena is split into a game engine and a game data
-package. 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.
+Comment: This code is not present in the binary packages.
+
+Files: engine/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
+  engine/code/jpeg-6b/ioq3-changes.diff. This code is not present in the
+  binary packages.

-- 
Packaging for the OpenArena engine



More information about the Pkg-games-commits mailing list