Enhanced machine type

[netatalk.git] / distrib / debian / copyright

diff --git a/distrib/debian/copyright b/distrib/debian/copyright
index 410845edfef33cd46c4845ba8da6e3e77cd1ec8c..c284410c6ab7366587387ff3bc8a7e9d2953832b 100644 (file)
--- a/distrib/debian/copyright
+++ b/distrib/debian/copyright
@@ -1,13 +1,19 @@
 This is the Debian GNU/Linux prepackaged version of netatalk.
 
 This package was originally put together by Joel 'epsy' Klecker.
-Current maintainer is Sebastian Rittau <srittau@jroger.in-berlin.de>.
+Current maintainer is Sebastian Rittau <srittau@debian.org>.
+
 The sources were obtained from CVS: cvs.netatalk.sourceforge.net.
 See the Netatalk homepage at <http://netatalk.sourceforge.net/> for
 anonymous CVS instructions.
 
 The following copyrights/licenses apply to this software:
 
+The GNU General Public License (GPL). See /usr/share/common-licenses/GPL
+for more information.
+
+This software includes software developed by the University of Michigan.
+
 Copyright (c) 1990,1996 Regents of The University of Michigan.
 All Rights Reserved.
 
@@ -54,38 +60,3 @@ c/o Wesley Craig
 Ann Arbor, Michigan
 +1-313-764-2278
 netatalk@umich.edu
-
-This product includes software developed by the University of Newcastle
-Upon Tyne.
-
-    Copyright 1998 The University of Newcastle upon Tyne
-
-    Permission to use, copy, modify and distribute this software and its
-    documentation for any purpose other than its commercial exploitation
-    is hereby granted without fee, provided that the above copyright
-    notice appear in all copies and that both that copyright notice and
-    this permission notice appear in supporting documentation, and that
-    the name of The University of Newcastle upon Tyne not be used in
-    advertising or publicity pertaining to distribution of the software
-    without specific, written prior permission. The University of
-    Newcastle upon Tyne makes no representations about the suitability of
-    this software for any purpose. It is provided "as is" without express
-    or implied warranty.
-
-    THE UNIVERSITY OF NEWCASTLE UPON TYNE DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE UNIVERSITY OF
-    NEWCASTLE UPON TYNE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-    CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-    USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-
-    Author:  Gerry Tomlinson (gerry.tomlinson@newcastle.ac.uk)
-             Computing Science Department, University of Newcastle upon Tyne, UK
-
-This product includes software developed by the OpenSSL Project
-for use in the OpenSSL Toolkit (http://www.openssl.org/)
-
-See /usr/share/doc/libssl096/copyright for more information on
-libssl and openssl.