[SCM] ktp-text-ui packaging branch, master, updated. debian/0.7.0-1-43-g0fb103a

Thu May 7 06:45:43 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-text-ui.git;a=commitdiff;h=8cd7cc4

The following commit has been merged in the master branch:
commit 8cd7cc4a22e6e0f942954abd217d5953029a57c4
Author: Diane Trout <diane at ghic.org>
Date:   Wed Dec 31 22:02:20 2014 -0800

    Update copyright file
---
 debian/changelog |  1 +
 debian/copyright | 36 ++++++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b354336..317e871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ktp-text-ui (0.9.0-1) UNRELEASED; urgency=medium
   * Prevent another license file from being installed into usr/lib
   * Use libjs-jquery (>= 1.7) and libjs-scriptaculous (>= 1.8.2)
     instead of minimized copies provided by upstream.
+  * Update copyright file
 
  -- Diane Trout <diane at ghic.org>  Sun, 21 Sep 2014 11:01:08 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 7ac2121..2168974 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,6 +51,7 @@ Copyright: 2011 Collabora Ltd
            2006 Tim Beaulen <tbscope at gmail.com>
            2008 Helio Chissini de Castro <helio at kde.org>
            2010 Dominik Schmidt <kde at dominik-schmidt.de>
+           2012 Raphael Kubo da Costa <rakuco at FreeBSD.org>
 License: BSD-3-clause
 
 Files: data/styles/SimKete.AdiumMessageStyle/*
@@ -71,6 +72,10 @@ Copyright: 2012 Seth Chisamore
            2014 The KDE Telepathy team
 License: Apache-2.0
 
+Files: data/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/lib/scrollbar.js
+Copyright: 2008 PersonalGrid Corporation <http://personalgrid.com/>
+License: MIT
+
 Files: po/*
 Copyright: 2012-2013 Adrián Chaves Fernández <adriyetichaves at gmail.com>
            2013 Alexander Lakhin <exclusion at gmail.com>
@@ -95,7 +100,7 @@ Copyright: 2012-2013 Adrián Chaves Fernández <adriyetichaves at gmail.com>
            2012-2014 Freek de Kruijf <freekdekruijf at kde.nl>
            2013-2014 Giovanni Sora <g.sora at tiscali.it>
            2013 Jean Cayron <jean.cayron at base.be>
-           2011-2013 Joëlle Cornavin <jcorn at free.fr>
+           2011-2014 Joëlle Cornavin <jcorn at free.fr>
            2011-2012 Kevin Scannell <kscanne at gmail.com>
            2011-2012 Khoem Sokhem <khoemsokhem at khmeros.info>
            2011-2012 Kira J. Fernandez <kirajfdez at gmail.com>
@@ -109,7 +114,7 @@ Copyright: 2012-2013 Adrián Chaves Fernández <adriyetichaves at gmail.com>
            2011 Manuel Tortosa <manutortosa at chakra-project.org>
            2013 Marce Villarino <mvillarino at kde-espana.org>
            2011-2012 Marcus Gama <marcus.gama at gmail.com>
-           2011-2013 Marek Laane <bald at smail.ee>
+           2011-2014 Marek Laane <bald at smail.ee>
            2013 Markus Slopianka <markus.s at kdemail.net>
            2011-2014 Martin Schlander <mschlander at opensuse.org>
            2013 Miguel Branco <mgl.branco at gmail.com>
@@ -117,14 +122,14 @@ Copyright: 2012-2013 Adrián Chaves Fernández <adriyetichaves at gmail.com>
            2012 Ni Hui <shuizhuyuanluo at 126.com>
            2011 Panagiotis Papadopoulos <pano_90 at gmx.net>
            2014 Park Shinjo <peremen at gmail.com>
-           2011-2013 Pino Toscano <toscano.pino at tiscali.it>
+           2011-2014 Pino Toscano <toscano.pino at tiscali.it>
            2012-2013 Raul Gonzalez <raulgf83 at gmail.com>
            2011 Remigijus Jarmalavičius <remigijus at jarmalavicius.lt>
            2012 Richard Frič <Richard.Fric at kdemail.net>
            2012-2014 Roman Paholík <wizzardsk at gmail.com>
            2011 Sahran <sahran.ug at gmail.com>
            2012-2013 Sairan Kikkarin <sairan at computer.org>
-           2012-2013 Sergiu Bivol <sergiu at ase.md>
+           2012-2014 Sergiu Bivol <sergiu at ase.md>
            2012 Sophea <sophea at khmeros.info>
            2011-2014 Stefan Asserhäll <stefan.asserhall at bredband.net>
            2012-2013 Stelios <sstavra at gmail.com>
@@ -139,6 +144,9 @@ Copyright: 2012-2013 Adrián Chaves Fernández <adriyetichaves at gmail.com>
            2012 Xosé <xosecalvo at gmail.com>
            2011-2014 Yuri Chornoivan <yurchor at ukr.net>
            2012-2013 Yuri Efremov <yur.arh at gmail.com>
+           2014 Steve Allewell <steve.allewell at gmail.com>
+           2014 Maxime Corteel <mcorteel at gmail.com>
+           2014 Sönke Dibbern <s_dibbern at web.de>
 License: GPL-2+
 
 Files: po/ca*/*.po
@@ -411,3 +419,23 @@ License: Apache-2.0
  .
  On Debian systems, the complete text of the Apache version 2.0 license
  can be found in "/usr/share/common-licenses/Apache-2.0".
+
+License: MIT
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  .
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file

-- 
ktp-text-ui packaging

