[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=6997a4d

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

    Add libtiff's license.
---
 debian/changelog |  2 +-
 debian/copyright | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c294116..40717f9 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 and libmng's licenses to debian/copyright.
+  * Add libjasper, libmng and libtiff'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 a2bd778..f54cba1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,6 +34,22 @@ Copyright: 2000-2004 G.Juyn
            2000 AM <s98t269 at stmail.eng.kagawa-u.ac.jp>
 License: BSD-3-clause
 
+Files: src/3rdparty/libtiff/*
+Copyright: 1988-1997 Sam Leffler
+           1991-1997 Silicon Graphics, Inc.
+License: BSD-libtiff
+
+Files: libtiff/port/strcasecmp.c
+       libtiff/port/strtoul.c
+       libtiff/port/getopt.c
+       libtiff/port/lfind.c
+Copyright: 1987-1993 The Regents of the University of California.
+License: BSD-3-clause
+
+Files: strtoull.c
+Copyright: 1992-1993 The Regents of the University of California.
+License: BSD-4-clause
+
 Files: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-NIV-1.3
@@ -185,3 +201,52 @@ License: JasPer-License-Version-2.0
  PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
  RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
  EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
+
+License: BSD-libtiff
+ Permission to use, copy, modify, distribute, and sell this software and
+ its documentation for any purpose is hereby granted without fee, provided
+ that (i) the above copyright notices and this permission notice appear in
+ all copies of the software and related documentation, and (ii) the names of
+ Sam Leffler and Silicon Graphics may not be used in any advertising or
+ publicity relating to the software without the specific, prior written
+ permission of Sam Leffler and Silicon Graphics.
+ .
+ THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ .
+ IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ OF THIS SOFTWARE
+
+License: BSD-4-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+      This product includes software developed by the University of
+      California, Berkeley and its contributors.
+ 4. Neither the name of the University 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 REGENTS 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 REGENTS 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