Author: des
Date: 2006-11-02 13:57:57 +0100 (Thu, 02 Nov 2006)
New Revision: 1215
Modified:
branches/1.0/
branches/1.0/include/compat/vis.h
branches/1.0/lib/libcompat/vis.c
Log:
r33651 at cat (orig r1208): des | 2006-11-02 13:57:11 +0100
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.
Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
- d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1207
+ d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1208
Modified: branches/1.0/include/compat/vis.h
===================================================================
--- branches/1.0/include/compat/vis.h 2006-11-02 12:57:56 UTC (rev 1214)
+++ branches/1.0/include/compat/vis.h 2006-11-02 12:57:57 UTC (rev 1215)
@@ -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.
*
Modified: branches/1.0/lib/libcompat/vis.c
===================================================================
--- branches/1.0/lib/libcompat/vis.c 2006-11-02 12:57:56 UTC (rev 1214)
+++ branches/1.0/lib/libcompat/vis.c 2006-11-02 12:57:57 UTC (rev 1215)
@@ -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.
*
Date: 2006-11-02 13:57:57 +0100 (Thu, 02 Nov 2006)
New Revision: 1215
Modified:
branches/1.0/
branches/1.0/include/compat/vis.h
branches/1.0/lib/libcompat/vis.c
Log:
r33651 at cat (orig r1208): des | 2006-11-02 13:57:11 +0100
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.
Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
- d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1207
+ d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1208
Modified: branches/1.0/include/compat/vis.h
===================================================================
--- branches/1.0/include/compat/vis.h 2006-11-02 12:57:56 UTC (rev 1214)
+++ branches/1.0/include/compat/vis.h 2006-11-02 12:57:57 UTC (rev 1215)
@@ -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.
*
Modified: branches/1.0/lib/libcompat/vis.c
===================================================================
--- branches/1.0/lib/libcompat/vis.c 2006-11-02 12:57:56 UTC (rev 1214)
+++ branches/1.0/lib/libcompat/vis.c 2006-11-02 12:57:57 UTC (rev 1215)
@@ -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.
*