[SCM] qtwebkit-examples packaging branch, master, updated. 2dbe9b515741cd1d74cf25ae055855eea3b7ac48

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit-examples.git;a=commitdiff;h=70222db

The following commit has been merged in the master branch:
commit 70222db5230a341e3822c6b1898b76e8d2d63ea7
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Aug 23 15:25:13 2013 -0300

    Improve debian/copyright.
---
 debian/changelog |    3 +++
 debian/copyright |   33 ++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6248178..400bf24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtwebkit-examples-opensource-src (5.1.0-2) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Improve debian/copyright.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 23 Aug 2013 15:24:28 -0300
 
 qtwebkit-examples-opensource-src (5.1.0-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 6366177..3a7721d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: qtwebkit-examples-opensource-src
 Source: http://download.qt-project.org/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies).
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: debian/*
@@ -30,6 +30,11 @@ 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 with Digia Qt LGPL Exception 1.1
  GNU Lesser General Public License version 2.1:
  This file may be used under the terms of the GNU Lesser General Public
@@ -117,3 +122,29 @@ 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