Add externs to avoid multiple definitions, and then add missing definitions.

[rrq/maintain_lilo.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 840e6410c5c962aa103ebde2196e5cbfb447f558..2213390f3977a7a9dd5781b911b25fa37eda0e75 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

 Upstream-Name: lilo
 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: *
 
 
 Files: *

-Copyright: 2009-2014, Joachim Wiedorn
+Copyright: 2009-2015, Joachim Wiedorn

            1999-2007, John Coffman
            1992-1998, Werner Almesberger
 License: BSD-3-clause
            1999-2007, John Coffman
            1992-1998, Werner Almesberger
 License: BSD-3-clause


@@ -24,9 +24,15 @@ License: BSD-3-clause
     may be used to endorse or promote products derived from this software 
     without specific prior written permission. 
 
     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/*
 
 Files: debian/*

-Copyright: 2010-2014, Joachim Wiedorn <ad_debian@joonet.de>
+Copyright: 2010-2019, 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 
 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