[quakespasm] 06/11: Rework debian/copyright.
Stephen Kitt
skitt at moszumanska.debian.org
Mon Mar 23 22:57:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository quakespasm.
commit 4f3ed34a97019a3dae8a81aa5c43700b106891be
Author: Stephen Kitt <steve at sk2.org>
Date: Sun Mar 22 23:22:56 2015 +0100
Rework debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 170 +++++++++++++++++++------------------
debian/patches/mp3-copyright.patch | 2 +-
debian/patches/series | 2 +-
4 files changed, 91 insertions(+), 84 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 097dead..18c2c54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ quakespasm (0.90.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Switch to my Debian address.
* Build with SDL2, FLAC, OPUS and MikMod.
+ * Rework debian/copyright.
-- Stephen Kitt <skitt at debian.org> Sun, 22 Mar 2015 21:40:57 +0100
diff --git a/debian/copyright b/debian/copyright
index ff5cbe5..e546562 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,22 +3,103 @@ Upstream-Name: quakespasm
Source: http://sourceforge.net/projects/quakespasm/files/
Copyright: 1996-2005 Id Software, Inc
1999-2004 contributors of the QuakeForge project
- 2002-2009 John Fitzgibbons
- 2005 Stuart Dalton
2007-2011 Kristian Duske
- 2005-2013 Ozkan Sezer
2010-2011 Steven Atkinson
(unspecified date) Baker
(unspecified date) Forest Hale (LordHavoc)
+License: GPL-2+
+
+Files: *
+Copyright: 1996-2005 Id Software, Inc.
+ 2002-2009 John Fitzgibbons and others
+ 2007-2008 Kistian Duske
+ 2007-2013 O. Sezer
2010-2014 QuakeSpasm developers
License: GPL-2+
-Comment:
- The source tarball has been repacked to remove the Windows and Mac build
- support. This removed some non-free material, notably the bundled SDL binary.
- It also saves a lot of space in the source package.
+
+Files: Misc/qs_pak/mkpak.sh
+Copyright: 2014 Sander van Dijk
+License: ISC
+
+Files: Quake/q_ctype.h
+Copyright: 1998 Red Hat Software, Inc.
+License: GPL-2+
+
+Files: Quake/snd_codeci.h
+ Quake/snd_codec.c
+ Quake/snd_codec.h
+ Quake/snd_wave.c
+Copyright: 1999-2005 Id Software, Inc.
+ 2005 Stuart Dalton
+ 2010-2012 O. Sezer
+License: GPL-2+
+
+Files: Quake/snd_flac.c
+Copyright: 2005 Bill Currie
+ 2013 O. Sezer
+License: 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-2013 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.
+
+Files: Quake/strlcat.c
+ Quake/strlcpy.c
+Copyright: 1998 Todd C. Miller
+License: ISC
Files: debian/*
Copyright: 2011 David Banks
+ 2015 Stephen Kitt
License: GPL-2+
License: GPL-2+
@@ -36,81 +117,6 @@ License: GPL-2+
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.
-
-Files: Quake/strlcpy.c Quake/strlcat.c
-Copyright: 1998 Todd C. Miller
-License: ISC
-
-Files: Misc/qs_pak/mkpak.sh
-Copyright: 2014 Sander van Dijk
-License: ISC
-
-Files: Quake/q_ctype.h
-Copyright: 1998 Red Hat Software, Inc.
-License: GPL-2+
-
-Files: Quake/snd_flac.c
-Copyright: 2005 Bill Currie
- 2013 O. Sezer
-License: GPL-2+
-
-Files: Quake/snd_mikmod.c
- Quake/snd_modplug.c
- Quake/snd_opus.c
- Quake/snd_umx.c
-Copyright: 2013 O. Sezer
-License: GPL-2+
-
License: ISC
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
diff --git a/debian/patches/mp3-copyright.patch b/debian/patches/mp3-copyright.patch
index e0258cf..7ac8d6e 100644
--- a/debian/patches/mp3-copyright.patch
+++ b/debian/patches/mp3-copyright.patch
@@ -40,7 +40,7 @@ index 29f13ae..7ddd67b 100644
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * Adapted to Quake and Hexen II game engines by O.Sezer :
- * Copyright (C) 2010-2012 O.Sezer <sezero at users.sourceforge.net>
+ * Copyright (C) 2010-2013 O.Sezer <sezero at users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
@@ -24,6 +32,37 @@
diff --git a/debian/patches/series b/debian/patches/series
index 3e8a439..379664b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
remove-redundant-linking.patch
-#mp3-copyright.patch
+mp3-copyright.patch
use-inherited-build-flags.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git
More information about the Pkg-games-commits
mailing list