[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/0.9.0-1-12-g8394661

Diane Trout diane at moszumanska.debian.org
Thu Jul 23 02:24:42 UTC 2015


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

The following commit has been merged in the master branch:
commit 60664e0cc4a5e73177c7ddf0be1aeee7dbcb9f95
Author: Diane Trout <diane at ghic.org>
Date:   Wed Jul 22 19:20:35 2015 -0700

    Update copyright file.
    
    * Update copyright file.
      - Remove po/* block
      - Add LGPL-2 license that was used.
---
 debian/changelog |  3 ++
 debian/copyright | 88 +++++++-------------------------------------------------
 2 files changed, 14 insertions(+), 77 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3988d4f..1640beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ ktp-filetransfer-handler (15.04.3-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update build depends for move to kf5 and the
     rename of libktpcommoninternalsprivate-dev to libktp-dev
+  * Update copyright file.
+    - Remove po/* block
+    - Add LGPL-2 license that was used.
 
  -- Diane Trout <diane at debian.org>  Wed, 27 May 2015 23:10:33 -0700
 
diff --git a/debian/copyright b/debian/copyright
index f4d94e0..28b40b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,73 +14,9 @@ Files: src/filetransfer-handler.*
 Copyright: 2010-2011 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
 License: GPL-2+
 
-Files: po/*
-Copyright: 2012 Mladen Pejakovic <pejakm at gmail.com>
-           2012 Chusslove Illich <caslav.ilic at gmx.net>
-           2011-2012 André Marcelo Alvarenga <andrealvarenga at gmx.net> <alvarenga at kde.org>
-           2012 Kira J. Fernandez <kirajfdez at gmail.com>
-           2011 Kevin Scannell <kscanne at gmail.com>
-           2012 Richard Frič <Richard.Fric at kdemail.net>
-           2012 Marcus Gama <marcus.gama at gmail.com>
-           2012 Kristóf Kiszel <ulysses at kubuntu.org>
-           2011-2012 Pino Toscano <toscano.pino at tiscali.it>
-           2011-2014 Yuri Chornoivan <yurchor at ukr.net>
-           2012-2014 Josep Ma. Ferrer <txemaq at gmail.com>
-           2011-2012 Frederik Schwarzer <schwarzer at kde.org>
-           2011 Manfred Wiese <m.j.wiese at web.de>
-           2012 Franklin Weng <franklin at mail.everfocus.com.tw>
-           2011-2014 Stefan Asserhall <stefan.asserhall at bredband.net>
-           2011 Panagiotis Papadopoulos <pano_90 at gmx.net>
-           2012-2014 Freek de Kruijf <freekdekruijf at kde.nl>
-           2011-2014 Marek Laane <bald at smail.ee>
-           2011-2012 Joëlle Cornavin <jcorn at free.fr>
-           2012 Weng Xuetian <wengxt at gmail.com>
-           2011 Vít Pelčák <vit at pelcak.org>
-           2012 Bjørn Steensrud <bjornst at skogkatt.homelinux.org>
-           2011-2014 Eloy Cuadra <ecuadra at eloihr.net>
-           2012 Tommi Nieminen <translator at legisign.org>
-           2012 Stelios <sstavra at gmail.com>
-           2011-2014 Burkhard Lück <lueck at hube-lueck.de>
-           2012 Ni Hui <shuizhuyuanluo at 126.com>
-           2011-2014 Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>
-           2011-2014 Martin Schlander <mschlander at opensuse.org>
-           2012 Xosé <xosecalvo at gmail.com>
-           2013-2014 Giovanni Sora <g.sora at tiscali.it>
-           2014 Park Shinjo <peremen at gmail.com>
-           2014 Steve Allewell <steve.allewell at gmail.com>
-           2014 Sergiu Bivol <sergiu at ase.md>
-License: GPL-2+
-
-Files: po/ca/ktp-filetransfer-handler.po
-       po/ca at valencia/ktp-filetransfer-handler.po
-Copyright: 2012-2014 Josep Ma. Ferrer <txemaq at gmail.com>
-License: KDE-LGPL-2.1+
-
-Files: cmake/*
-Copyright: 2011 Dario Freddi <drf at kde.org>
-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.
+Files: src/ktp-fth-debug.*
+Copyright: 2014 Martin Klapetek <mklapetek at kde.org>
+License: LGPL-2+
 
 Files: debian/*
 Copyright: 2011-2012 George Kiagiadakis <kiagiadakis.george at gmail.com>
@@ -121,22 +57,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: KDE-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 Lesser General Public
+   modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) version 3, or any
-   later version accepted by the membership of KDE e.V. (or its
-   successor approved by the membership of KDE e.V.), which shall
-   act as a proxy defined in Section 6 of version 3 of the license.
+   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
-   Lesser General Public License for more details.
+   Library General Public License for more details.
    .
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Library General Public
+   License along with this library; 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 Lesser General
-   Public License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
\ No newline at end of file
+   Public License v2.1 can be found in `/usr/share/common-licenses/LGPL-2'.

-- 
ktp-filetransfer-handler packaging



More information about the pkg-kde-commits mailing list