[SCM] qtwebkit-examples packaging branch, experimental, updated. debian/5.3.2+dfsg-2-9-ge6b1fec
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Dec 27 17:23:39 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit-examples.git;a=commitdiff;h=e6b1fec
The following commit has been merged in the experimental branch:
commit e6b1fec952055e69ef48fa0a7b14843130d4b810
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Dec 27 20:23:36 2014 +0300
More copyright updates.
---
debian/changelog | 2 +-
debian/copyright | 33 +--------------------------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c4d0911..2899c08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ qtwebkit-examples-opensource-src (5.4.0+dfsg-1) UNRELEASED; urgency=medium
* Build-depend on qtbase5-doc-html and qtwebkit5-doc-html,
for docs linking.
* Simplify debian/rules.
- * Update debian/copyright for LGPLv3 addition.
+ * Update debian/copyright.
* Update Vcs-Browser field to point to cgit interface.
* Bump Standards-Version to 3.9.6, no changes needed.
* Add myself to Uploaders.
diff --git a/debian/copyright b/debian/copyright
index d338b40..3e534cc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,7 +20,7 @@ License: LGPL-2.1
Files: examples/webkitqml/shared/main.cpp
examples/webkitwidgets/imageanalyzer/*
- examples/webkitwidgets/framecapture/
+ examples/webkitwidgets/framecapture/*
examples/webkitwidgets/scroller/*
examples/webkitwidgets/simpleselector/*
examples/webkitwidgets/domtraversal/*
@@ -31,11 +31,6 @@ Files: examples/webkitqml/shared/main.cpp
Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
License: BSD-3-clause
-Files: examples/webkitwidgets/fancybrowser/jquery.min.js
-Copyright: 2009 John Resig
- 2009 The Dojo Foundation
-License: GPL-2 or MIT
-
License: LGPL-2.1-or-3 with Digia-1.1 exception
GNU Lesser General Public License:
This file may be used under the terms of the GNU Lesser General Public
@@ -114,29 +109,3 @@ License: LGPL-2.1
.
On Debian systems, the complete text of the GNU Lesser General Public License
can be found in `/usr/share/common-licenses/LGPL-2.1`.
-
-License: GPL-2
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: MIT
- Copyright (c) 2011 John Resig, http://jquery.com/
- .
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--
qtwebkit-examples packaging
More information about the pkg-kde-commits
mailing list