X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=debian%2Fcopyright;h=771e729ab3f349f002a2a15c423f9274b19f1898;hb=5e2488fd48f0fd96df446672285aa92114d1eca7;hp=a91184241b984a28dde8e7d268b348a183c44690;hpb=19f1573d776d83f827e530afc95922c9473547a5;p=rrq%2Fmaintain_lilo.git

diff --git a/debian/copyright b/debian/copyright
index a911842..771e729 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,38 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: lilo
-Maintainer: Joachim Wiedorn <ad_debian@joonet.de>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: lilo
+Upstream-Contact: Joachim Wiedorn <joodevel@joonet.de>
 Source: http://lilo.alioth.debian.org/
 
 
 Files: *
-Copyright: 2009-2010, Joachim Wiedorn
+Copyright: 2009-2015, Joachim Wiedorn
            1999-2007, John Coffman
            1992-1998, Werner Almesberger
-           All rights reserved.
-License: BSD
+License: BSD-3-clause
   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, 
     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 
     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: man/*
+Copyright: 2010-2015, Joachim Wiedorn
+License: GPL-2+
 
 Files: debian/*
-Copyright: 2010, Joachim Wiedorn <ad_debian@joonet.de>
-           2008-2010, Matt Arnold <mattarnold5@gmail.com>
+Copyright: 2010-2015, Joachim Wiedorn
+License: GPL-2+
+
+
 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 
@@ -45,4 +49,3 @@ License: GPL-2+
   .
   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'.
-