[Pkg-mozext-commits] [SCM] Improve your browsing: more private, more secure branch, master, updated. debian/0.5.24-1-1-geef949c

Thu Feb 23 15:51:09 UTC 2012

The following commit has been merged in the master branch:
commit eef949cb71420d1bc7fdb5dcbc8d5812f7ecf5be
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Thu Feb 23 16:51:03 2012 +0100

    Fixed d/copyright using tri-license and moved MPL license under the right place (Closes: #660517)
    
    * Fixed d/copyright using tri-license and moved
      MPL license under the right place (Closes: #660517)
    * Removed no more necessary 01-bump-maxversion.diff patch
    * Bump Standards-Version to 3.9.3 (no changes needed)

diff --git a/debian/changelog b/debian/changelog
index cdcdec9..7f6b6df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+requestpolicy (0.5.24-2) UNRELEASED; urgency=low
+
+  * Fixed d/copyright using tri-license and moved
+    MPL license under the right place (Closes: #660517)
+  * Removed no more necessary 01-bump-maxversion.diff patch
+  * Bump Standards-Version to 3.9.3 (no changes needed)
+
+ -- Fabrizio Regalli <fabreg at fabreg.it>  Thu, 23 Feb 2012 16:45:12 +0100
+
 requestpolicy (0.5.24-1) unstable; urgency=low
 
   * Imported Upstream version 0.5.24
diff --git a/debian/control b/debian/control
index 3e1a2dc..860e6ba 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Fabrizio Regalli <fabreg at fabreg.it>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8), mozilla-devscripts (>= 0.22~)
 Build-Depends-Indep: zip
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: https://www.requestpolicy.com/
 Vcs-git: git://git.debian.org/git/pkg-mozext/requestpolicy.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mozext/requestpolicy.git;a=summary
diff --git a/debian/copyright b/debian/copyright
index 78bac69..c40dd52 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,37 +10,78 @@ License: MPL-1.1 or GPL-3
 
 Files: modules/JSON.jsm
 Copyright: 2008, Initial Developer
-License: MPL-1.1 or GPL-3
+License: MPL-1.1 or GPL-2 or LGPL 2.1
 
 Files: debian/*
 Copyright: 2011, Fabrizio Regalli <fabreg at fabreg.it>
 License: MPL-1.1 or GPL-3
 
 
-License: MPL-1.1 or GPL-3
- 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
+License: MPL-1.1
+ The contents of this package 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.
- .
- 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.
+ 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.
  .
- On Debian systems the full text of the GNU General Public License Version 3
- can be found in the `/usr/share/common-licenses/GPL-3' file.
- The full text of the MPL is in the same directory as this file with the
- filename MPL and may be compressed.
+ On Debian systems,the complete text of the Mozilla
+ Public License Version 1.1 is part of requestpolicy package and can be found in
+ “/usr/share/doc/xul-ext-requestpolicy/MPL.gz”.
+
+License: GPL-3
+  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 3 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 General Public License for more details.
+  .
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  .
+  On Debian systems, the full text of the GNU General Public License
+  Version 3 can be found in the file
+  `/usr/share/common-licenses/GPL-3`.
+
+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, version 2.1, as
+  published by the Free Software Foundation.
+  .
+  This file is provided "AS IS", without WARRANTIES OR CONDITIONS OF ANY
+  KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
+  WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR
+  FITNESS FOR A PARTICULAR PURPOSE.
+  .
+  On Debian systems, the full text of the GNU Lesser General Public
+  License version 2.1 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.
+  .
+  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.
+  .
+  You should have received a copy of the GNU General Public
+  License along with this package; if not, write to the Free
+  Software Foundation, Inc., 51 Franklin St, 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 file
+  `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/01-bump-maxversion.diff b/debian/patches/01-bump-maxversion.diff
deleted file mode 100644
index a9708e6..0000000
--- a/debian/patches/01-bump-maxversion.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Bump maxVersion for working with all Iceweasel version
-Author: Fabrizio Regalli <fabreg at fabreg.it>
-Forwarded: not-needed
-
---- a/install.rdf
-+++ b/install.rdf
-@@ -36,7 +36,7 @@
-       <Description>
-         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-         <em:minVersion>4.0</em:minVersion>
--        <em:maxVersion>12.0a1</em:maxVersion>
-+        <em:maxVersion>*</em:maxVersion>
-       </Description>
-     </em:targetApplication>
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 61f1bca..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-bump-maxversion.diff

-- 
Improve your browsing: more private, more secure

