[SCM] gecko-mediaplayer/master: Fix remaining issues in debian/copyright.

[sramacher-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7d73f70368fdc73633113c0e18b4c33744928e5a
Author: Sebastian Ramacher <s.ramacher at gmx.at>
Date:   Mon Jan 2 14:14:49 2012 +0100

    Fix remaining issues in debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 8f33b1a..e1285bb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,17 +3,17 @@ Upstream-Name: Gecko Media Player
 Upstream-Contact: Kevin DeKorte <kdekorte at gmail.com>
 Source: http://code.google.com/p/gecko-mediaplayer/
 
-Files: * src/libgmlib/*.[c h] po/*.po
-Copyright: © 2006-2009 Kevin DeKorte
+Files: * po/*.po
+Copyright: © 2006-20011 Kevin DeKorte
 License: GPL-2+
 
 Files: src/*.cpp src/*.h
 Copyright: © 1998 Netscape Communications Corporation
-License: MPL-1.1 | GPL-2+ | LGPL-2.1+
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
 Files: src/np_entry.cpp src/npn_gate.cpp src/npp_gate.cpp
 Copyright: © 1998 Netscape Communications Corporation
-License: NPL-1.1 | GPL-2+ | LGPL-2.1+
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
 Files: debian/*
 Copyright: © 2009 Cesare Tirabassi <norsetto at ubuntu.com>
@@ -102,11 +102,11 @@ License: GAP
 
 License: other
  This file can be copied and used freely without restrictions. It can
- be used in projects which are not available under the GNU Public License
- but which still want to provide support for the GNU gettext functionality.
- Please note that the actual code is *not* freely available.
+ be used in projects which are not available under the GNU General Public
+ License but which still want to provide support for the GNU gettext
+ functionality. Please note that the actual code is *not* freely available.
 
-License: LGPL (v2.1 or later)
+License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -124,7 +124,7 @@ License: LGPL (v2.1 or later)
  .
  Full license text: /usr/share/common-licenses/LGPL-2.1
 
-License: MPL 1.1
+License: MPL-1.1
                           MOZILLA PUBLIC LICENSE
                                 Version 1.1
  .

-- 
gecko-mediaplayer packaging