[Pkg-mozext-commits] [SCM] Keyboard-friendly UI for XUL applications branch, master, updated. debian/1.0b7.1-1-6-g12a899e

[Michael Schutte]

The following commit has been merged in the master branch:
commit d4df0932c850004bdefe4ba45df44c796237fcac
Author: Michael Schutte <michi at uiae.at>
Date:   Wed Dec 28 20:57:50 2011 +0100

    We cannot combine copyright a license text with license pointers

diff --git a/debian/copyright b/debian/copyright
index e9c9d02..a452004 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,34 +12,6 @@ License: MIT
 Files: common/tests/functional/shared-modules/*
 Copyright: © 2009-2010 Mozilla Foundation
 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
- 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
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- .
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- License for the specific language governing rights and limitations
- under the License.
- .
- The Original Code is MozMill Test code.
- .
- The Initial Developer of the Original Code is Mozilla Foundation.
- Portions created by the Initial Developer are Copyright (C) the Initial
- Developer. All Rights Reserved.
- .
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the
- "LGPL"), in which case the provisions of the GPL or the LGPL are
- applicable instead of those above.  If you wish to allow use of your
- version of this file only under the terms of either the GPL or the
- LGPL, and not to allow others to use your version of this file under
- the terms of the MPL, indicate your decision by deleting the provisions
- above and replace them with the notice and other provisions required by
- the GPL or the LGPL. If you do not delete 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.
 
 Files: debian/*
 Copyright: © 2011 Michael Schutte <michi at debian.org>

-- 
Keyboard-friendly UI for XUL applications