From f12b51f99bbe8bb6ad7eca12b047ba9b46836ee6 Mon Sep 17 00:00:00 2001 From: agc Date: Thu, 7 Aug 2003 09:36:50 +0000 Subject: Move UCB-licensed code from 4-clause to 3-clause licence. Patches provided by Joel Baker in PR 22269, verified by myself. --- primes/pattern.c | 10 +++------- primes/pr_tbl.c | 10 +++------- primes/primes.c | 10 +++------- primes/primes.h | 8 ++------ 4 files changed, 11 insertions(+), 27 deletions(-) (limited to 'primes') diff --git a/primes/pattern.c b/primes/pattern.c index d960a39e..11960567 100644 --- a/primes/pattern.c +++ b/primes/pattern.c @@ -1,4 +1,4 @@ -/* $NetBSD: pattern.c,v 1.5 1999/09/08 21:17:55 jsm Exp $ */ +/* $NetBSD: pattern.c,v 1.6 2003/08/07 09:37:33 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,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. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)pattern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pattern.c,v 1.5 1999/09/08 21:17:55 jsm Exp $"); +__RCSID("$NetBSD: pattern.c,v 1.6 2003/08/07 09:37:33 agc Exp $"); #endif #endif /* not lint */ diff --git a/primes/pr_tbl.c b/primes/pr_tbl.c index f743cf5c..d45204a0 100644 --- a/primes/pr_tbl.c +++ b/primes/pr_tbl.c @@ -1,4 +1,4 @@ -/* $NetBSD: pr_tbl.c,v 1.6 2001/01/20 15:06:34 itojun Exp $ */ +/* $NetBSD: pr_tbl.c,v 1.7 2003/08/07 09:37:33 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,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. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)pr_tbl.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pr_tbl.c,v 1.6 2001/01/20 15:06:34 itojun Exp $"); +__RCSID("$NetBSD: pr_tbl.c,v 1.7 2003/08/07 09:37:33 agc Exp $"); #endif #endif /* not lint */ diff --git a/primes/primes.c b/primes/primes.c index bd2a993c..44af6ea7 100644 --- a/primes/primes.c +++ b/primes/primes.c @@ -1,4 +1,4 @@ -/* $NetBSD: primes.c,v 1.10 2001/01/20 15:06:35 itojun Exp $ */ +/* $NetBSD: primes.c,v 1.11 2003/08/07 09:37:33 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,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. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95"; #else -__RCSID("$NetBSD: primes.c,v 1.10 2001/01/20 15:06:35 itojun Exp $"); +__RCSID("$NetBSD: primes.c,v 1.11 2003/08/07 09:37:33 agc Exp $"); #endif #endif /* not lint */ diff --git a/primes/primes.h b/primes/primes.h index 3197d271..a032c9b4 100644 --- a/primes/primes.h +++ b/primes/primes.h @@ -1,4 +1,4 @@ -/* $NetBSD: primes.h,v 1.4 1995/03/23 08:35:58 cgd Exp $ */ +/* $NetBSD: primes.h,v 1.5 2003/08/07 09:37:34 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,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. * -- cgit v1.2.3