Module Name: src
Committed By: snj
Date: Sun Nov 15 20:38:36 UTC 2009
Modified Files:
src/sys/arch/amiga/dev: bztzsc.c
src/sys/arch/amiga/stand/bootblock/boot: main.c startit.s
src/sys/arch/amiga/stand/bootblock/bootxx_ffs: main.c startit.s
Log Message:
Drop 3rd and 4th clauses (except in one case, where copyright is shared
with UCB and only the 3rd clause is dropped). Approved by mhitch@ and is@
(copyright holders).
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/dev/bztzsc.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/stand/bootblock/boot/main.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/stand/bootblock/boot/startit.s
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/bztzsc.c
diff -u src/sys/arch/amiga/dev/bztzsc.c:1.31 src/sys/arch/amiga/dev/bztzsc.c:1.32
--- src/sys/arch/amiga/dev/bztzsc.c:1.31 Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/bztzsc.c Sun Nov 15 20:38:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bztzsc.c,v 1.31 2008/04/13 04:55:52 tsutsui Exp $ */
+/* $NetBSD: bztzsc.c,v 1.32 2009/11/15 20:38:35 snj Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -14,11 +14,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 contains software written by Ignatios Souvatzis and
- * Michael L. Hitch for the NetBSD project.
- * 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.
*
@@ -42,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bztzsc.c,v 1.31 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bztzsc.c,v 1.32 2009/11/15 20:38:35 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/stand/bootblock/boot/main.c
diff -u src/sys/arch/amiga/stand/bootblock/boot/main.c:1.24 src/sys/arch/amiga/stand/bootblock/boot/main.c:1.25
--- src/sys/arch/amiga/stand/bootblock/boot/main.c:1.24 Mon Jan 12 07:42:30 2009
+++ src/sys/arch/amiga/stand/bootblock/boot/main.c Sun Nov 15 20:38:35 2009
@@ -1,5 +1,5 @@
/*
- * $NetBSD: main.c,v 1.24 2009/01/12 07:42:30 tsutsui Exp $
+ * $NetBSD: main.c,v 1.25 2009/11/15 20:38:35 snj Exp $
*
*
* Copyright (c) 1996,1999 Ignatios Souvatzis
@@ -14,11 +14,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 Michael L. Hitch.
- * 4. The name of the authors may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/amiga/stand/bootblock/boot/startit.s
diff -u src/sys/arch/amiga/stand/bootblock/boot/startit.s:1.8 src/sys/arch/amiga/stand/bootblock/boot/startit.s:1.9
--- src/sys/arch/amiga/stand/bootblock/boot/startit.s:1.8 Fri Mar 2 16:43:26 2001
+++ src/sys/arch/amiga/stand/bootblock/boot/startit.s Sun Nov 15 20:38:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: startit.s,v 1.8 2001/03/02 16:43:26 mhitch Exp $ */
+/* $NetBSD: startit.s,v 1.9 2009/11/15 20:38:36 snj Exp $ */
/*
* Copyright (c) 1996 Ignatios Souvatzis
@@ -13,11 +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 Michael L. Hitch.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
- * From: $NetBSD: startit.s,v 1.8 2001/03/02 16:43:26 mhitch Exp $
+ * From: $NetBSD: startit.s,v 1.9 2009/11/15 20:38:36 snj Exp $
*/
#include <machine/asm.h>
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c:1.8 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c:1.9
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c:1.8 Mon Jan 12 07:42:30 2009
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c Sun Nov 15 20:38:36 2009
@@ -1,5 +1,5 @@
/*
- * $NetBSD: main.c,v 1.8 2009/01/12 07:42:30 tsutsui Exp $
+ * $NetBSD: main.c,v 1.9 2009/11/15 20:38:36 snj Exp $
*
*
* Copyright (c) 1996,1999 Ignatios Souvatzis
@@ -14,11 +14,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 Michael L. Hitch.
- * 4. The name of the authors may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s:1.2 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s:1.3
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s:1.2 Mon May 20 05:58:45 2002
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s Sun Nov 15 20:38:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: startit.s,v 1.2 2002/05/20 05:58:45 mhitch Exp $ */
+/* $NetBSD: startit.s,v 1.3 2009/11/15 20:38:36 snj Exp $ */
/*
* Copyright (c) 1996 Ignatios Souvatzis
@@ -13,11 +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 Michael L. Hitch.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
- * From: $NetBSD: startit.s,v 1.2 2002/05/20 05:58:45 mhitch Exp $
+ * From: $NetBSD: startit.s,v 1.3 2009/11/15 20:38:36 snj Exp $
*/
#include "machine/asm.h"
