r11164 - packages/trunk/warzone2100/debian

[Paul Wise]

Author: pabs
Date: 2010-07-26 17:56:04 +0000 (Mon, 26 Jul 2010)
New Revision: 11164

Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/copyright
Log:
Include full text of BSD license in copyright information

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2010-07-26 14:51:05 UTC (rev 11163)
+++ packages/trunk/warzone2100/debian/changelog	2010-07-26 17:56:04 UTC (rev 11164)
@@ -4,6 +4,7 @@
   * Drop "Resurrection" from description on upstream's request
   * Fix FTBFS when building twice in a row (Closes: #588006)
   * Drop libglee-dev package alternative since it doesn't exist
+  * Include full text of BSD license in copyright information
 
  -- Paul Wise <pabs at debian.org>  Wed, 23 Jun 2010 10:01:48 +0800
 

Modified: packages/trunk/warzone2100/debian/copyright
===================================================================
--- packages/trunk/warzone2100/debian/copyright	2010-07-26 14:51:05 UTC (rev 11163)
+++ packages/trunk/warzone2100/debian/copyright	2010-07-26 17:56:04 UTC (rev 11164)
@@ -179,8 +179,29 @@
 Files: lib/netplay/miniupnpc/bsdqueue.h
 Copyright: 1991, 1993 The Regents of the University of California.
 License: BSD
- On Debian systems, the complete text of the BSD License
- can be found in `/usr/share/common-licenses/BSD'.
+ 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 University 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 REGENTS 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 REGENTS 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: lib/script/chat_lexer.l, lib/script/chat_parser.y,
  lib/script/chat_processing.h