[SCM] Packaging for quakespasm branch, smcv, updated. upstream/0.85.4-24-g08f6adc
Simon McVittie
smcv at debian.org
Sun Jul 3 20:23:58 UTC 2011
The following commit has been merged in the smcv branch:
commit 08f6adc73bab8aa6b6e1c6791935c951787934c7
Author: Simon McVittie <smcv at debian.org>
Date: Sun Jul 3 18:34:44 2011 +0100
Attribute copyright for snd_mp3.c more precisely, and reproduce all necessary copyright notices
diff --git a/debian/changelog b/debian/changelog
index 308c772..6fbe375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,5 +15,7 @@ quakespasm (0.85.4-1) UNRELEASED; urgency=low
* Recommend using game-data-packager for the data
* Only Recommend quake-data: this engine could be used with unpackaged data
* Mention the quake package, and OpenQuartz, in the package description
+ * Attribute copyright for snd_mp3.c more precisely, and reproduce all
+ necessary copyright notices
-- David Banks <amoebae at gmail.com> Mon, 04 Apr 2011 07:51:27 +0100
diff --git a/debian/copyright b/debian/copyright
index 58f0822..26c3ed5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,12 +5,9 @@ Copyright: 1996-2005 Id Software, Inc
1999-2004 contributors of the QuakeForge project
2002-2009 John Fitzgibbons
2005 Stuart Dalton
- 2007-2009 SoX contributors
- 2007-2009 Fabrizio Gennari
2007-2011 Kristian Duske
2007-2011 Ozkan Sezer
2010-2011 Steven Atkinson
- (unspecified date) Bertrand Petit
(unspecified date) Baker
(unspecified date) LordHavoc
License: GPL-2+
@@ -35,9 +32,56 @@ License: GPL-2+
.
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, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- .
On Debian systems, the complete text of the GNU General Public License can
be found in /usr/share/common-licenses/GPL-2.
+
+Files: Quake/snd_mp3.c
+Copyright: 2007-2009 SoX contributors
+ 2007-2009 Fabrizio Gennari <fabrizio.ge at tiscali.it>
+ 2000-2004 Underbit Technologies, Inc.
+ 2010-2011 Ozkan Sezer
+ 2001-2004 Bertrand Petit
+License: GPL-2+ and BSD-3-clause
+ 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, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ Parts of this file are based on the decoder tutorial program madlld:
+ .
+ Copyright (C) 2001-2004 Bertrand Petit, 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 author 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 AUTHOR 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 AUTHOR 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.
diff --git a/debian/patches/mp3-copyright.patch b/debian/patches/mp3-copyright.patch
new file mode 100644
index 0000000..cc6dfb5
--- /dev/null
+++ b/debian/patches/mp3-copyright.patch
@@ -0,0 +1,77 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sun, 03 Jul 2011 09:59:14 +0100
+Subject: Reproduce the copyright statements for all identifiable sources
+ of snd_mp3.c
+
+diff --git a/Quake/snd_mp3.c b/Quake/snd_mp3.c
+index 736297b..ae5f171 100644
+--- a/Quake/snd_mp3.c
++++ b/Quake/snd_mp3.c
+@@ -1,13 +1,21 @@
+ /*
+- * MP3 decoding support using libmad: Adapted from the SoX library at
+- * http://sourceforge.net/projects/sox/, LGPLv2, Copyright (c) 2007-2009
+- * SoX contributors, written by Fabrizio Gennari <fabrizio.ge at tiscali.it>,
+- * with the decoding part based on the decoder tutorial program madlld
+- * written by Bertrand Petit <madlld at phoe.fmug.org> (BSD license, see at
+- * http://www.bsd-dk.dk/~elrond/audio/madlld/). The tag identification
+- * functions were adapted from the GPL-licensed libid3tag library, see at
+- * http://www.underbit.com/products/mad/. Adapted to Quake and Hexen II
+- * game engines by O.Sezer :
++ * MP3 decoding support using libmad.
++ *
++ * Adapted from the SoX library at http://sourceforge.net/projects/sox/,
++ * LGPLv2, Copyright (c) 2007-2009 SoX contributors, written by
++ * Fabrizio Gennari <fabrizio.ge at tiscali.it>. As allowed by clause 3 of the
++ * LGPL, this copy is licensed under the GNU GPL, version 2; see below.
++ *
++ * The decoding part was based on the decoder tutorial program madlld
++ * written by Bertrand Petit <madlld at phoe.fmug.org> (BSD license, see
++ * http://www.bsd-dk.dk/~elrond/audio/madlld/).
++ * The copyright notice and BSD-style license are reproduced below.
++ *
++ * The tag identification functions were adapted from the GPL-licensed
++ * libid3tag library, see http://www.underbit.com/products/mad/.
++ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
++ *
++ * Adapted to Quake and Hexen II game engines by O.Sezer :
+ * Copyright (C) 2010-2011 O.Sezer <sezero at users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -27,6 +35,36 @@
+ *
+ */
+
++/* Parts of this file are based on the decoder tutorial program madlld:
++ *
++ * Copyright (C) 2001-2004 Bertrand Petit, 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 author 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 AUTHOR 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 AUTHOR 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.
++ */
++
+ #include "quakedef.h"
+
+ #if defined(USE_CODEC_MP3)
diff --git a/debian/patches/series b/debian/patches/series
index fb17a31..169c09d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
remove-redundant-linking.patch
support-user-directories.patch
history-in-dotfile.patch
+mp3-copyright.patch
--
Packaging for quakespasm
More information about the Pkg-games-commits
mailing list