[Pkg-mozext-commits] [SCM] Status bar widgets and progress indicators for Firefox 4+ branch, master, updated. debian/0.2011.07.20.21-1-4-gcae301a

[Ximin Luo]

The following commit has been merged in the master branch:
commit cae301ae54c9020f1a5c29252cbddf8747a8963c
Author: Ximin Luo <infinity0 at gmx.com>
Date:   Sat Oct 8 20:55:14 2011 +0100

    got email confirmation from upstream that the entire extension is tri-licensed

diff --git a/debian/copyright b/debian/copyright
index 4e3478b..6393824 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,24 @@
 Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: Status-4-Evar
-Upstream-Contact: Sparky Bluefang <sparky at bluefang-logic.com>
+Upstream-Contact: Matthew Turnbull <sparky at bluefang-logic.com>
 Source: https://addons.mozilla.org/en-US/firefox/addon/status-4-evar/
 
 Files: *
 Copyright: 2010-2011 Sparky Bluefang
-License: MPL-1.1
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
 Files: debian/*
 Copyright: 2011 Ximin Luo <infinity0 at gmx.com>
-License: MPL-1.1
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
 License: MPL-1.1
  The complete text of the Mozilla Public License can be found in
  the `MPL-1.1' file in the same directory as this file.
+
+License: GPL-2
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in the file /usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.

-- 
Status bar widgets and progress indicators for Firefox 4+