[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-6
Maximiliano Curia
maxy at alioth.debian.org
Thu Jun 27 19:11:22 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=eea43af
The following commit has been merged in the master branch:
commit eea43af69a2d9b2b957c6612cb0689bdc6c8f668
Author: Maximiliano Curia <maxy at debian.org>
Date: Thu Jun 27 17:03:13 2013 +0200
Update copyright file.
---
debian/copyright | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 379b512..cc80a4d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3474,7 +3474,7 @@ License: LGPL-2+
Files: Source/WebCore/dom/MappedAttributeEntry.h
Copyright: 1999 Lars Knoll <knoll at kde.org>
2003, 2004, 2005, 2006 Apple Computer, Inc.
- 2010 Franois Sausset <sausset at gmail.com>.
+ 2010 François Sausset <sausset at gmail.com>.
License: LGPL-2+
Files: Source/WebCore/dom/SpaceSplitString.h
@@ -12474,18 +12474,18 @@ License: FreeB-1.1
in source code form, the Notice must appear in every file that can
include a text comments field; in executable form, the Notice and a copy
of this License must appear in related documentation or collateral where
- the Recipient¿s rights relating to Covered Code are described. Any
+ the Recipient's rights relating to Covered Code are described. Any
Additional Notice Provisions which actually appears in the Original Code
must also be retained or included in any and all redistributions of
Covered Code.
.
Alternative License. Provided that Recipient is in compliance with the
terms of this License, Recipient may, so long as without derogation of
- any of SGI¿s rights in and to the Original Code, distribute the source
+ any of SGI's rights in and to the Original Code, distribute the source
code and/or executable version(s) of Covered Code under (1) this
License; (2) a license identical to this License but for only such
- changes as are necessary in order to clarify Recipient¿s role as
- licensor of Modifications; and/or (3) a license of Recipient¿s
+ changes as are necessary in order to clarify Recipient's role as
+ licensor of Modifications; and/or (3) a license of Recipient's
choosing, containing terms different from this License, provided that
the license terms include this Section 3 and Sections 4, 6, 7, 10, 12,
and 13, which terms may not be modified or superseded by any other terms
@@ -12734,5 +12734,5 @@ License: GPL-2+
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 complete text of the GNU Public License 2 can be found
- in `/usr/share/common-licenses/Apache-2.0'.
\ No newline at end of file
+ On Debian systems, the complete text of the GNU General Public License 2 can
+ be found in `/usr/share/common-licenses/GPL-2'.
--
QtWebKit packaging
More information about the pkg-kde-commits
mailing list