[SCM] qtimageformats packaging branch, experimental, updated. debian/5.2.1-2-12-ge6de21e

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtimageformats.git;a=commitdiff;h=e6de21e

The following commit has been merged in the experimental branch:
commit e6de21ecc40f3b9f8ae18c557f33a5593058940b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 24 20:07:40 2014 -0300

    Add libwebp's license.
---
 debian/changelog |  2 +-
 debian/copyright | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 40717f9..7e0c494 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ qtimageformats-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Build depend upon libjasper-dev and libwebp-dev to avoid using the
     embedded copies.
-  * Add libjasper, libmng and libtiff's licenses to debian/copyright.
+  * Add libjasper, libmng, libtiff and libwebp's licenses to debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 13 May 2014 17:04:06 +0400
 
diff --git a/debian/copyright b/debian/copyright
index 190c1b0..ad0386b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,6 +50,10 @@ Files: libtiff/port/strtoull.c
 Copyright: 1992-1993 The Regents of the University of California.
 License: BSD-4-clause
 
+Files: src/3rdparty/libwep/*
+Copyright: 2010 Google Inc.
+License: BSD-3-clause-Google
+
 Files: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-NIV-1.3
@@ -250,3 +254,32 @@ License: BSD-4-clause
  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.
+
+License: BSD-3-clause-Google
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ .
+ * 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.
+ .
+ * Neither the name of Google 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ HOLDER OR 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.

-- 
qtimageformats packaging