Remove the advertising clause from my license notice FOR THIS PROGRAM ONLY.

The purpose of that modification is to make the license on these files
"GPL-compatible," so that mdsetimage may be combined with BFD.  (The
resulting license is word-for-word identicial to one of the licenses
described as being GPL compatible on
http://www.gnu.org/licenses/license-list.html.)

2 files changed, 14 insertions, 20 deletions

diff --git a/cross/bfd-mdsetimage/files/mdsetimage.8 b/cross/bfd-mdsetimage/files/mdsetimage.8
index 2a8a47dc336..04f156311db 100644
--- a/cross/bfd-mdsetimage/files/mdsetimage.8
+++ b/cross/bfd-mdsetimage/files/mdsetimage.8
@@ -1,7 +1,8 @@
-.\"	$NetBSD: mdsetimage.8,v 1.1.1.1 1999/12/20 05:58:34 sakamoto Exp $
-.\"
-.\" Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+.\"	$NetBSD: mdsetimage.8,v 1.2 2001/10/01 23:39:25 cgd Exp $
 .\"
+.\" Copyright (c) 1996 Christopher G. Demetriou
+.\" All rights reserved.
+.\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -10,13 +11,9 @@
 .\" 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 Christopher G. Demetriou
-.\"      for the NetBSD Project.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
+.\" 3. 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
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -27,6 +24,8 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" 
+.\" <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
 .\"
 .Dd October 3, 1996
 .Dt MDSETIMAGE 8
diff --git a/cross/bfd-mdsetimage/files/mdsetimage.c b/cross/bfd-mdsetimage/files/mdsetimage.c
index 6775cd21b4e..a45bc3426de 100644
--- a/cross/bfd-mdsetimage/files/mdsetimage.c
+++ b/cross/bfd-mdsetimage/files/mdsetimage.c
@@ -1,10 +1,10 @@
-/* $NetBSD: mdsetimage.c,v 1.2 2001/03/23 13:02:40 sakamoto Exp $ */
+/* $NetBSD: mdsetimage.c,v 1.3 2001/10/01 23:39:25 cgd Exp $ */
 /* from: NetBSD: mdsetimage.c,v 1.15 2001/03/21 23:46:48 cgd Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou
  * All rights reserved.
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,12 +13,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 for the
- *          NetBSD Project.  See http://www.netbsd.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. 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
@@ -32,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+ * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
  */
 
 #include <sys/cdefs.h>
@@ -43,7 +38,7 @@ __COPYRIGHT(
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: mdsetimage.c,v 1.2 2001/03/23 13:02:40 sakamoto Exp $");
+__RCSID("$NetBSD: mdsetimage.c,v 1.3 2001/10/01 23:39:25 cgd Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>