[SCM] khtml packaging branch, master, updated. debian/5.19.0-1-20-g762d0d9
Maximiliano Curia
maxy at moszumanska.debian.org
Thu May 26 07:01:56 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=ef2a56e
The following commit has been merged in the master branch:
commit ef2a56eb20ddfd0d1a164e55b25c2faf60ed2665
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu May 19 13:34:15 2016 +0200
Update copyright information
---
debian/copyright | 97 ++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 69 insertions(+), 28 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index ba6472d..8c7bb17 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,9 +11,9 @@ Copyright: 2005-2006, Alexander Kellett <lypanov at kde.org>
2005-2006, Anders Carlsson <andersca at mac.com>
2001, Andreas Schlapbach <schlpbch at iam.unibe.ch>
1999-2003, Antti Koivisto <koivisto at kde.org>
- 2003, Apple Computer
+ 2003-2004, Apple Computer
2006, Apple Computer Inc
- 2002, Apple Computer, Inc
+ 2002-2009, Apple Computer, Inc
2003-2008, Apple Inc
2008, Apple, Inc
2013, Bernd Buschinski <b.buschinski at googlemail.com>
@@ -27,7 +27,7 @@ Copyright: 2005-2006, Alexander Kellett <lypanov at kde.org>
2002, David Faure <david at mandrakesoft.com>
1999-2007, David Faure <faure at kde.org>
2007, David Smith <catfish.man at gmail.com>
- 2001-2003, Dirk Mueller ( mueller at kde.org )
+ 2001-2004, Dirk Mueller ( mueller at kde.org )
2000-2003, Dirk Mueller <mueller at kde.org>
2009, Eduardo Robles Elvira <edulix at gmail.com>
2006-2008, Eric Seidel <eric at webkit.org>
@@ -40,7 +40,7 @@ Copyright: 2005-2006, Alexander Kellett <lypanov at kde.org>
1999-2008, Harri Porten <porten at kde.org>
Hebrew algorithm by <herouth at netvision.net.il>
2005, Ivor Hewitt <ivor at kde.org>
- 2005, Koos Vriezen <koos ! vriezen () xs4all ! nl>
+ 2003-2005, Koos Vriezen <koos ! vriezen () xs4all ! nl>
2003, Koos Vriezen <koos.vriezen at xs4all.nl>
1999-2003, Lars Knoll <knoll at kde.org>
1998-1999, Lars Knoll <knoll at mpi-hd.mpg.de>
@@ -70,7 +70,7 @@ Copyright: 2005-2006, Alexander Kellett <lypanov at kde.org>
2006, The Aquaosk-2.0 Team
2002-2003, The Karbon Developers
2002, Till
- 2001-2002, Till Krech <till at snafu.de>
+ 2002, Till Krech <till at snafu.de>
2001, Tobias Anton <anton at stud.fbi.fh-darmstadt.de>
1997-1999, Torben Weis <weis at kde.org>
2008-2009, Vyacheslav Tokarev <tsjoker at gmail.com>
@@ -80,14 +80,14 @@ Copyright: 2005-2006, Alexander Kellett <lypanov at kde.org>
1998, W. Bastian */
#ifndef '$NS'CSSVALUES_H
#define '$NS'CSSVALUES_H
DOM::DOMString get'$NS'ValueName(unsigned short id) KHTML_NO_EXPORT;
' > "$prefix"cssvalues.h
2000, W3C® (MIT, INRIA, Keio)
1998-2002, Waldo Bastian <bastian at kde.org>
- World Wide Web Consortium , (Massachusetts Institute of
+ 2003, World Wide Web Consortium , (Massachusetts Institute of
2000, Wynn Wilkes <wynnw at caldera.com>
2004-2005, Zack Rusin <zack at kde.org>
2009, Adriaan de Groot, Mustapha Abubakar, Ibrahim Dasuna
2006, Canonical Ltd, and Rosetta Contributors 2006
2001-2011, David Faure <faure at kde.org>
1998, Erez Nir <erez-n at actcom.co.il>
- 2001-2005, Free Software Foundation, Inc
+ 1997-2012, Free Software Foundation, Inc
2008-2009, K Desktop Environment
2005, KDE Armenian translation team
2005, KDE Russian translation team
@@ -95,18 +95,13 @@ Copyright: 2005-2006, Alexander Kellett <lypanov at kde.org>
2007, KDE i18n Project for Vietnamese
2000-2003, Lars Knoll <knoll at kde.org>
1999-2003, Meni Livne <livne at kde.org>
- 2008, This_file_is_part_of_KDE
+ 2002-2016, This_file_is_part_of_KDE
2001, Till Krech <till at snafu.de>
2008, Vyacheslav Tokarev
2008, Vyacheslav Tokarev */
- 1999, W. Bastian
+ 1998-1999, W. Bastian
2001, translate.org.za
2001, डेभिड फाउर <email>david at mandrakesoft.com</email>
- 2003, Apple Computer
- 2003, Dirk Mueller <mueller at kde.org>
- 1984-2012, Free Software Foundation, Inc
- 2008, Germain Garand <germain at ebooksfrance.org>
- 2002-2003, Lars Knoll <knoll at kde.org>
2002, David Faure <david at mandrakesoft.com>
License: LGPL-2+
@@ -364,8 +359,8 @@ Files: src/bindings/js/JSSVGPODTypeWrapper.h
src/xpath/variablereference.cpp
src/xpath/variablereference.h
Copyright: 2010, Allan Sandfeld Jensen <sandfeld at kde.org>
- 2004-2007, Apple Computer, Inc
- 2007-2008, Apple Inc
+ 2003-2008, Apple Computer, Inc
+ 2003-2008, Apple Inc
2006-2007, Eric Seidel <eric at webkit.org>
2006-2008, Fredrik Höglund <fredrik at kde.org>
2005, Frerich Raabe <raabe at kde.org>
@@ -455,7 +450,7 @@ Copyright: 2006, Allan Sandfeld Jense <kde at carewolf.com>
2003, Dirk Mueller <mueller at kde.org>
2006, Germain Garand <germain at ebooksfrance.org>
1998, Netscape Communications Corporation
-License: GPL-2 or LGPL-2.1+ or MPL-1.1
+License: GPL-2_or_LGPL-2.1+_or_MPL-1.1
Files: src/misc/guess_ja.cpp
src/misc/guess_ja_p.h
@@ -476,7 +471,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_or_LGPL-2+
Files: src/css/parser.h
src/xpath/parser.cpp
@@ -502,13 +497,59 @@ Copyright: 2006, Allan Sandfeld Jensen <kde at carewolf.com>
2005-2010, Maksim Orlovich <maksim at kde.org>
License: BSD-3-clause or LGPL-2+
-Files: COPYING.GPL3
-Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
-License: GPL-3+
-
-Files: COPYING.LIB
-Copyright: 1991-1999, Free Software Foundation, Inc
-License: LGPL-2.1+
+Files: src/css/parser.cpp
+Copyright: 2003, Apple Computer
+ 2003, Dirk Mueller <mueller at kde.org>
+ 1984-2012, Free Software Foundation, Inc
+ 2008, Germain Garand <germain at ebooksfrance.org>
+ 2002-2003, Lars Knoll <knoll at kde.org>
+License: GPL-3+_BisonException_and_LGPL-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/>.
+ .
+ As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+ .
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison.
+ .
+ .....
+ .
+ This library 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 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.
+ .
+ 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 General Public License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3', likewise, the complete text of the GNU
+ Library General Public License version 2 can be found in
+ `/usr/share/common-licenses/LGPL-2'.
Files: po/bg/khtml5.po
Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
@@ -569,7 +610,7 @@ 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+
+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
@@ -636,7 +677,7 @@ 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
+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 as published by the Free Software Foundation; either
@@ -776,7 +817,7 @@ License: LGPL-2.1+3+KDEeV
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+
+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
--
khtml packaging
More information about the pkg-kde-commits
mailing list