* Copyright updates: debian/copyright, etc.

- debian/copyright: Switch to machine-interpretable copyright
- apt/*.py: Fix the copyright years and comments.

2 files changed, 53 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index f51944f9..91ce7304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ python-apt (0.7.10~exp1) experimental; urgency=low
     - Remove mdz from Uploaders (Closes: #521477), add myself.
     - Update Standards-Version to 3.8.1
     - Use ${binary:Version} instead of ${Source-Version}
+  * debian/copyright: Switch to machine-interpretable copyright
 
  -- Julian Andres Klode <jak@debian.org>  Wed, 01 Apr 2009 15:24:29 +0200
 
diff --git a/debian/copyright b/debian/copyright
index f8463185..8599328a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,53 @@
-APT is free software; you can redistribute them and/or modify them under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=443
 
-On Debian systems, a copy of the GNU General Public License can be
-found in /usr/share/common-licenses/GPL.
+Files: *
+Copyright: © 2004-2009 Canonical Ltd.
+License: GPL-2+
+
+Files: aptsources/*.py
+Copyright: © 2004-2009 Canonical Ltd.
+Copyright: © 2005 Gustavo Noronha Silva
+Copyright: © 2006-2007 Sebastian Heinlein
+License: GPL-2+
+
+Files: doc/source/*
+Copyright: © 2009 Julian Andres Klode <jak@debian.org>
+License: GPL-2+
+
+Files: utils/get_*.py
+Copyright: © 2006 Free Software Foundation Europe
+License: GPL-2+
+
+Files: po/*
+Copyright: © 2006 Canonical Ltd, and Rosetta Contributors 2006
+License: GPL-2+
+
+Files: po/de.po
+Copyright: © 2005 Michiel Sikkes <michiel@eyesopened.nl>
+License: GPL-2+
+
+Files: po/en_CA.po
+Copyright: © 2005 Adam Weinberger and the GNOME Foundation
+License: GPL-2+
+
+Files: po/fi.po
+Copyright: © 2005-2006 Timo Jyrinki
+License: GPL-2+
+
+Files: po/fr.po
+Copyright: © 2007 Hugues NAULET <hnaulet@gmail.com>
+License: GPL-2+
+
+Files: po/hu.po, po/lt.po, po/pt.po, po/ro.po, po/rw.po, po/sv.po, po/uk.po,
+       po/zh_HK.po
+Copyright: © 2005-2006 Free Software Foundation
+License: GPL-2+
+
+License: GPL-2+
+ APT is free software; you can redistribute them and/or modify them under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+ .
+ On Debian systems, a copy of the GNU General Public License can be
+ found in /usr/share/common-licenses/GPL-2.