rev 18053 - kde-extras/rekonq/trunk/debian

Sat May 22 22:22:39 UTC 2010

Author: debfx-guest
Date: 2010-05-22 22:22:39 +0000 (Sat, 22 May 2010)
New Revision: 18053

Modified:
   kde-extras/rekonq/trunk/debian/copyright
Log:
Update copyright file.


Modified: kde-extras/rekonq/trunk/debian/copyright
===================================================================

--- kde-extras/rekonq/trunk/debian/copyright	2010-05-22 22:22:18 UTC (rev 18052)
+++ kde-extras/rekonq/trunk/debian/copyright	2010-05-22 22:22:39 UTC (rev 18053)
@@ -1,35 +1,107 @@
-This package was debianized by Anthony Mercatante <tonio at ubuntu.com> on
-Fri, 22 May 2009 06:55:09 +0200.
+This work was packaged for Debian by:
 
-It was downloaded from http://rekonq.sourceforge.net
+    Felix Geyer <debfx-pkg at fobos.de> on Sun, 23 May 2010 00:01:39 +0200
 
-Upstream authors:
+It was downloaded from:
+
+    http://sourceforge.net/projects/rekonq/
+
+Upstream Authors:
+
     Andrea Diamantini       <adjam7 at gmail dot com>
-    Alexandr Domrachev      <alexandr.domrachev at gmail dot com
-    Pawel Prazak            <kojots350 at gmail dot com>
+    Alexandr Domrachev      <alexandr.domrachev at gmail dot com>
+    Paweł Prażak            <kojots350 at gmail dot com>
+    Lionel Chauvin          <megabigbug at yahoo.fr>
 
 Copyright:
-   Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-   Copyright (C) 2008 Benjamin C. Meyer <ben at meyerhome.net>
-   Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-   Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
 
-Licence:
+    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) 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) 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>
+    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>
 
-   This package 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.
+License:
 
-   This package 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.
+    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.
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+    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/>.
+
+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.
+    ============================================================
+
+    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/>.
+
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Public License can be found in `/usr/share/common-licenses/GPL-2' and
+`/usr/share/common-licenses/GPL-3'.
 
+The Debian packaging is:
+
+    Copyright (C) 2009-2010, Anthony Mercatante <tonio at ubuntu.com>
+    Copyright (C) 2010, 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
+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., see above.


