The following commit has been merged in the dep5 branch:
commit 0757b2eb1035338455deeefe05331766dff4e4c1
Author: Jon Dowland <[email protected]>
Date: Sat Sep 12 10:36:05 2009 +0100
restructure order of clauses to clarify licenses
diff --git a/debian/copyright b/debian/copyright
index 5bbc4d8..8557ed1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,28 +6,18 @@ x-Version: dep5 retrieved on 2009-09-11 at 17:20 GMT,
bearing a timestamp of 2009-03-22
Source: http://chocolate-doom.org/
+Files: *
Copyright: 1999, id Software
2005-2009, Simon "Fraggle" Howard <[email protected]>
License: GPL-2+
On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
-x-Note: where omitted, subsequent clauses in this file describe
- files also provided under the GPL-2+.
-
-Files: src/md5.[ch]
-Copyright: 1993, Colin Plumb
- Ian Jackson
-License: Public Domain or GPL-2+
+x-Note: in subsequent clauses in this file, License where ommitted
+ is also GPL-2+.
Files: setup/m_argv.c msvc/win32.rc
-Copyright: (c) 2008 "GhostlyDeath" <[email protected]>
-
-Files: msvc/inttypes.h, msvc/stdint.h
-Copyright: 2006 Alexander Chemeris
-License: BSD or GPL-2+
- On Debian systems the full text of the BSD License can be found
- in the `/usr/share/common-licenses/BSD' file.
+Copyright: 2008, "GhostlyDeath" <[email protected]>
Files: src/p_maputl.c
Copyright: 2005, 2006 Andrey Budko
@@ -55,3 +45,14 @@ Copyright: 2006, Jon Dowland <[email protected]>
Miriam Ruiz <[email protected]>
Peter De Wachter <[email protected]>
+Files: src/md5.[ch]
+Copyright: 1993, Colin Plumb
+ Ian Jackson
+License: Public Domain or GPL-2+
+
+Files: msvc/inttypes.h, msvc/stdint.h
+Copyright: 2006 Alexander Chemeris
+License: BSD or GPL-2+
+ On Debian systems the full text of the BSD License can be found
+ in the `/usr/share/common-licenses/BSD' file.
+
--
chocolate-doom: Doom engine closely-compatible with vanilla doom
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
