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

[Jon Dowland]

The following commit has been merged in the master branch:
commit cf4b5ae438316366aceb0b66fb970bcca372a179
Author: Jon Dowland <jmtd at debian.org>
Date:   Fri Sep 3 14:21:52 2010 +0100

    quiet, lintain, quiet!

diff --git a/debian/changelog b/debian/changelog
index 3ee84e2..03d711c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chocolate-doom (1.4.0-2) unstable; urgency=low
+
+  * Incorporate specific BSD license information into
+    debian/copyright, to please lintian.
+
+ -- Jon Dowland <jmtd at debian.org>  Fri, 03 Sep 2010 14:20:45 +0100
+
 chocolate-doom (1.4.0-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/copyright b/debian/copyright
index a818cf0..e1774d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -74,8 +74,29 @@ 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.
+ 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. The name of the author may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: Makefile.in
 Copyright: 1994-2008 Free Software Foundation, Inc.

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