[Pkg-mozext-commits] [SCM] Show tabs like a tree branch, master, updated. debian/0.12.2011061701-1-4-g7478f3c

[Ximin Luo]

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

    correct copyright info for files in modules/lib/*

diff --git a/debian/MIT-Expat b/debian/MIT-Expat
new file mode 100644
index 0000000..d76cfa6
--- /dev/null
+++ b/debian/MIT-Expat
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/debian/copyright b/debian/copyright
index 666c103..1dafc08 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,16 @@ Files: debian/*
 Copyright: 2011 Ximin Luo <infinity0 at gmx.com>
 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
+Files: modules/lib/*
+Copyright: 2008-2011 SHIMODA "Piro" Hiroshi <piro.outsider.reflex at gmail.com>
+Comment: This is the same person as Upstream-Contact; the file headers use
+ these details, instead of the ones from the AMO extension page.
+License: Expat
+
+Files: modules/lib/jsdeferred.js
+Copyright: 2007 cho45 <cho45 at lowreal.net>
+License: Expat
+
 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.
@@ -22,3 +32,9 @@ License: 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'.
+
+License: Expat
+ The complete text of the Expat license (a style of MIT license), minus the
+ copyright notice (which is stated in the appropriate section), can be found in
+ the same directory as this file, in the following location:
+ Location: MIT-Expat
diff --git a/debian/docs b/debian/docs
index 427712d..ab84cfb 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
 debian/MPL-1.1
+debian/MIT-Expat

-- 
Show tabs like a tree