[SCM] rekonq packaging branch, master, updated. 0e65c6e8cde1a51a0ea709c9df97f8e2ab20ccab
Felix Geyer
debfx-guest at alioth.debian.org
Sat Mar 26 18:14:22 UTC 2011
The following commit has been merged in the master branch:
commit 0e65c6e8cde1a51a0ea709c9df97f8e2ab20ccab
Author: Felix Geyer <debfx-pkg at fobos.de>
Date: Sat Mar 26 19:13:16 2011 +0100
Update copyright information.
---
debian/copyright | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index b836063..6a01a88 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,11 +17,11 @@ Copyright:
Copyright (C) 2007-2008, Trolltech ASA. All rights reserved
Copyright (C) 2008-2009, Benjamin C. Meyer <ben at meyerhome.net>
- Copyright (C) 2008-2010, Andrea Diamantini <adjam7 at gmail dot com>
+ Copyright (C) 2008-2011, Andrea Diamantini <adjam7 at gmail dot com>
Copyright (C) 2009, Paweł Prażak <pawelprazak at gmail dot com>
Copyright (C) 2009, Nils Weigel <nehlsen at gmail dot com>
Copyright (C) 2007, David Faure <faure at kde.org>
- Copyright (C) 2009-2010, Lionel Chauvin <megabigbug at yahoo.fr>
+ Copyright (C) 2009-2011, Lionel Chauvin <megabigbug at yahoo.fr>
Copyright (C) 2010, Matthieu Gicquel <matgic78 at gmail dot com>
Copyright (C) 2009, Alexandr Domrachev <alexandr.domrachev at gmail.com>
Copyright (C) 2009, Nokia Corporation <qt-info at nokia.com>
@@ -33,7 +33,10 @@ Copyright:
Copyright (C) 2010, Yoann Laissus <yoann dot laissus at gmail dot com>
Copyright (C) 2000-2003, George Staikos <staikos at kde.org>
Copyright (C) 2000, Malte Starostik <malte at kde.org>
- Copyright (C) 2009, Dawit Alemayehu <adawit at kde.org>
+ Copyright (C) 2001-2010, Dawit Alemayehu <adawit at kde.org>
+ Copyright (C) 2010-2011, Pierre Rossi <pierre dot rossi at gmail dot com>
+ Copyright (C) 2009-2010, Richard J. Moore <rich at kde.org>
+ Copyright (C) 2009, Domrachev Alexandr <alexandr.domrachev at gmail.com>
License:
@@ -96,14 +99,31 @@ License of the files src/adblock/adblocknetworkreply.* and src/adblock/adblockru
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
+License of the files src/sslinfodialog_p.h, src/websslinfo.cpp and src/websslinfo.h:
+
+ 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 General
-Public License can be found in `/usr/share/common-licenses/GPL-2' and
-`/usr/share/common-licenses/GPL-3'.
+Public License can be found in `/usr/share/common-licenses/GPL-2',
+`/usr/share/common-licenses/GPL-3' and `/usr/share/common-licenses/LGPL-2'.
The Debian packaging is:
Copyright (C) 2009-2010, Anthony Mercatante <tonio at ubuntu.com>
- Copyright (C) 2010, Felix Geyer <debfx-pkg at fobos.de>
+ Copyright (C) 2010-2011, Felix Geyer <debfx-pkg at fobos.de>
and is licensed under the GPL version either version 2 of
the License or (at your option) version 3 or any later version
--
rekonq packaging
More information about the pkg-kde-commits
mailing list