[SCM] libkface packaging branch, master, updated. c304cb1067a7fc46d7fe0e713799a903bb1c2976

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkface.git;a=commitdiff;h=c304cb1

The following commit has been merged in the master branch:
commit c304cb1067a7fc46d7fe0e713799a903bb1c2976
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Jun 15 23:53:43 2015 +0200

    Further improve the copyright file, thanks to Scott Kitterman.
---
 debian/changelog |  4 ++++
 debian/copyright | 44 +++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97d2183..4368d7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 libkface (4:15.04.0-1~) UNRELEASED; urgency=medium
 
+  [ Maximiliano Curia ]
   * New upstream release (15.04.0).
 
+  [ Felix Geyer ]
+  * Further improve the copyright file, thanks to Scott Kitterman.
+
  -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 16:43:26 +0200
 
 libkface (4:14.12.2-2) experimental; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index b683eda..8f3ff90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,9 +6,15 @@ Files: *
        debian/*
 Copyright: 2010-2014 Gilles Caulier <caulier dot gilles at gmail dot com>
            2010-2014 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
-           2010-2014 Aditya Bhatt   <adityabhatt1991 at gmail dot com>
-           2010-2014 Alex Jironkin  <alexjironkin at gmail dot com>
+           2010-2014 Aditya Bhatt <adityabhatt1991 at gmail dot com>
+           2010-2014 Alex Jironkin <alexjironkin at gmail dot com>
            2014 Jonathan Riddell <jriddell at ubuntu.com>
+           2009-2010 Holger Foerster <hamsi2k at freenet dot de>
+           2007 Gary B. Huang, UMass-Amherst
+           2007 David Faure <faure at kde.org>
+           2012-2013 Mahesh Hegde
+           2010 Frederico Duarte
+           2008 Adrien Bustany
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -27,13 +33,13 @@ License: GPL-2+
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 Files: cmake/*
-       data/*.xml
+       data/haarcascade_mcs_*.xml
        libkface/preprocessing-tantriggs/tantriggspreprocessor.*
        libkface/recognition-opencv-lbph/facerec_borrowed.*
-Copyright: 2000 Intel Corporation
-           2012-2013 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+Copyright: 2012-2013 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
            2012 Philipp Wagner <bytefish at gmx dot de>
            2010-2014 Gilles Caulier <caulier.gilles at gmail.com>
+           2006 Modesto Castrillon-Santana (IUSIANI, University of Las Palmas de Gran Canaria, Spain)
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -57,3 +63,31 @@ License: BSD-3-clause
  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.
+
+Files: data/haarcascade_frontalface_*.xml
+       data/haarcascade_profileface.xml
+Copyright: 2000 Intel Corporation
+License: Intel License Agreement For Open Source Computer Vision Library
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+   * Redistribution's of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+ .
+   * Redistribution's 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.
+ .
+   * The name of Intel Corporation may not 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 Intel Corporation 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.

-- 
libkface packaging