[SCM] libkpeople packaging branch, master, updated. eb55c3aa7149c870f3258775b05d83266112fcac

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkpeople.git;a=commitdiff;h=eb55c3a

The following commit has been merged in the master branch:
commit eb55c3aa7149c870f3258775b05d83266112fcac
Author: Diane Trout <diane at ghic.org>
Date:   Mon May 5 21:14:29 2014 -0700

    Make sure the cmake scripts have a proper KDE copyright.
---
 debian/changelog                       |  1 +
 debian/copyright                       | 29 +++++++++++++++++++++++++++++
 debian/patches/add-cmake-copying.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 4 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4ebd9be..9219dcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,5 +6,6 @@ libkpeople (0.2.2-1) UNRELEASED; urgency=medium
   * Include packaging improvements from ubuntu release by Rohan Garg.
   * Add library_startswith_soname.patch. This forces the library realname
     to start with the soname
+  * Add add-cmake-copying.patch to include license for cmake files.
 
  -- Diane Trout <diane at ghic.org>  Sun, 23 Feb 2014 15:59:15 -0800
diff --git a/debian/copyright b/debian/copyright
index df49123..ed418bb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,6 +30,11 @@ Files: autotests/lib/nepomuktest_export.h
 Copyright: 2007 David Faure <faure at kde.org>
 License: LGPL-2+
 
+Files: cmake/*
+Copyright: 2013 David Edmundson <davidedmundson at kde.org>
+           2012 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+License: BSD-3-clause
+
 Files: po/cs/libkpeople.po
 Copyright: 2013 Vít Pelčák <vit at pelcak.org>
 License: LGPL-2.1+
@@ -170,3 +175,27 @@ License: GPL-2+kdeev
  .
  On Debian systems, the complete text of the GNU General Public 
  License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+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.
diff --git a/debian/patches/add-cmake-copying.patch b/debian/patches/add-cmake-copying.patch
new file mode 100644
index 0000000..d767e83
--- /dev/null
+++ b/debian/patches/add-cmake-copying.patch
@@ -0,0 +1,28 @@
+Author: Diane Trout <diane at ghic.org>
+Description: Add the KDE cmake BSD license.
+ Pushed upstream as commit d06bcdef33801c86d9fd27317e9bf14f86c7b7de 
+--- /dev/null
++++ b/cmake/COPYING-CMAKE-SCRIPTS
+@@ -0,0 +1,22 @@
++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.
diff --git a/debian/patches/series b/debian/patches/series
index f0e0c31..8f3d33e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+add-cmake-copying.patch
 library_startswith_soname.patch

-- 
libkpeople packaging