[SCM] ktp-accounts-kcm packaging branch, master, updated. upstream/0.4.0-3-g736b59e

George Kiagiadakis gkiagia-guest at alioth.debian.org
Sat Jun 16 15:19:00 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-accounts-kcm.git;a=commitdiff;h=736b59e

The following commit has been merged in the master branch:
commit 736b59e11817fa9256e1de4e0f00089531dc2b25
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sat Jun 16 18:17:40 2012 +0300

    Update copyright & convert it to machine-readable format
---
 debian/copyright |  150 ++++++++++++++++++++++++------------------------------
 1 files changed, 67 insertions(+), 83 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 7cabd58..5631495 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,83 +1,67 @@
-This package was debianized by George Goldberg <george.goldberg at collabora.co.uk> on
-Wed, 05 Aug 2009 18:30:00 +0100.
-
-It was downloaded from:
-
-    https://projects.kde.org/projects/playground/network/telepathy/telepathy-accounts-kcm
-
-Upstream Authors:
-
-    George Goldberg <george.goldberg at collabora.co.uk>
-    David Edmundson <kde at davidedmundson.co.uk>
-    Dominik Schmidt <dev at dominik-schmidt.de>
-    Thomas Richard <thomas9999 at gmail.com>
-    Florian Reinhard <florian.reinhard at googlemail.com>
-    Rohan Garg <rohangarg at kubuntu.org>
-    Lasath Fernando <kde at lasath.org>
-    Lasse Liehu <lliehu at kolumbus.fi>
-
-Copyright:
-
-    © 2009 Collabora Ltd. <http://www.collabora.co.uk/>
-    © 2011 Dominik Schmidt <kde at dominik-schmidt.de>
-    © 2011 Thomas Richard <thomas.richard at proan.be>
-    © 2011 David Edmundson <kde at davidedmundson.co.uk>
-    © 2010 Rafael Fernández López <ereslibre at kde.org>
-    © 2010 UFO Coders <info at ufocoders.com>
-    © 2011 Florian Reinhard <florian.reinhard at googlemail.com>
-    © 2011 Lasath Fernando <kde at lasath.org>
-    © 2011 Lasse Liehu <lliehu at kolumbus.fi>
-
-License:
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published
-    by the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-
-    This package 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.
-
-    On Debian systems, the full text of the GNU Lesser General Public License
-    version 2.1 is available in /usr/share/common-licenses/LGPL-2.1.
-
-Files with different license and/or copyright:
-
-  Files under cmake/
-
-    Copyright: © 2008, Allen Winter <winter at kde.org>
-    Copyright: © 2009, Andre Moreira Magalhaes <andrunko at gmail.com>
-
-    These files are under this license:
-
-    | 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.
-
-The Debian packaging is
-
-    © 2009, Collabora Ltd. <http://www.collabora.co.uk/>
-    © 2011, George Kiagiadakis <kiagiadakis.george at gmail.com>
-
-and is licensed under the LGPL v2.1 or later, see `/usr/share/common-licenses/LGPL-2.1'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ktp-accounts-kcm
+Upstream-Contact: KDE Telepathy Project <kde-telepathy at kde.org>
+Source: ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/
+License: LGPL-2.1+
+
+Files: *
+Copyright: 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
+           2011 David Edmundson <kde at davidedmundson.co.uk>
+           2011-2012 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
+           2011 Martin Klapetek <martin.klapetek at gmail.com>
+           2011 Francesco Nwokeka <francesco.nwokeka at gmail.com>
+           2011 Dominik Schmidt <kde at dominik-schmidt.de>
+           2011 Thomas Richard <thomas.richard at proan.be>
+           2010 Rafael Fernández López <ereslibre at kde.org>
+           2010 UFO Coders <info at ufocoders.com>
+           2011 Florian Reinhard <florian.reinhard at googlemail.com>
+           2011 Lasath Fernando <kde at lasath.org>
+           2011 Lasse Liehu <lliehu at kolumbus.fi>
+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
+   License as published by the Free Software Foundation; either
+   version 2.1 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.
+   .
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, 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'.
+
+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: debian/*
+Copyright: 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+           2011-2012 George Kiagiadakis <kiagiadakis.george at gmail.com>
+License: LGPL-2.1+

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list