[SCM] knotifications packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-5-g032e2e8

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Wed May 20 00:02:43 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/knotifications.git;a=commitdiff;h=d9f2680

The following commit has been merged in the kubuntu_unstable branch:
commit d9f2680404112cded8e0205b931bb35440b745aa
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 19:15:26 2015 +0100

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 174 +++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 112 insertions(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c13ad5..eb616fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 knotifications (5.8.0-1) experimental; urgency=medium
 
   * New upstream release (5.8.0).
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:39:01 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 9ba17ea..1050326 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,57 +3,46 @@ Upstream-Name: knotifications
 Source: https://projects.kde.org/projects/frameworks/knotifications
 
 Files: *
-Copyright: 2006, Aaron J. Seigo <aseigo at kde.org>
-           2009, Marco Martin <notmart at gmail.com>
-           2014, Martin Klapetek <mklapetek at kde.org>
-           2001-2006, Richard Moore <rich at kde.org>
-           2004-2005, Sascha Cunz <sascha.cunz at tiscali.de>
-License: LGPL-2+
-
-Files: src/knotificationplugin.cpp
-       src/knotificationplugin.h
-       src/knotifyconfig.cpp
-       src/knotifyconfig.h
-       src/notifybyaudio.cpp
-       src/notifybyaudio.h
-       src/notifybyexecute.cpp
-       src/notifybyexecute.h
-       src/notifybyktts.cpp
-       src/notifybyktts.h
-       src/notifybylogfile.cpp
-       src/notifybylogfile.h
-       src/notifybypopup.cpp
-       src/notifybypopup.h
-       src/notifybypopupgrowl.cpp
-       src/notifybypopupgrowl.h
-       src/notifybytaskbar.cpp
-       src/notifybytaskbar.h
 Copyright: 2008, Dmitry Suzdalev <dimsuz at gmail.com>
+           2015, Jeremy Whiting <jpwhiting at kde.org>
            2009, Laurent Montel <montel at kde.org>
            2014, Martin Klapetek <mklapetek at kde.org>
            2005-2009, Olivier Goffart <ogoffart at kde.org>
            2010, Sjors Gielen <dazjorz at dazjorz.com>
+           2014, This_file_is_part_of_KDE
+           2009, Adriaan de Groot, Mustapha Abubakar, Ibrahim Dasuna
+           2006, Canonical Ltd, and Rosetta Contributors 2006
+           1998, Erez Nir <erez-n at actcom.co.il>
+           1998-2008, Free Software Foundation, Inc
+           2008-2009, K Desktop Environment
+           2005, KDE Armenian translation team
+           2005, KDE Russian translation team
+           2000-2003, KDE e.v
+           2007, KDE i18n Project for Vietnamese
+           1999-2003, Meni Livne <livne at kde.org>
+           2008, This_file_is_part_of_KDE
+           2001, translate.org.za
 License: LGPL-2.1+3+KDEeV
- 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) 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.
- .
- 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, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", likewise,
- the complete text of the GNU Lesser General Public License version 3 can be
- found in "/usr/share/common-licenses/LGPL-3".
+
+Files: src/knotificationrestrictions.cpp
+       src/knotificationrestrictions.h
+       src/kpassivepopup.cpp
+       src/kpassivepopup.h
+       src/kstatusnotifieritem.cpp
+       src/kstatusnotifieritem.h
+       src/kstatusnotifieritemdbus_p.cpp
+       src/kstatusnotifieritemdbus_p.h
+       src/kstatusnotifieritemprivate_p.h
+       tests/knotificationdbustest.cpp
+       tests/knotificationrestrictionstest.cpp
+       tests/kstatusnotifieritemtest.cpp
+       tests/kstatusnotifieritemtest.h
+Copyright: 2006, Aaron Seigo <aseigo at kde.org>
+           2009, Marco Martin <notmart at gmail.com>
+           2014, Martin Klapetek <mklapetek at kde.org>
+           2001-2006, Richard Moore <rich at kde.org>
+           2004-2005, Sascha Cunz <sascha.cunz at tiscali.de>
+License: LGPL-2+
 
 Files: src/knotification.cpp
        src/knotification.h
@@ -64,6 +53,32 @@ Copyright: 1997, Christian Esken <esken at kde.org>
            2005-2006, Olivier Goffart <ogoffart at kde.org>
            2006, Thiago Macieira <thiago at kde.org>
 License: LGPL-2
+
+Files: src/imageconverter.cpp
+       src/imageconverter.h
+Copyright: 2009, Canonical
+License: LGPL-2+3
+
+Files: COPYING.LIB
+Copyright: 1991-1999, Free Software Foundation, Inc
+License: LGPL-2.1+
+
+Files: po/bg/knotifications5_qt.po
+Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
+           2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
+License: GPL
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
+
+License: GPL
+ This file is licensed under the GPL.
+ .
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in `/usr/share/common-licenses/GPL'.
+
+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 version 2 as published by the Free Software Foundation.
@@ -81,10 +96,44 @@ License: LGPL-2
  On Debian systems, the complete text of the GNU Library General
  Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
 
-Files: src/imageconverter.cpp
-       src/imageconverter.h
-Copyright: 2009, Canonical
-License: LGPL-2 or LGPL-3
+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 version 2 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
+ 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
+ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: LGPL-2+3
  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 or 3 of the License.
@@ -102,25 +151,24 @@ License: LGPL-2 or LGPL-3
  likewise, the complete text of the GNU Lesser General Public License version
  3 can be found in "/usr/share/common-licenses/LGPL-3".
 
-Files: debian/*
-Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-2+
-
-License: LGPL-2+
+License: LGPL-2.1+3+KDEeV
  This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
+ modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ 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.
  .
  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.
+ Lesser 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.
+ 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/>.
  .
- On Debian systems, the complete text of the GNU Library General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in "/usr/share/common-licenses/LGPL-3".

-- 
knotifications packaging



More information about the pkg-kde-commits mailing list