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

Tue Sep 29 23:26:39 UTC 2015

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit e8c9e247b5405aacaf2eac040a56362e46db2d94
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Aug 25 11:46:48 2015 +0200

    fix copyright spec compliance
    
    A and B already means that the file contains code under A and code under B
    'A and B' is not a distinct license it is rather a composite of
    License: A
    and
    License: B
    
    defining A and B therefore creats a duplicated definition if both are also
    defined standalone.
    
    change the copyright accordingly. the combo license stanzas are no more
    and the previous or statement is now an and statement as the files in
    question are not dual licensed in an either or fashion but parts are simply
    one and other parts the other
---
 debian/copyright | 92 ++------------------------------------------------------
 1 file changed, 2 insertions(+), 90 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index ba6472d..bcbf32d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -476,7 +476,7 @@ Copyright: 2004, Apple Computer, Inc
            1999, Lars Knoll <knoll at kde.org>
            2007-2010, Maksim Orlovich <maksim at kde.org>
            2005, Zack Rusin <zack at kde.org>
-License: BSD-2-clause or LGPL-2+
+License: BSD-2-clause and LGPL-2+
 
 Files: src/css/parser.h
        src/xpath/parser.cpp
@@ -500,7 +500,7 @@ Copyright: 2006, Allan Sandfeld Jensen <kde at carewolf.com>
            2001, Dirk Mueller <mueller at kde.org>
            1999, Lars Knoll <knoll at kde.org>
            2005-2010, Maksim Orlovich <maksim at kde.org>
-License: BSD-3-clause or LGPL-2+
+License: BSD-3-clause and LGPL-2+
 
 Files: COPYING.GPL3
 Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
@@ -569,49 +569,6 @@ License: BSD-3-clause
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-2-clause or LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- Portions of this code are (c) by Apple Computer, Inc. and were licensed
- under the following terms:
- .
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
- .
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
- .
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-   IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- On Debian systems, the complete text of the GNU Library General Public
- License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -775,48 +732,3 @@ License: LGPL-2.1+3+KDEeV
  License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1",
  likewise, the complete text of the GNU Lesser General Public License version
  3 can be found in `/usr/share/common-licenses/LGPL-2'.
-
-License: BSD-3-clause or LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- The code for ClassNodeListImpl was originally licensed under the following terms
- (but in this version is available only as above):
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
- .
-     1.  Redistributions of source code must retain the above copyright
-         notice, this list of conditions and the following disclaimer.
-     2.  Redistributions in binary form must reproduce the above copyright
-         notice, this list of conditions and the following disclaimer in the
-         documentation and/or other materials provided with the distribution.
-     3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
-         its contributors may be used to endorse or promote products derived
-         from this software without specific prior written permission.
- .
-     THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-     EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-     DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-     DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-     (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-     ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- On Debian systems, the complete text of the GNU Library General Public
- License version 2 can be found in "/usr/share/common-licenses/LGPL-2".

-- 
khtml packaging

