Cleaned and updated debian/copyright file.

1 files changed, 38 insertions, 27 deletions

diff --git a/debian/copyright b/debian/copyright
index ffa939c..bd75300 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,39 +4,46 @@ This package was originally debianized by Marcus Brinkmann
 It is currently maintained by its upstream authors, who can be reached
 via <bug-hurd@gnu.org>.
 
-Sources are available from ftp://alpha.gnu.org/gnu/hurd/contrib/okuji/mach/
+It was downloaded from CVS:
 
-Copyright statement:
+   CVSROOT=:ext:anoncvs@savannah.gnu.org:/cvsroot/hurd
+   BRANCH=gnumach-1-branch
+   cvs -d $CVSROOT co -r $BRANCH gnumach
+
+The Debian packages are maintained through Subversion on:
+
+   <http://svn.debian.org/viewcvs/pkg-hurd/gnumach/>
+
+License statement:
 
 Please look at the source files for individual copyrights. They are covered
 by either of the following copyrights:
 
 Most of these files are licensed under the following terms:
-/*
- * Mach Operating System
- * Copyright (c) 1993-1989 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
+
+   Mach Operating System
+   Copyright (c) 1993-1989 Carnegie Mellon University
+   All Rights Reserved.
+
+   Permission to use, copy, modify and distribute this software and its
+   documentation is hereby granted, provided that both the copyright
+   notice and this permission notice appear in all copies of the
+   software, derivative works or modified versions, and any portions
+   thereof, and that both notices appear in supporting documentation.
+
+   CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+   CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+   ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+
+   Carnegie Mellon requests users of this software to return to
+
+    Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+    School of Computer Science
+    Carnegie Mellon University
+    Pittsburgh PA 15213-3890
+
+   any improvements or extensions that they make and grant Carnegie Mellon
+   the rights to redistribute these changes.
 
 Some of these files are licensed under the following terms:
 
@@ -52,3 +59,7 @@ Some of these files are licensed under the following terms:
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL'.
+