r1225 - tags/varnish-1.0.2/debian

[bahner at projects.linpro.no]

Author: bahner
Date: 2006-11-09 11:25:47 +0100 (Thu, 09 Nov 2006)
New Revision: 1225

Modified:
   tags/varnish-1.0.2/debian/copyright
Log:
Changed comments on copyright (which have been fixed).


Modified: tags/varnish-1.0.2/debian/copyright
===================================================================
--- tags/varnish-1.0.2/debian/copyright	2006-11-08 11:23:48 UTC (rev 1224)
+++ tags/varnish-1.0.2/debian/copyright	2006-11-09 10:25:47 UTC (rev 1225)
@@ -2,7 +2,7 @@
 Fri,  6 Oct 2006 16:26:57 +0200.
 
 It was pulled from the Subversion repository with
-svn co http://varnish.projects.linpro.no/svn/trunk
+svn co http://varnish.projects.linpro.no/svn/tags/varnish-1.0.2
 
 Debianizations are an integral part of the main source for varnish,
 so the change for Debian are made before publication of releases, 
@@ -16,28 +16,45 @@
 All rights reserved.
 
 License:
+The source files are under either 2 og 3 clause BSD-style licenses
+as found on this system in the file /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.
+There are no longer four clause BSD-licenses in the source. FreeBSD have 
+been contacted and the license altered in accordance with this
+statement from University of California, Berkeley
+ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+which reads as follows:
 
-THIS SOFTWARE IS PROVIDED BY AUTHOR 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 AUTHOR 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.
+=============================================================================
+July 22, 1999
 
+To All Licensees, Distributors of Any Version of BSD:
+
+As you know, certain of the Berkeley Software Distribution ("BSD") source
+code files require that further distributions of products containing all or
+portions of the software, acknowledge within their advertising materials
+that such products contain software developed by UC Berkeley and its
+contributors.
+
+Specifically, the provision reads:
+
+"     * 3. All advertising materials mentioning features or use of this software
+      *    must display the following acknowledgement:
+      *    This product includes software developed by the University of
+      *    California, Berkeley and its contributors."
+
+Effective immediately, licensees and distributors are no longer required to
+include the acknowledgement within advertising materials.  Accordingly, the
+foregoing paragraph of those BSD Unix files containing it is hereby deleted
+in its entirety.
+
+William Hoskins
+Director, Office of Technology Licensing
+University of California, Berkeley
+=============================================================================
+
+			*
+
 The Debian packaging is (C) 2006, Lars Bahner <bahner at debian.org> and
 is licensed under the GPL version 2. The full text of which can be found
 in the file /usr/share/common-licenses/GPL-2 on this system.