As per ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change,

remove the so-called advertising clause from these files' license,
making it compatible with the Debian Free Software Guidelines.  As
these files were obtained from FreeBSD, this change was discussed
with and approved by the FreeBSD core team.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1208 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/include/compat/vis.h b/varnish-cache/include/compat/vis.h
index 6b257f03c69e70b779e070b5a5024c3df7c40c37..7cf4c0859db9abe4d3fb5486e5c38fc87a98fbbe 100644 (file)
--- a/varnish-cache/include/compat/vis.h
+++ b/varnish-cache/include/compat/vis.h
@@ -10,11 +10,7 @@
  * 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. 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *

diff --git a/varnish-cache/lib/libcompat/vis.c b/varnish-cache/lib/libcompat/vis.c
index 5496519e34e485f5cd6404f6edec9bef60ebc5bf..82303bc3b408d4461199429de9059cca2fd99472 100644 (file)
--- a/varnish-cache/lib/libcompat/vis.c
+++ b/varnish-cache/lib/libcompat/vis.c
@@ -10,11 +10,7 @@
  * 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. 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *