Remove UC Berkeley advertising clause

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

diff --git a/ChangeLog b/ChangeLog
index 7170016277f0a0e4ac9672284ac221b4bf667366..f457477ba185d6781a06010e28a7b75475c8c7c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-16  Guillem Jover  <guillem@debian.org>
+
+       * include/vis.h: Remove UC Berkeley advertising clause, as per
+       <ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>.
+       * src/vis.c: Likewise.
+       * src/unvis.c: Likewise.
+       * src/heapsort.c: Likewise.
+       * src/linkaddr.c: Likewise.
+
 2007-12-18  Petr Salinger  <Petr.Salinger@seznam.cz>
 
        * include/bsd/queue.h: sync with current glibc variant on GNU/kFreeBSD

diff --git a/include/vis.h b/include/vis.h
index 329481b0f986066a6fa80c5c4ffa7b40e40b9aa7..ced5fd96b3a8e95b53fb34325c15fa1a7135f3ef 100644 (file)
--- a/include/vis.h
+++ b/include/vis.h
@@ -10,10 +10,6 @@
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

diff --git a/src/heapsort.c b/src/heapsort.c
index 881e7cf049a70c0ab0b61ecbbe3b971f7cca007e..3a060fa6a041f1a77a2093c764d0635ff0ffb4c2 100644 (file)
--- a/src/heapsort.c
+++ b/src/heapsort.c
@@ -13,10 +13,6 @@
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

diff --git a/src/linkaddr.c b/src/linkaddr.c
index 0161558ca9752fff4d1b44a4d30a2be736bdec33..a6bea39df223913ec96571601ba685cb2faf826a 100644 (file)
--- a/src/linkaddr.c
+++ b/src/linkaddr.c
@@ -10,10 +10,6 @@
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

diff --git a/src/unvis.c b/src/unvis.c
index b56713660c21219dbfeb9c7449dd7de4dbcab619..573e71a315ecb610559321327e7d0c786d767f81 100644 (file)
--- a/src/unvis.c
+++ b/src/unvis.c
@@ -10,10 +10,6 @@
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

diff --git a/src/vis.c b/src/vis.c
index bd3f6f9cab2052bfd989f616dec684de0e2cba79..348562d8ab9ddcaf459e6e494ec0ee98046aa758 100644 (file)
--- a/src/vis.c
+++ b/src/vis.c
@@ -10,10 +10,6 @@
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.