X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=debian%2Fcopyright;h=8818831f68afc4a42a47418e05642d11f9938501;hb=a3393654ed24df9b0669ad4c52440b776cf2842a;hp=3339058537fc499c3dd8699bcbf5e3bbd6d5162a;hpb=e54ace12fd683ce1f41b25ed66641e40b84212b0;p=rrq%2Fmaintain_lilo.git

diff --git a/debian/copyright b/debian/copyright
index 3339058..8818831 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,44 +1,47 @@
-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://dep.debian.net/deps/dep5/
+Upstream-Name: lilo
+Upstream-Contact: Joachim Wiedorn <ad_debian@joonet.de>
+Source: http://lilo.alioth.debian.org/
+
+
+Files: *
+Copyright: 2009-2011, 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-2011, Joachim Wiedorn <ad_debian@joonet.de>
+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.