[Pkg-mozext-commits] [ubiquity-extension] 05/06: d/copyright: remove missing scripts/pixastic.js. scripts/wikicreole.js from BSD to Expat.

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository ubiquity-extension.

commit 591b0cea4091d4b7cee2ff0f1b074927d59e6823
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Dec 6 21:05:17 2014 +0100

    d/copyright: remove missing scripts/pixastic.js. scripts/wikicreole.js from BSD to Expat.
---
 debian/changelog |  3 +++
 debian/copyright | 29 +++--------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d4d78f..3f6f02c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ubiquity-extension (0.6.4~pre20141206-1) UNRELEASED; urgency=medium
 
   * Hg snapshot.
   * Bump Standards-Version to 3.9.6 (no changes).
+  * Fix d/copyright:
+    + Remove missing scripts/pixastic.js file section.
+    + Switch scripts/wikicreole.js from BSD to Expat.
 
  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 06 Dec 2014 04:11:46 +0100
 
diff --git a/debian/copyright b/debian/copyright
index f0e09a9..d595a43 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,10 +25,6 @@ Files: modules/oauth.js
 Copyright: 2008, Netflix Inc.
 License: Apache-2
 
-Files: scripts/pixastic.js
-Copyright: 2008 Jacob Seidelin <cupboy at gmail.com>
-License: MIT
-
 Files: scripts/date.js debian/missing-sources/scripts/date.js
  debian/missing-sources/scripts/core.js
  debian/missing-sources/scripts/extras.js
@@ -37,7 +33,7 @@ Files: scripts/date.js debian/missing-sources/scripts/date.js
  debian/missing-sources/scripts/time.js
  debian/missing-sources/scripts/globalization/en-US.js
 Copyright: 2006-2008, Coolite Inc.
-License: MIT
+License: Expat
 
 Files: scripts/html-sanitizer-minified.js scripts/prettify.js
  debian/missing-sources/scripts/html-sanitizer.js
@@ -48,7 +44,7 @@ License: Apache-2
 Files: scripts/wikicreole.js
 Copyright: 2008, Ivan Fomichev
            2007, Chris Purcell
-License: BSD
+License: Expat
 
 Files: scripts/template.js
 Copyright: 2004, 2005 Metaha.
@@ -139,7 +135,7 @@ License: Apache-2
  The complete text of the Apache License version 2.0 can be found in the
  file `/usr/share/common-licenses/Apache-2.0'.
 
-License: MIT
+License: Expat
  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
@@ -157,22 +153,3 @@ License: MIT
  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.
-
-License: BSD
- 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/ubiquity-extension.git