More GPLv2+ license boilerplate updates.

4 files changed, 61 insertions, 31 deletions

diff --git a/anaconda b/anaconda
index e389cd5f6..f1db0257e 100755
--- a/anaconda
+++ b/anaconda
@@ -2,27 +2,30 @@
 #
 # anaconda: The Red Hat Linux Installation program
 #
-# (in alphabetical order...)
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Red Hat, Inc.  All rights reserved.
 #
-# Brent Fox <bfox@redhat.com>
-# Mike Fulbright <msf@redhat.com>
-# Jakub Jelinek <jakub@redhat.com>
-# Jeremy Katz <katzj@redhat.com>
-# Chris Lumens <clumens@redhat.com>
-# Paul Nasrat <pnasrat@redhat.com>
-# Erik Troan <ewt@rpath.com>
-# Matt Wilson <msw@rpath.com>
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 #
-# ... And many others
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Copyright 1999-2007 Red Hat, Inc.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# This software may be freely redistributed under the terms of the GNU
-# library public license.
-#
-# You should have received a copy of the GNU Library Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Red Hat Author(s): Brent Fox <bfox@redhat.com>
+#                    Mike Fulbright <msf@redhat.com>
+#                    Jakub Jelinek <jakub@redhat.com>
+#                    Jeremy Katz <katzj@redhat.com>
+#                    Chris Lumens <clumens@redhat.com>
+#                    Paul Nasrat <pnasrat@redhat.com>
+#                    Erik Troan <ewt@rpath.com>
+#                    Matt Wilson <msw@rpath.com>
 #
 
 # This toplevel file is a little messy at the moment...
diff --git a/mini-wm.c b/mini-wm.c
index c388d4d1a..ae9ffcb48 100644
--- a/mini-wm.c
+++ b/mini-wm.c
@@ -1,20 +1,24 @@
 /*
  * mini-wm.c - simple keyboard focus handling 'wm'.
  *
- * Owen Taylor <otaylor@redhat.com>
+ * Copyright (C) 2002  Red Hat, Inc.  All rights reserved.
  *
- * Copyright 2002 Red Hat, Inc.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * Red Hat Author(s): Owen Taylor <otaylor@redhat.com>
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/py-compile b/py-compile
index b60649de6..bad02e819 100755
--- a/py-compile
+++ b/py-compile
@@ -1,4 +1,23 @@
 #!/bin/sh
+#
+# py-compile
+#
+# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 # called as "py-compile [--basedir DIR] PY_FILES ...
 
 if [ -z "$PYTHON" ]; then
diff --git a/xutils.c b/xutils.c
index 8eb9ee1ac..a0034342e 100644
--- a/xutils.c
+++ b/xutils.c
@@ -1,20 +1,24 @@
 /*
  * xutils.c - a Python wrapper for common Xlib ops
  *
- * Michael Fulbright <msf@redhat.com>
+ * Copyright (C) 2002  Red Hat, Inc.  All rights reserved.
  *
- * Copyright 2002 Red Hat, Inc.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * Red Hat Author(s): Michael Fulbright <msf@redhat.com>
  */
 
-
 #include <Python.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>