Update debian/copyright

[dactyl.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index e9c9d02211d6256d68e6196ad8e87863de9e9359..48659f832d464edc15a3bc8a8c292aad5357ab61 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,48 +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: *
-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/*
-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+
- The contents of this file are subject to the Mozilla Public License
- Version 1.1 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- .
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- License for the specific language governing rights and limitations
- under the License.
- .
- The Original Code is MozMill Test code.
- .
- The Initial Developer of the Original Code is Mozilla Foundation.
- Portions created by the Initial Developer are Copyright (C) the Initial
- Developer. All Rights Reserved.
- .
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the
- "LGPL"), in which case the provisions of the GPL or the LGPL are
- applicable instead of those above.  If you wish to allow use of your
- version of this file only under the terms of either the GPL or the
- LGPL, and not to allow others to use your version of this file under
- the terms of the MPL, indicate your decision by deleting the provisions
- above and replace them with the notice and other provisions required by
- the GPL or the LGPL. If you do not delete the provisions above, a
- recipient may use your version of this file under the terms of any one
- of the MPL, the GPL or the LGPL.
 
 Files: debian/*
-Copyright: © 2011 Michael Schutte <michi@debian.org>
+Copyright: 2011-2013, Michael Schutte <michi@debian.org>
 License: MIT
 
 License: MIT