[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.4.5-1-34-g3fe8939
Modestas Vainius
modax at alioth.debian.org
Tue Mar 29 21:53:52 UTC 2011
The following commit has been merged in the master branch:
commit e3a5278d60dc603e8b2a6c97788ad2bfea5cea8d
Author: Modestas Vainius <modax at debian.org>
Date: Wed Mar 30 00:28:13 2011 +0300
Clean trailing whitespaces from the copyright file.
---
debian/changelog | 1 +
debian/copyright | 66 +++++++++++++++++++++++++++---------------------------
2 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6d08f23..63efc9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kdeplasma-addons (4:4.6.1-0r1) UNRELEASED; urgency=low
[ Modestas Vainius ]
* Point debian/control Vcs fields to the new Git repository.
* Switch debian/rules engine to dhmk based qt-kde-team/2/*.
+ * Clean trailing whitespaces from the copyright file.
[ Pino Toscano ]
* Fix typo in description of plasma-widget-lancelot. (Closes: #591216)
diff --git a/debian/copyright b/debian/copyright
index 2450b6e..35d6c19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,20 +5,20 @@ It was downloaded from ftp://ftp.kde.org
Upstream Authors and copyright holders:
Copyright (C) 1989, 1991, 1999-2002, 2007 Free Software Foundation, Inc.
- Copyright (C) 1996 Christopher Osburn, Lunar Outreach Services, <chris at speakeasy.org>
- Copyright (C) 1998,2000 Stephan Kulow <coolo at kde.org>
- Copyright (c) 1996-2002 the kicker authors. (fuzzy logic)
- Copyright (C) 2005,2006,2007 Siraj Razick <siraj at kde.org>
- Copyright (C) 2006-2007 Rivo Laks <rivolaks at hot.ee>
- Copyright (C) 2007,2008 Alex Merry <alex.merry at kdemail.net>
- Copyright (C) 2007, 2008 Petri Damsten <damu at iki.fi>
- Copyright (C) 2007, 2008 Rob Scheepmaker <r.scheepmaker at student.utwente.nl>
- Copyright (C) 2007-2008 Shawn Starr <shawn.starr at rogers.com>
- Copyright (C) 2007 Alexis Ménard <darktears31 at gmail.com>
- Copyright (C) 2007 André Duffeck <duffeck at kde.org>
- Copyright (C) 2007-2008 Anne-Marie Mahfouf <annma at kde.org>
- Copyright (C) 2007 Antonio Vinci <mercurio at personellarete.it>
- Copyright (C) 2007-2008 Artur Duque de Souza <morpheuz at gmail.com>
+ Copyright (C) 1996 Christopher Osburn, Lunar Outreach Services, <chris at speakeasy.org>
+ Copyright (C) 1998,2000 Stephan Kulow <coolo at kde.org>
+ Copyright (c) 1996-2002 the kicker authors. (fuzzy logic)
+ Copyright (C) 2005,2006,2007 Siraj Razick <siraj at kde.org>
+ Copyright (C) 2006-2007 Rivo Laks <rivolaks at hot.ee>
+ Copyright (C) 2007,2008 Alex Merry <alex.merry at kdemail.net>
+ Copyright (C) 2007, 2008 Petri Damsten <damu at iki.fi>
+ Copyright (C) 2007, 2008 Rob Scheepmaker <r.scheepmaker at student.utwente.nl>
+ Copyright (C) 2007-2008 Shawn Starr <shawn.starr at rogers.com>
+ Copyright (C) 2007 Alexis Ménard <darktears31 at gmail.com>
+ Copyright (C) 2007 André Duffeck <duffeck at kde.org>
+ Copyright (C) 2007-2008 Anne-Marie Mahfouf <annma at kde.org>
+ Copyright (C) 2007 Antonio Vinci <mercurio at personellarete.it>
+ Copyright (C) 2007-2008 Artur Duque de Souza <morpheuz at gmail.com>
Copyright (C) 2007 Brad Hards <bradh at frogmouth.net>
Copyright (C) 2007 Chani Armitage <chanika at gmail.com>
Copyright (C) 2007-2008 Davide Bettio <davide.bettio at kdemail.net>
@@ -35,7 +35,7 @@ Upstream Authors and copyright holders:
Copyright (C) 2007-2008 Sebastian Kuegler <sebas at kde.org>
Copyright (C) 2007 Sven Burmeister <sven.burmeister at gmx.net>
Copyright (C) 2007 Teemu Rytilahti <tpr at iki.fi>
- Copyright (C) 2007 Thomas Georgiou <TAGeorgiou at gmail.com>
+ Copyright (C) 2007 Thomas Georgiou <TAGeorgiou at gmail.com>
Copyright (C) 2007 Jeff Cooper <weirdsox11 at gmail.com>
Copyright (C) 2007 Tobias Koenig <tokoe at kde.org>
Copyright (C) 2007 Trever Fischer <wm161 at wm161.net>
@@ -71,7 +71,7 @@ applets/rssnow/ is a mix of LGPLv2 or later and GPLv2 or later.
applets/lancelot/ Lancelot is almost entirely gplv2 or later, but at least
- some files is under lgplv2 or later (especially the lib/ dir), so entire
+ some files is under lgplv2 or later (especially the lib/ dir), so entire
lancelot is gplv2 or later as well.
@@ -89,33 +89,33 @@ runners/spellchecker: mix of lgplv2 or later and gplv2 or later => gpl v2 or lat
GPLv2:
- 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 2 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, write to the
- Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA .
-
+ 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 2 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, write to the
+ Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA .
+
LGPLv2:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser/Library General Public License version 2,
or (at your option) any later version, as published by the Free
Software Foundation
-
+
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 Lesser/Library General Public License for more details
-
+
You should have received a copy of the GNU Lesser/Library General Public
License along with this program; if not, write to the
Free Software Foundation, Inc.,
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list