[SCM] khtml packaging branch, kubuntu_vivid_backports, updated. ubuntu/5.14.0-0ubuntu1

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=5ea9fc9

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 5ea9fc9dd00d7f2b6548ef28bcdce37788a383e3
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Aug 25 12:25:19 2015 +0200

    more copyright fixes
    
    convert another convoluted license into its basic primitives of
    gpl-2 or lgplg-2.1+ or mpl-1.1 this is an actual triple license so imply
    add a license defintion for gpl-2 and mpl-1.1 instaed of the triple
    definition
---
 debian/copyright | 58 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index bcbf32d..9fa1b42 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -593,39 +593,41 @@ License: GPL
  On Debian systems, the complete text of the GNU General Public License can be
  found in `/usr/share/common-licenses/GPL'.
 
-License: GPL-2 or LGPL-2.1+ or MPL-1.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+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.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later
+ version.
  .
- This library 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.
+ 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 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
+ 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
  .
- Alternatively, the contents of this file may be used under the terms
- of either the Mozilla Public License Version 1.1, found at
- http://www.mozilla.org/MPL/ (the "MPL") or the GNU General Public
- License Version 2.0, found at http://www.fsf.org/copyleft/gpl.html
- (the "GPL"), in which case the provisions of the MPL or the GPL are
- applicable instead of those above.  If you wish to allow use of your
- version of this file only under the terms of one of those two
- licenses (the MPL or the GPL) and not to allow others to use your
- version of this file under the LGPL, indicate your decision by
- deletingthe provisions above and replace them with the notice and
- other provisions required by the MPL or the GPL, as the case may be.
- If you do not delete the provisions above, a recipient may use your
- version of this file under any of the LGPL, the MPL or the GPL.
+ 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'.
+
+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/
  .
- On Debian systems, the complete text of the GNU Lesser General Public
- License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1",
- likewise, the complete text of the GNU General Public License version 2 can
- be found in "/usr/share/common-licenses/GPL-2".
+ 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 complete text of the Mozilla Public Lecense version 1.1 can be found
+ at "http://www.mozilla.org/MPL/MPL-1.1.html"
 
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify

-- 
khtml packaging