Update of debian/copyright file (DEP-5)

diff --git a/debian/changelog b/debian/changelog
index a8a44d383d2f5c0b0d534520cf853bd775ec7ec1..8f42ef05910c9eaa8a6ade01d94537197fa60d83 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ lilo (1:23.2-3) unstable; urgency=low
   * Fix of some typos in user.tex file (string EBDA).
   * Add infos about old documentation in README.Debian.
   * Bump to Standards Version 3.9.3 (no changes).
+  * Bump to Copyright Format 1.0 (DEP-5).
 
  -- Joachim Wiedorn <ad_debian@joonet.de>  Sun, 04 Mar 2012 00:28:31 +0100
 

diff --git a/debian/copyright b/debian/copyright
index 8818831f68afc4a42a47418e05642d11f9938501..10a581f29dfd190d350283c85de42c561bf02901 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,33 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://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/
 
 
 Files: *
-Copyright: 2009-2011, Joachim Wiedorn
+Copyright: 2009-2012, 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: debian/*
-Copyright: 2010-2011, Joachim Wiedorn <ad_debian@joonet.de>
+Copyright: 2010-2012, 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