[SCM] chocolate-doom: Doom engine closely-compatible with vanilla doom branch, master, updated. upstream/1.2.1-12-gff5b36a

[Jon Dowland]

The following commit has been merged in the master branch:
commit ff5b36a2ca07acf49921dcd42e63613a41881645
Author: Jon Dowland <jmtd at debian.org>
Date:   Mon Sep 14 00:00:58 2009 +0100

    updates based on DEP-5 understanding

diff --git a/debian/changelog b/debian/changelog
index b5cb36c..622c08f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chocolate-doom (1.2.1-2) UNRELEASED; urgency=low
+
+  * update debian/copyright to correct mis-interpratations
+    of the DEP-5 proposed syntax.
+
+ -- Jon Dowland <jmtd at debian.org>  Mon, 14 Sep 2009 00:00:27 +0100
+
 chocolate-doom (1.2.1-1) unstable; urgency=low
 
   * Initial Release. Closes: #351594.
diff --git a/debian/copyright b/debian/copyright
index 12bb9a3..a818cf0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ 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 <fraggle at users.sf.net>
 License: GPL-2+
@@ -17,23 +16,28 @@ x-Note: in subsequent clauses in this file, License where omitted
         are the same as the previous clause. (For most clauses
         that means GPL-2+).
 
-Files: setup/m_argv.c msvc/win32.rc
+Files: ./setup/m_argv.c, ./msvc/win32.rc
 Copyright: 2008, "GhostlyDeath" <ghostlydeath at gmail.com>
+License: GPL-2+
 
-Files: src/p_maputl.c
+Files: ./src/p_maputl.c
 Copyright: 2005, 2006 Andrey Budko
+License: GPL-2+
 
-Files: src/mus2mid.c
+Files: ./src/mus2mid.c
 Copyright: 2006, Ben Ryves
+License: GPL-2+
 
-Files: src/i_sdlsound.c
+Files: ./src/i_sdlsound.c
 Copyright: 2008, David Flater
+License: GPL-2+
 
-Files: src/p_map.c
+Files: ./src/p_map.c
 Copyright: 2005, Simon Howard
            2005, Andrey Budko
+License: GPL-2+
 
-Files: textscreen/txt_font.h
+Files: ./textscreen/txt_font.h
 Copyright: 2002-2004, The DOSBox Team:
               Sjoerd v.d. Berg <harekiet at zophar.net>
               Peter Veenstra <qbix79 at users.sourceforge.net>
@@ -41,14 +45,17 @@ Copyright: 2002-2004, The DOSBox Team:
               Ulf Wohlers <finsterr at users.sourceforge.net>
               Tommy Frössman <fanskapet at php-coders.net>
               Dean Beeler <canadacow at users.sourceforge.net>
+License: GPL-2+
 
-Files: autotools/depcomp
+Files: ./autotools/depcomp
 Copyright: 1999-2007 Free Software Foundation, Inc.
+License: GPL-2+
 
-Files: autotools/missing
+Files: ./autotools/missing
 Copyright: 1996-2006 Free Software Foundation, Inc.
+License: GPL-2+
 
-Files debian/*
+Files: ./debian/*
 Copyright: 2006, Jon Dowland <jmtd at debian.org>
            Ansgar Burchardt <ansgar at 43-1.org>
            Barry deFreese <bddebian at comcast.net>
@@ -57,19 +64,20 @@ Copyright: 2006, Jon Dowland <jmtd at debian.org>
            Marco Rodrigues <gothicx at sapo.pt>
            Miriam Ruiz <little_miry at yahoo.es>
            Peter De Wachter <pdewacht at gmail.com>
+License: GPL-2+
 
-Files: src/md5.[ch]
+Files: ./src/md5.[ch]
 Copyright: 1993, Colin Plumb
            Ian Jackson
 License: Public Domain or GPL-2+
 
-Files: msvc/inttypes.h, msvc/stdint.h
+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.
 
-Files: Makefile.in */Makefile.in ./textscreen/examples/Makefile.in
+Files: Makefile.in
 Copyright: 1994-2008 Free Software Foundation, Inc.
 License: This Makefile.in is free software; the Free Software
          Foundation gives unlimited permission to copy and/or
@@ -78,6 +86,9 @@ License: This Makefile.in is free software; the Free Software
 
 Files: aclocal.m4
 Copyright: 1996-2008 Free Software Foundation, Inc.
+License: This Makefile.in is free software; the Free Software
+         Foundation gives unlimited permission to copy and/or
+         distribute it, with or without modifications, as long
 
 Files: configure
 Copyright: 1992-2008 Free Software Foundation, Inc.
@@ -85,7 +96,7 @@ License: This configure script is free software; the Free
          Software Foundation gives unlimited permission to copy,
          distribute and modify it.
 
-Files: autotools/install-sh
+Files: ./autotools/install-sh
 Copyright: 1994 X Consortium
 License: MIT
  Permission is hereby granted, free of charge, to any person

-- 
chocolate-doom: Doom engine closely-compatible with vanilla doom