[pkg-lighttpd] r487 - lighttpd/trunk/debian

[Olaf van der Spek]

Author: olafvdspek-guest
Date: 2010-09-10 10:22:58 +0000 (Fri, 10 Sep 2010)
New Revision: 487

Modified:
   lighttpd/trunk/debian/copyright
Log:
Replace reference to /usr/share/common-licenses/BSD by original text.


Modified: lighttpd/trunk/debian/copyright
===================================================================
--- lighttpd/trunk/debian/copyright	2010-09-10 09:40:20 UTC (rev 486)
+++ lighttpd/trunk/debian/copyright	2010-09-10 10:22:58 UTC (rev 487)
@@ -10,10 +10,32 @@
 Copyright (c) 2004, Jan Kneschke, incremental
  All rights reserved.
 
-You are free to distribute this software under the terms of the BSD License.
-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:
 
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+- 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.
+
+- Neither the name of the 'incremental' 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+
 src/fastcgi.h
 Copyright (c) 1995-1996 Open Market, Inc