X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=debian%2Fcopyright;h=8a68f1ba5aec44a132022316274b785a54c1e6e1;hb=baf7ecb339b6978b2cfd0052c2d0acb28028d5d2;hp=172bc0696e8360025fbcdc78cbf369d4509b24d1;hpb=479b0f4cc3e93e0eb79b584acb572ae62c47b5c5;p=rrq%2Fmaintain_lilo.git

diff --git a/debian/copyright b/debian/copyright
index 172bc06..8a68f1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,38 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lilo
-Upstream-Contact: Joachim Wiedorn <ad_debian@joonet.de>
-Source: http://lilo.alioth.debian.org/
+Upstream-Contact: Joachim Wiedorn <joodevel@joonet.de>
+Source: http://lilo.joonet.de/
 
 
 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-2011, Joachim Wiedorn <ad_debian@joonet.de>
+Copyright: 2010-2018, 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 
@@ -44,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'.
-