[Pkg-mozext-commits] [SCM] Cookie Monster extension for Iceweasel/Firefox branch, master, updated. upstream/1.0.5-5-gff1283f

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit ff1283ff3c883aa13c8ead93c0d86da673053eba
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Fri Sep 9 17:01:50 2011 +0200

    Fixed d/copyright

diff --git a/debian/copyright b/debian/copyright
index 965ec2b..bbf55ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,32 +11,43 @@ Files: debian/*
 Copyright: 2011, Fabrizio Regalli <fabreg at fabreg.it>
 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
-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/
+License: MPL-1.1
+ The complete text of the Mozilla Public License can be found in
+ the `MPL' file in the same directory as this file.
+
+License: LGPL-2.1+
+ This program 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
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301  USA
+ .
+ The complete text of the GNU Lesser General Public License can
+ be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
  .
- 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.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
  .
- 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.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  .
- On Debian systems the full text of the GNU General Public License Version 2
- can be found in the `/usr/share/common-licenses/GPL-2' file.
- On Debian systems the full text of the GNU Lesser General Public License
- Version 2.1 can be found in the `/usr/share/common-licenses/LGPL-2.1' file.
- The full text of the MPL is in the same directory as this file with the
- filename MPL and may be compressed.
+ The complete text of the GNU General Public License version 2 can be found in
+ the file `/usr/share/common-licenses/GPL-2'.

-- 
Cookie Monster extension for Iceweasel/Firefox