[SCM] rekonq packaging branch, master, updated. debian/0.8.0-1-1-gcaed915
Felix Geyer
debfx-guest at alioth.debian.org
Tue Dec 6 10:22:16 UTC 2011
The following commit has been merged in the master branch:
commit caed915ade7fc08a42d076abdfdc6cf1b9008309
Author: Felix Geyer <debfx-pkg at fobos.de>
Date: Tue Dec 6 11:22:06 2011 +0100
Update copyright file.
---
debian/changelog | 6 +++++
debian/copyright | 61 +++++++++++++++++------------------------------------
2 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1983b8e..0969e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rekonq (0.8.0-2) UNRELEASED; urgency=low
+
+ * Update copyright file.
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Tue, 06 Dec 2011 11:21:38 +0100
+
rekonq (0.8.0-1) experimental; urgency=low
* New upstream release (Closes: #647903)
diff --git a/debian/copyright b/debian/copyright
index 6a01a88..42f11b4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,21 +22,25 @@ Copyright:
Copyright (C) 2009, Nils Weigel <nehlsen at gmail dot com>
Copyright (C) 2007, David Faure <faure at kde.org>
Copyright (C) 2009-2011, Lionel Chauvin <megabigbug at yahoo.fr>
- Copyright (C) 2010, Matthieu Gicquel <matgic78 at gmail dot com>
+ Copyright (C) 2010-2011, 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>
Copyright (C) 2008, Urs Wolfer <uwolfer @ kde.org>
Copyright (C) 2008, Dirk Mueller <mueller at kde.org>
Copyright (C) 2008, Michael Howell <mhowell123 at gmail.com>
- Copyright (C) 2009, by Yoram Bar-Haim <<yoram.b at zend dot com>
+ Copyright (C) 2009, Yoram Bar-Haim <yoram.b at zend dot com>
+ Copyright (C) 2009, Jakub Wieczorek <faw217 at gmail.com>
+ Copyright (C) 2009, Christian Franke <cfchris6 at ts2server.com>
Copyright (C) 2009, Zsombor Gegesy <gzsombor at gmail.com>
- 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) 2010-2011, Yoann Laissus <yoann dot laissus at gmail dot com>
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, Fredy Yanardi <fyanardi at gmail.com>
Copyright (C) 2009, Domrachev Alexandr <alexandr.domrachev at gmail.com>
+ Copyright (C) 2010-2011 by Benjamin Poulain <ikipou at gmail dot com>
+ Copyright (C) 2011, Vyacheslav Blinov <blinov dot vyacheslav at gmail dot com>
+ Copyright (C) 2011, Tröscher Johannes <fritz_van_tom at hotmail.com>
License:
@@ -56,50 +60,24 @@ License:
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/adblock/adblocknetworkreply.* and src/adblock/adblockrule.*:
-
- 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 above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the Benjamin Meyer nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
- ============================================================
+License of the file src/tests/listitem_test.cpp:
+
+ 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 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) 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 14 of version 3 of the license.
-
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, see <http://www.gnu.org/licenses/>.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA
-License of the files src/sslinfodialog_p.h, src/websslinfo.cpp and src/websslinfo.h:
+License of the files src/websslinfo.*:
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -124,6 +102,7 @@ The Debian packaging is:
Copyright (C) 2009-2010, Anthony Mercatante <tonio at ubuntu.com>
Copyright (C) 2010-2011, Felix Geyer <debfx-pkg at fobos.de>
+ Copyright (C) 2011, Jonathan Kolberg <bulldog98 at kubuntu-de.org>
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