[SCM] ktp-auth-handler packaging branch, master, updated. debian/0.7.0-1

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-auth-handler.git;a=commitdiff;h=e9c8b2c

The following commit has been merged in the master branch:
commit e9c8b2c8c61aa86eb2c3baa88e0eefc9f7dc7810
Author: Diane Trout <diane at ghic.org>
Date:   Wed Dec 4 21:52:36 2013 -0800

    Update copyright file
---
 debian/changelog |  1 +
 debian/copyright | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 28bce34..734c296 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ktp-auth-handler (0.7.0-1) UNRELEASED; urgency=low
   * New upstream version.
   * Bump Build-Depends ktpcommoninternalsprivate-dev to 0.7.0
   * Bump depends kde-telepathy-data to >= 0.7
+  * Update copyright file
 
  -- Diane Trout <diane at ghic.org>  Tue, 29 Oct 2013 21:01:57 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 54e1a15..849c1db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,24 @@ Copyright: 2011 Collabora Ltd. <http://www.collabora.co.uk>
            2011-2012 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
 License: LGPL-2.1+
 
+Files: x-telepathy-sso-facebook-operation.cpp
+       x-telepathy-sso-facebook-operation.h
+Copyright: 2013  David Edmundson <kde at davidedmundson.co.uk>
+License: GPL-3+
+
+Files: getcredentialsjob.cpp
+       getcredentialsjob.h
+       x-telepathy-sso-google-operation.cpp
+       x-telepathy-sso-google-operation.h
+Copyright: 2013 by Alejandro Fiestas Olivares <afiestas at kde.org>
+License: LGPL-2+
+
+Files: kssl/*
+Copyright: 2007, 2008, 2010 Andreas Hartmetz <ahartmetz at gmail.com>
+	   2000-2005 George Staikos <staikos at kde.org>
+	   2000 Malte Starostik <malte at kde.org>
+License: LGPL-2+
+
 Files: po/*
 Copyright: 2012 Mladen Pejakovic <pejakm at gmail.com>
            2012 Chusslove Illich <caslav.ilic at gmx.net>
@@ -69,6 +87,25 @@ Files: debian/*
 Copyright: 2011-2012 George Kiagiadakis <kiagiadakis.george at gmail.com>
 License: LGPL-2.1+
 
+License: LGPL-2+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   .
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   .
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+   .
+   On Debian systems, the complete text of the GNU Library General
+   Public License v2 can be found in `/usr/share/common-licenses/LGPL-2'.
+
 License: LGPL-2.1+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -86,3 +123,20 @@ License: LGPL-2.1+
    .
    On Debian systems, the complete text of the GNU Lesser General
    Public License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: GPL-3+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   .
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   .
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   .
+   On Debian systems, the complete text of the GNU General
+   Public License v3 can be found in `/usr/share/common-licenses/GPL-3'.

-- 
ktp-auth-handler packaging