Update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 81a2bf364a33c37b334b5be8e4bdebbeefce669f..4f4a88e7bc3077a830cb346dbc4ebdb9f8176410 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dactyl (1.0+hg6923-1) UNRELEASED; urgency=low
   * Use Git URLs with an anonscm.debian.org host part for the VCS pointers in
     debian/control.
   * Bump Standards-Version: to 3.9.4; no changes necessary.
   * Use Git URLs with an anonscm.debian.org host part for the VCS pointers in
     debian/control.
   * Bump Standards-Version: to 3.9.4; no changes necessary.

+  * Update debian/copyright: Set Format: correctly, bump years and add a
+    stanza for binary/*.

 
  -- Michael Schutte <michi@debian.org>  Tue, 07 May 2013 11:41:31 +0200
 
 
  -- Michael Schutte <michi@debian.org>  Tue, 07 May 2013 11:41:31 +0200
 

diff --git a/debian/copyright b/debian/copyright
index a4520046562a9a95f4e947077f7acbc0699f8dba..48659f832d464edc15a3bc8a8c292aad5357ab61 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,25 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

 Upstream-Name: dactyl
 Upstream-Contact: pentadactyl@googlegroups.com
 Source: http://code.google.com/p/dactyl
 
 Files: *
 Upstream-Name: dactyl
 Upstream-Contact: pentadactyl@googlegroups.com
 Source: http://code.google.com/p/dactyl
 
 Files: *

-Copyright: © 2006-2009 Martin Stubenschrott <stubenschrott@vimperator.org>
-           © 2007-2009 Doug Kearns <dougkearns@gmail.com>
-           © 2008-2010 Kris Maglione <maglione.k@gmail.com>
+Copyright: 2006-2009, Martin Stubenschrott <stubenschrott@vimperator.org>
+           2007-2013, Doug Kearns <dougkearns@gmail.com>
+           2008-2013, Kris Maglione <maglione.k@gmail.com>

 License: MIT
 
 Files: common/tests/functional/shared-modules/*
 License: MIT
 
 Files: common/tests/functional/shared-modules/*

-Copyright: © 2009-2010 Mozilla Foundation
+Copyright: 2009-2010, Mozilla Foundation
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
+
+Files: binary/*
+Copyright: 1998, Netscape Communications Corporation
+           2010-2011, Mozilla Foundation

 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
 Files: debian/*
 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
 Files: debian/*

-Copyright: © 2011 Michael Schutte <michi@debian.org>
+Copyright: 2011-2013, Michael Schutte <michi@debian.org>

 License: MIT
 
 License: MIT
 License: MIT
 
 License: MIT