dh_installinit: rework upstart handling to comply with new policy proposal; packages...

[debhelper.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 913a2f626a648dcf8ebc15a7f850c11e388cd58e..4ec9761d2e1767b40f9201d873051d271104b4a0 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 1997-2011 Joey Hess <joeyh@debian.org>
@@ -6,7 +6,7 @@ License: GPL-2+
 
 Files: examples/* autoscripts/*
 Copyright: 1997-2011 Joey Hess <joeyh@debian.org>
-License: other
+License: public-domain
  These files are in the public domain.
  .
  Pedants who belive I cannot legally say that code I have written is in
@@ -56,23 +56,44 @@ Copyright: Modestas Vainius <modestas@vainius.eu>
 License: GPL-2+
 
 Files: dh_installinit
-Copyright: 1997-2008 Joey Hess <joeyh@debian.org>,
-           2009 Canonical Ltd.
+Copyright: 1997-2008 Joey Hess <joeyh@debian.org>
+           2009,2011 Canonical Ltd.
 License: GPL-3+
 
+Files: dh_installgsettings
+Copyright: 2010 Laurent Bigonville <bigon@debian.org>
+           2011 Josselin Mouette <joss@debian.org>
+License: GPL-2+
+
+Files: dh_ucf
+Copyright: 2011 Jeroen Schot <schot@A-Eskwadraat.nl>
+License: GPL-2+
+
 Files: Debian/Debhelper/Buildsystem/qmake.pm
-Copyright: © 2010 Kel Modderman
+Copyright: 2010 Kel Modderman
 License: GPL-2+
 
 Files: Debian/Debhelper/Buildsystem* Debian/Debhelper/Dh_Buildsystems.pm
-Copyright: © 2008-2009 Modestas Vainius
+Copyright: 2008-2009 Modestas Vainius
+License: GPL-2+
+
+Files: man/po4a/po/fr.po
+Copyright: 2005-2011 Valery Perrin <valery.perrin.debian@free.fr>
+License: GPL-2+
+
+Files: man/po4a/po/es.po
+Copyright: 2005-2010 Software in the Public Interest
+License: GPL-2+
+
+Files: man/po4a/po/de.po
+Copyright: 2011 Chris Leick
 License: GPL-2+
 
 License: GPL-2+
- The full text of the GPL is distributed as in
+ The full text of the GPL version 2 is distributed in
  /usr/share/common-licenses/GPL-2 on Debian systems.
 
 License: GPL-3+
- The full text of the GPL is distributed as in
+ The full text of the GPL version 3 is distributed in
  /usr/share/common-licenses/GPL-3 on Debian systems.