Update and reformat debian/copyright file

diff --git a/debian/changelog b/debian/changelog
index 5c5f06b666e1ef80ea72b51ade6a98a8c3da5b32..43aebbb6649840d9c11704d0d3b33ce01626ab50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ lilo (1:23.1-1) unstable; urgency=low
   * Bump to Standards Version 3.9.1.
   * Move to debhelper compatibility level 7.
   * Move to source format 3.0 (quilt).
+  * Update and new formatting of debian/copyright.
 
- -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 18 Nov 2010 17:52:02 +0100
+ -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 18 Nov 2010 18:12:02 +0100
 
 lilo (1:22.8-8.3) unstable; urgency=high
 

diff --git a/debian/copyright b/debian/copyright
index 3339058537fc499c3dd8699bcbf5e3bbd6d5162a..a91184241b984a28dde8e7d268b348a183c44690 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,44 +1,48 @@
-This package is maintained primarily by William Pitcock
-<nenolod@sacredspiral.co.uk>, with some help from Matt Arnold
-<mattarnold5@gmail.com>.
-
-The sources used to build lilo are obtained from:
-  http://lilo.go.dyndns.org/pub/linux/lilo/
-
-This package was formerly maintained by Andrés Roldán <aroldan@debian.org>
-and Luis Bustamante <luferbu@fluidsignal.com>.
-
-This package was previously maintained by Russell Coker
-<russell@coker.com.au> and Bruce Perens <Bruce@Pixar.com>.
-See changelog.Debian.gz to see other people who had
-contribute to this package.
-
-Upstream Author: John Coffman <JohnInSD@san.rr.com>
-                
-Copyright:
-
-  LILO program code, documentation and auxiliary programs are
-  Copyright 1992-1998 Werner Almesberger.
-  Copyright 1999-2000 John Coffman.
-  All rights reserved.
-
-License:
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: lilo
+Maintainer: Joachim Wiedorn <ad_debian@joonet.de>
+Source: http://lilo.alioth.debian.org/
+
+
+Files: *
+Copyright: 2009-2010, Joachim Wiedorn
+           1999-2007, John Coffman
+           1992-1998, Werner Almesberger
+           All rights reserved.
+License: BSD
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are 
   met:
-
-  * Redistributions of source code must retain the above copyright notice,
+  
+  * Redistributions of source code must retain the above copyright notice, 
     this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
+  
+  * 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.
+  
+  * Neither the names of the authors nor the names of other contributors 
+    may be used to endorse or promote products derived from this software 
+    without specific prior written permission. 
+
+
+Files: debian/*
+Copyright: 2010, Joachim Wiedorn <ad_debian@joonet.de>
+           2008-2010, Matt Arnold <mattarnold5@gmail.com>
+License: GPL-2+
+  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 package 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/>.
+  .
+  On Debian systems, the complete text of the GNU General Public License
+  version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
 
-  * Neither the names of the author(s) nor the names of other contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-The Debian packaging of lilo is copyright (c) 2008 the package maintainers,
-and provided under the terms of the GPL. For your convenience, 
-`/usr/share/common-licenses/GPL' contains a copy of the license text.