[SCM] KDE SDK module packaging branch, master, updated. debian/4.4.5-1-53-g361283d
Modestas Vainius
modax at alioth.debian.org
Fri Apr 1 19:55:42 UTC 2011
The following commit has been merged in the master branch:
commit 57818173a6b459dea94d06802ef6abedfbafd75a
Author: Modestas Vainius <modax at debian.org>
Date: Fri Apr 1 22:03:44 2011 +0300
Strip trailing whitespace in debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 172 +++++++++++++++++++++++++++---------------------------
2 files changed, 87 insertions(+), 86 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 65845f6..75c6e9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ kdesdk (4:4.6.1-0r1) UNRELEASED; urgency=low
[ Modestas Vainius ]
* Point debian/control Vcs fields to the new Git repository.
* Strip sequence numbers from debian/patches.
+ * Strip trailing whitespace in debian/copyright.
[ George Kiagiadakis ]
* Add myself to uploaders.
diff --git a/debian/copyright b/debian/copyright
index 86ff77b..80ec370 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,75 +16,75 @@ Upstream Authors and copyright holders:
© 2002, 2002-2003, 2003-2009 Umbrello UML Modeller Authors <uml-devel at uml.sf.net>
© 2002-2003 Brian Thomas <thomas at mail630.gsfc.nasa.gov> <brian.thomas at gsfc.nasa.gov>
- © 2001, 2007-2009 Nick Shaforostoff <shafff at ukr.net> <shaforostoff at kde.ru>
- © 2002-2009 Josef Weidendorfer <Josef.Weidendorfer at gmx.de>
+ © 2001, 2007-2009 Nick Shaforostoff <shafff at ukr.net> <shaforostoff at kde.ru>
+ © 2002-2009 Josef Weidendorfer <Josef.Weidendorfer at gmx.de>
© 2002-2008 Christian Loose <christian.loose at kdemail.net> <christian.loose at hamburg.de>
© 1999-2002 Bernd Gehrmann <bernd at mail.berlios.de> <bernd at physik.hu-berlin.de> <bernd at kdevelop.org>
- © 2001-2005, 2009 Otto Bruggeman <otto.bruggeman at home.nl> <bruggie at home.nl>
- © 2001-2004, 2006-2009 Joseph Wenninger <jowenn at kde.org> <jowenn at bigfoot.com>
- © 2001, 2005, 2007 Christoph Cullmann <cullmann at kde.org>
- © 2001-2002, 2004-2005, 2007 Anders Lund <anders at alweb.dk> <anders.lund at lund.tdcadsl.dk>
- © 2001-2003 John Firebaugh <jfirebaugh at kde.org>
- © 2008 KBugBuster Authors <kde-ev-board at kde.org>
- © 2007-2009 Kevin Kofler <kevin.kofler at chello.at>
- © 2001-2003 Cornelius Schumacher <schumacher at kde.org>
- © 2005 Richard Dale <Richard_Dale at tipitina.demon.co.uk>
- © 2004-2005, 2007-2009 Dominik Haumann <dhdev at gmx.de>
- © 2007 Jari-Matti Mäkelä <jmjm at iki.fi>
- © 2001-2004 Martijn Klingens <klingens at kde.org>
- © 1998-1999 Pete Wells <pete at yamuna.demon.co.uk>
- © 2003-2008 André Wöbbeking <Woebbeking at kde.org>
- © 2001, 2003 Richard Moore <rich at kde.org>
- © 2005-2009 Montel <montel at kde.org>
- © 2005 Jeroen Wijnhout <Jeroen.Wijnhout at kdemail.net>
- © 2002-2003 Roberto Raggi <roberto at kdevelop.org>
- © 2008 Anne-Marie Mahfouf <annma at kde.org>
- © 2001-2005 Stanislav Visnovsky <visnovsky at kde.org> <visnovsky at nenya.ms.mff.cuni.cz>
- © 2005-2008 Laurent Montel <montel at kde.org> <faure at kde.org>
- © 2003 Ian Reinhart Geiser <geiseri at kde.org>
- © 2002-2003 Luis De la Parra <luis at delaparra.org> <lparrab at gmx.net>
- © 2002, 2007-2008 David Faure <david at mandrakesoft.com> <faure at kde.org>
- © 1999-2000 Matthias Kiefer <matthias.kiefer at gmx.de>
- © 2003, 2007 Alexander Dymo <adymo at kdevelop.org> <cloudtemple at mksat.net>
- © 2007 Flavio Castelli <flavio.castelli at gmail.com>
- © 2001, 2003 Bugs <uml-devel at lists.sf.net>
- © 2007 Mirko Stocker <me at misto.ch>
- © 2004-2005 Jeff Snyder <jeff at caffeinated.me.uk> <jeff-webcvsspam at caffeinated.me.uk>
- © 2001-2002 Daniel Naber <daniel.naber at t-online.de>
- © 2006 Reinhold Kainhofer <reinhold at kainhofer.com>
- © 2003-2005 Mickael Marchand <marchand at kde.org>
- © 2003 Andrew Sutton <ansutton at kent.edu>
- © 2004 Stephan Möres <Erdling at gmx.net>
- © 2001 Christian Bird <chrisb at lineo.com>
- © 2008 Jakob Petsovits <jpetso at gmx.at>
- © 2008 Eduardo Robles Elvira <edulix at gmail.com>
- © 2004, 2007 Graciliano M. P.
- © 2004 Benjamin C. Meyer <ben+kuiviewer at meyerhome.net>
- © 2005-2006 Nicolas GOUTTE <goutte at kde.org> <nicolasg at snafu.de>
- © 1992-2003, 2004-2007 Trolltech AS.
- © 2003 Alexander Blum <blum at kewbee.de>
- © 2002 Heiko Nardmann <h.nardmann at secunet.de>
- © 2004-2005 Sascha Cunz <sascha at kdevelop.org>
- © 2001 Gustavo Madrigal <gmadrigal at nextphere.com>
- © 2002-2003 Oliver Kellogg <okellogg at users.sourceforge.net>
- © 2004 Jarosław Staniek <staniek at kde.org>
- © 2007-2008 Michael Pyne <michael.pyne at kdemail.net>
- © 2008 Jakub Stachowski <qbast at go2.pl>
- © 2006 Matt Rogers <mattr at kde.org>
- © 2002 Vincent Decorges <vincent.decorges at eivd.ch>
- © 2007 Andreas Pakulat <apaku at gmx.de>
- © 2008 Andreas Fischer <andi.fischer at hispeed.ch>
- © 2004 Jason Kivlighn <mizunoami44 at users.sourceforge.net>
- © 2003 Nikolaus Gradwohl <guru at local-guru.net>
- © 1996-2003 Darren Hiebert <dhiebert at users.sourceforge.net>
- © 2002 Thorsten Kunz <tk at bytecrash.net>
- © 1999-2000 Harri Porten <porten at kde.org>
- © 2001-2002 Fredrik Höglund <fredrik at kde.org>
- © 2008 Kare Sars <kare.sars at iki.fi>
- © 2000 Dirk Mueller <mueller at kde.org>
- © 2003 David Hugh-Jones <hughjonesd at yahoo.co.uk>
- © 2003 Julian Rockey <linux at jrockey.com>
- © 2003 Mario Scalas <mario.scalas at libero.it>
+ © 2001-2005, 2009 Otto Bruggeman <otto.bruggeman at home.nl> <bruggie at home.nl>
+ © 2001-2004, 2006-2009 Joseph Wenninger <jowenn at kde.org> <jowenn at bigfoot.com>
+ © 2001, 2005, 2007 Christoph Cullmann <cullmann at kde.org>
+ © 2001-2002, 2004-2005, 2007 Anders Lund <anders at alweb.dk> <anders.lund at lund.tdcadsl.dk>
+ © 2001-2003 John Firebaugh <jfirebaugh at kde.org>
+ © 2008 KBugBuster Authors <kde-ev-board at kde.org>
+ © 2007-2009 Kevin Kofler <kevin.kofler at chello.at>
+ © 2001-2003 Cornelius Schumacher <schumacher at kde.org>
+ © 2005 Richard Dale <Richard_Dale at tipitina.demon.co.uk>
+ © 2004-2005, 2007-2009 Dominik Haumann <dhdev at gmx.de>
+ © 2007 Jari-Matti Mäkelä <jmjm at iki.fi>
+ © 2001-2004 Martijn Klingens <klingens at kde.org>
+ © 1998-1999 Pete Wells <pete at yamuna.demon.co.uk>
+ © 2003-2008 André Wöbbeking <Woebbeking at kde.org>
+ © 2001, 2003 Richard Moore <rich at kde.org>
+ © 2005-2009 Montel <montel at kde.org>
+ © 2005 Jeroen Wijnhout <Jeroen.Wijnhout at kdemail.net>
+ © 2002-2003 Roberto Raggi <roberto at kdevelop.org>
+ © 2008 Anne-Marie Mahfouf <annma at kde.org>
+ © 2001-2005 Stanislav Visnovsky <visnovsky at kde.org> <visnovsky at nenya.ms.mff.cuni.cz>
+ © 2005-2008 Laurent Montel <montel at kde.org> <faure at kde.org>
+ © 2003 Ian Reinhart Geiser <geiseri at kde.org>
+ © 2002-2003 Luis De la Parra <luis at delaparra.org> <lparrab at gmx.net>
+ © 2002, 2007-2008 David Faure <david at mandrakesoft.com> <faure at kde.org>
+ © 1999-2000 Matthias Kiefer <matthias.kiefer at gmx.de>
+ © 2003, 2007 Alexander Dymo <adymo at kdevelop.org> <cloudtemple at mksat.net>
+ © 2007 Flavio Castelli <flavio.castelli at gmail.com>
+ © 2001, 2003 Bugs <uml-devel at lists.sf.net>
+ © 2007 Mirko Stocker <me at misto.ch>
+ © 2004-2005 Jeff Snyder <jeff at caffeinated.me.uk> <jeff-webcvsspam at caffeinated.me.uk>
+ © 2001-2002 Daniel Naber <daniel.naber at t-online.de>
+ © 2006 Reinhold Kainhofer <reinhold at kainhofer.com>
+ © 2003-2005 Mickael Marchand <marchand at kde.org>
+ © 2003 Andrew Sutton <ansutton at kent.edu>
+ © 2004 Stephan Möres <Erdling at gmx.net>
+ © 2001 Christian Bird <chrisb at lineo.com>
+ © 2008 Jakob Petsovits <jpetso at gmx.at>
+ © 2008 Eduardo Robles Elvira <edulix at gmail.com>
+ © 2004, 2007 Graciliano M. P.
+ © 2004 Benjamin C. Meyer <ben+kuiviewer at meyerhome.net>
+ © 2005-2006 Nicolas GOUTTE <goutte at kde.org> <nicolasg at snafu.de>
+ © 1992-2003, 2004-2007 Trolltech AS.
+ © 2003 Alexander Blum <blum at kewbee.de>
+ © 2002 Heiko Nardmann <h.nardmann at secunet.de>
+ © 2004-2005 Sascha Cunz <sascha at kdevelop.org>
+ © 2001 Gustavo Madrigal <gmadrigal at nextphere.com>
+ © 2002-2003 Oliver Kellogg <okellogg at users.sourceforge.net>
+ © 2004 Jarosław Staniek <staniek at kde.org>
+ © 2007-2008 Michael Pyne <michael.pyne at kdemail.net>
+ © 2008 Jakub Stachowski <qbast at go2.pl>
+ © 2006 Matt Rogers <mattr at kde.org>
+ © 2002 Vincent Decorges <vincent.decorges at eivd.ch>
+ © 2007 Andreas Pakulat <apaku at gmx.de>
+ © 2008 Andreas Fischer <andi.fischer at hispeed.ch>
+ © 2004 Jason Kivlighn <mizunoami44 at users.sourceforge.net>
+ © 2003 Nikolaus Gradwohl <guru at local-guru.net>
+ © 1996-2003 Darren Hiebert <dhiebert at users.sourceforge.net>
+ © 2002 Thorsten Kunz <tk at bytecrash.net>
+ © 1999-2000 Harri Porten <porten at kde.org>
+ © 2001-2002 Fredrik Höglund <fredrik at kde.org>
+ © 2008 Kare Sars <kare.sars at iki.fi>
+ © 2000 Dirk Mueller <mueller at kde.org>
+ © 2003 David Hugh-Jones <hughjonesd at yahoo.co.uk>
+ © 2003 Julian Rockey <linux at jrockey.com>
+ © 2003 Mario Scalas <mario.scalas at libero.it>
© 2006 Gael de Chalendar (aka Kleag) <kleag at free.fr>
© 2008 Don Sanders <sanders at kde.org>
© 2000, 2002 Simon Hausmann <hausmann at kde.org>
@@ -100,7 +100,7 @@ Upstream Authors and copyright holders:
© 2000 Geert Jansen <jansen at kde.org>
© 2001 Markus Stengel's GPL implementation of LCS-Delta
© 2008 Jean Vittor <jean.vittor at free.fr>
- © 2001 Thomas H. Cormen et. al.
+ © 2001 Thomas H. Cormen et. al.
© 2001-2002 Karol Szwed <gallium at kde.org>
© 2008 Beat Wolf <asraniel at fryx.ch>
© 2006-2008 Allen Winter <winter at kde.org>
@@ -139,10 +139,10 @@ When "under GPL" is mentioned, it means GPL like this:
| along with this program; if not, write to the Free Software Foundation,
| Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- (Some files have the additional freedom of being GPLv2 or later, but
+ (Some files have the additional freedom of being GPLv2 or later, but
many files are just GPLv2)
- You can find the complete text of the license GPL v2 at
+ You can find the complete text of the license GPL v2 at
/usr/share/common-licenses/GPL-2
@@ -155,7 +155,7 @@ that are under the LGPL v2 or later.
Files under cmake/
Files under cmake/modules 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:
@@ -165,7 +165,7 @@ Files under cmake/
| 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
+ | 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
@@ -195,13 +195,13 @@ These files are under the GNU Free Documentation License v1.2
The full text of the GNU Free Documentation License is available on
Debian systems in /usr/share/common-licenses/GFDL-1.2
- As well, all the Manpages.dox included are under this license, unless
+ As well, all the Manpages.dox included are under this license, unless
specified otherwise.
Files under kapptemplate/
-These files are under the GPL v2 or later. Except:
+These files are under the GPL v2 or later. Except:
Files under kate/
@@ -242,7 +242,7 @@ that are under GNU Library General Public License version 2.
Files under kbugbuster/
-Most of files are under the GPL v2 or later. Except:
+Most of files are under the GPL v2 or later. Except:
files under kbugbuster/kresources/ that are under LGPL v2 or later.
And
kbugbuster/gui/loadallbugsdlg.cpp
@@ -345,24 +345,24 @@ These files are under the GPL v2 or later. Except:
lokalize/src/catalog/gettext/gettextimport.h
that are under the GPL v2.
-
+
Files under poxml/
Those files are under the GPL, except files under poxml/antlr that are under
the following license:
- |
+ |
| SOFTWARE RIGHTS
- |
+ |
| ANTLR MageLang Institute, 1989-1999
| http://www.ANTLR.org
- |
+ |
| We reserve no legal rights to the ANTLR--it is fully in the
| public domain. An individual or company may do whatever
| they wish with source code distributed with ANTLR or the
| code generated by ANTLR, including the incorporation of
| ANTLR, or its output, into commercial software.
- |
+ |
| We encourage users to develop software with ANTLR. However,
| we do ask that credit is given to us for developing
| ANTLR. By "credit", we mean that if you use ANTLR or
@@ -376,9 +376,9 @@ the following license:
| guidelines are kept, we expect to continue enhancing this
| system and expect to make other tools available as they are
| completed.
- |
+ |
| The primary ANTLR guy:
- |
+ |
| Terence Parr
| MageLang Institute; http://www.MageLang.com
| parrt at jguru.com
@@ -414,18 +414,18 @@ that are under the LGPL version 2.
-On Debian systems, the complete text of the GNU General Public License
+On Debian systems, the complete text of the GNU General Public License
version 2 can be found in /usr/share/common-licenses/GPL-2
-On Debian systems, the complete text of the GNU Library General Public
+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 General Public License
+On Debian systems, the complete text of the GNU General Public License
version 3 can be found in /usr/share/common-licenses/GPL-3
The Debian packaging is © 2007-2010, Debian Qt/KDE Maintainers
-<debian-qt-kde at lists.debian.org> and is licensed under the GPL,
+<debian-qt-kde at lists.debian.org> and is licensed under the GPL,
see `/usr/share/common-licenses/GPL'.
--
KDE SDK module packaging
More information about the pkg-kde-commits
mailing list