Update weblinks and email addresses

[rrq/maintain_lilo.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 10a581f29dfd190d350283c85de42c561bf02901..8a68f1ba5aec44a132022316274b785a54c1e6e1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,13 @@
-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-2012, Joachim Wiedorn
+Copyright: 2009-2015, Joachim Wiedorn

            1999-2007, John Coffman
            1992-1998, Werner Almesberger
            1999-2007, John Coffman
            1992-1998, Werner Almesberger

-           All rights reserved.

 License: BSD-3-clause
   Redistribution and use in source and binary forms, with or without 
   modification, are permitted provided that the following conditions are 
 License: BSD-3-clause
   Redistribution and use in source and binary forms, with or without 
   modification, are permitted provided that the following conditions are 


@@ -25,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-2012, 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 
 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'.
   .
   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'.

-