[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-1-15-g81882f9

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git;a=commitdiff;h=81882f9

The following commit has been merged in the master branch:
commit 81882f98ef2409a0cdb214d469c89785870e975d
Author: Diane Trout <diane at ghic.org>
Date:   Mon Oct 6 22:06:15 2014 -0700

    Update copyright file.
---
 debian/changelog |  1 +
 debian/copyright | 38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dfd8f79..ba8b60a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ktp-common-internals (0.8.80-1) UNRELEASED; urgency=medium
   * Add libotr5-dev and libgcrypt11-dev build-dep to enable OTR support.
   * Add kpeople_chat_plugin.so and associated desktop file to 
     kde-telepathy-kpeople package.
+  * Update copyright file.
 
  -- Diane Trout <diane at ghic.org>  Tue, 16 Sep 2014 22:03:11 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 24f12dd..4ac24c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,7 +19,10 @@ Copyright: 2011-2013 David Edmundson <kde at davidedmundson.co.uk>
            2011 Przemek Czekaj <xcojack at gmail.com>
            2004 Peter Simonsson <psn at linux.se>
            2006-2008 Eike Hein <hein at kde.org>
-	   2014 Amandeep Singh <aman.dedman at gmail.com>
+           2014 Amandeep Singh <aman.dedman at gmail.com>
+           2014 Siddhartha Sahu <sh.siddhartha at gmail.com>
+           2014 Nilesh Suthar <nileshsuthar at live.in>
+           2014 Marcin Ziemiński <zieminn at gmail.com>
 License: LGPL-2.1+
 
 Files: KTp/Logger/*
@@ -39,6 +42,15 @@ Copyright: 2011 Dario Freddi <drf at kde.org>
            2007 David Faure <faure at kde.org>
 License: LGPL-2+
 
+Files: KTP/OTR/
+Copyright: 2014 Marcin Ziemiński <zieminn at gmail.com>
+License: GPL-2+
+
+Files: cmake/*
+Copyright: 2014 Marcin Ziemiński <zieminn at gmail.com>
+           2008-2013 Michael Zanetti <mzanetti @ kde.org>
+License: BSD-3-clause
+
 Files: po/*
 Copyright: 2012 Kira J. Fernandez <kirajfdez at gmail.com>
            2011 Marcus Gama <marcus.gama at gmail.com>
@@ -162,3 +174,27 @@ 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"
+
+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.

-- 
ktp-common-internals packaging