[SCM] libkface packaging branch, master, updated. 078a7afcdbce4c76ac7927b8bf118337276d6046

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit c2ba456d271ce25dd7401be3eb5b283ba3c8bbc8
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jun 14 14:58:59 2015 +0200

    Improve the copyright file.
---
 debian/changelog |  4 ++++
 debian/copyright | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 87fcbe6..86a353e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 libkface (4:14.12.2-2) experimental; urgency=medium
 
+  [ Maximiliano Curia ]
   * Add Breaks/Replaces with digikam-data.
 
+  [ Felix Geyre ]
+  * Improve the copyright file.
+
  -- Maximiliano Curia <maxy at debian.org>  Fri, 27 Mar 2015 15:24:37 +0100
 
 libkface (4:14.12.3-0ubuntu1) vivid; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 57c59fe..b683eda 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,3 +25,35 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: cmake/*
+       data/*.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>
+           2012 Philipp Wagner <bytefish at gmx dot de>
+           2010-2014 Gilles Caulier <caulier.gilles at gmail.com>
+License: BSD-3-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 copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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