From 2434e3142847d87c488e7333f6b7486c3df39b69 Mon Sep 17 00:00:00 2001 From: des Date: Thu, 2 Nov 2006 12:57:11 +0000 Subject: [PATCH] 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 --- varnish-cache/include/compat/vis.h | 6 +----- varnish-cache/lib/libcompat/vis.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/varnish-cache/include/compat/vis.h b/varnish-cache/include/compat/vis.h index 6b257f03..7cf4c085 100644 --- 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 5496519e..82303bc3 100644 --- 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. * -- 2.39.5