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 aa1ce896b3212e92de6c42b0493c13a1cf417cc1..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
@@ -57,7 +57,7 @@ License: GPL-2+
 
 Files: dh_installinit
 Copyright: 1997-2008 Joey Hess <joeyh@debian.org>
-           2009 Canonical Ltd.
+           2009,2011 Canonical Ltd.
 License: GPL-3+
 
 Files: dh_installgsettings