[Pkg-mozext-commits] [SCM] Improve your browsing: more private, more secure branch, master, updated. upstream/0.5.22-5-ga73407c

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit a73407c9e963598adae9b5469ddc82f0028862d7
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Sun Sep 11 17:02:37 2011 +0200

    Fixed d/copyright

diff --git a/debian/copyright b/debian/copyright
index 1bd3769..994957a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,18 @@ Source:	http://www.requestpolicy.com/
 
 Files: *
 Copyright: 2008, Justin Samuel <justin at justinsamuel.com>,
-           2006-2007, Everaldo Coelho.
+           2006-2007, Everaldo Coelho
+License: MPL-1.1 or GPL-3
+
+Files: modules/JSON.jsm
+Copyright: 2008, Initial Developer
+License: MPL-1.1 or GPL-3
+
+Files: debian/*
+Copyright: 2011, Fabrizio Regalli <fabreg at fabreg.it>
+License: MPL-1.1 or GPL-3
+
+
 License: MPL-1.1 or GPL-3
  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
@@ -29,15 +40,7 @@ License: MPL-1.1 or GPL-3
  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.
  .
- On Debian systems the full text of the GNU General Public License Version 2
+ On Debian systems the full text of the GNU General Public License Version 3
  can be found in the `/usr/share/common-licenses/GPL-3' file.
  The full text of the MPL is in the same directory as this file with the
  filename MPL and may be compressed.
-
-Files: debian/*
-Copyright: 2011, Fabrizio Regalli <fabreg at fabreg.it>
-License: MPL-1.1 or GPL-2+ or LGPL-2.1+
- On Debian systems the full text of the GNU General Public License Version 2
- can be found in the `/usr/share/common-licenses/GPL-2' file.
- On Debian systems the full text of the GNU Lesser General Public License
- Version 2.1 can be found in the `/usr/share/common-licenses/LGPL-2.1' file.

-- 
Improve your browsing: more private, more secure