rev 13639 - kde-extras/konq-plugins/trunk/debian

Xavier Vello wdgt-guest at alioth.debian.org
Wed Jan 28 22:39:58 UTC 2009


Author: wdgt-guest
Date: 2009-01-28 22:39:58 +0000 (Wed, 28 Jan 2009)
New Revision: 13639

Modified:
   kde-extras/konq-plugins/trunk/debian/changelog
   kde-extras/konq-plugins/trunk/debian/control
   kde-extras/konq-plugins/trunk/debian/copyright
   kde-extras/konq-plugins/trunk/debian/rules
Log:
added libtidy-dev b-d
redid copyright



Modified: kde-extras/konq-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/konq-plugins/trunk/debian/changelog	2009-01-28 22:19:56 UTC (rev 13638)
+++ kde-extras/konq-plugins/trunk/debian/changelog	2009-01-28 22:39:58 UTC (rev 13639)
@@ -1,3 +1,11 @@
+konq-plugins (4:4.2.0-1) experimental; urgency=low
+
+  * New upstream version 4.2.0
+  * Remove 99_revert_webarchiver patch
+  * Migrate to pkg-kde-tools
+
+ -- Xavier Vello <xavier.vello at gmail.com>  Wed, 28 Jan 2009 23:05:38 +0100
+
 konq-plugins (4:4.1.3-1) experimental; urgency=low
 
   * New upstream release

Modified: kde-extras/konq-plugins/trunk/debian/control
===================================================================
--- kde-extras/konq-plugins/trunk/debian/control	2009-01-28 22:19:56 UTC (rev 13638)
+++ kde-extras/konq-plugins/trunk/debian/control	2009-01-28 22:39:58 UTC (rev 13639)
@@ -2,7 +2,8 @@
 Section: utils
 Priority: extra
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 6), cmake, quilt (>= 0.40), cdbs, libkonq5-dev (>= 4:4.1.0)
+Build-Depends: debhelper (>= 6), cmake, quilt (>= 0.40), cdbs, libtidy-dev
+ pkg-kde-tools (>= 0.2), libkonq5-dev (>= 4:4.1.0)
 Uploaders: Xavier Vello <xavier.vello at gmail.com>
 Standards-Version: 3.8.0
 

Modified: kde-extras/konq-plugins/trunk/debian/copyright
===================================================================
--- kde-extras/konq-plugins/trunk/debian/copyright	2009-01-28 22:19:56 UTC (rev 13638)
+++ kde-extras/konq-plugins/trunk/debian/copyright	2009-01-28 22:39:58 UTC (rev 13639)
@@ -25,39 +25,39 @@
 
   file ~ license ~ copyright holder
 -------~---------~------------------
-  akregator/akregatorplugin.cpp ~ GPLv2h ~ Copyright (C) 2004 Gary Cramblitt <garycramblitt at comcast.net>
-  akregator/akregatorplugin.h ~ GPLv2h ~ Copyright (C) 2004 Gary Cramblitt <garycramblitt at comcast.net>
-  akregator/feeddetector.cpp ~ GPLv2h ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
-  akregator/feeddetector.h ~ GPLv2h ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
-  akregator/konqfeedicon.cpp ~ GPLv2h ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
-  akregator/konqfeedicon.h ~ GPLv2h ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
-  akregator/pluginbase.cpp ~ GPLv2h ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
-  akregator/pluginbase.h ~ GPLv2h ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
+  akregator/akregatorplugin.cpp ~ GPLv2+ ~ Copyright (C) 2004 Gary Cramblitt <garycramblitt at comcast.net>
+  akregator/akregatorplugin.h ~ GPLv2+ ~ Copyright (C) 2004 Gary Cramblitt <garycramblitt at comcast.net>
+  akregator/feeddetector.cpp ~ GPLv2+ ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
+  akregator/feeddetector.h ~ GPLv2+ ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
+  akregator/konqfeedicon.cpp ~ GPLv2+ ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
+  akregator/konqfeedicon.h ~ GPLv2+ ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
+  akregator/pluginbase.cpp ~ GPLv2+ ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
+  akregator/pluginbase.h ~ GPLv2+ ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
 
-  autorefresh/* ~ GPLv2h ~ Copyright 2003 by Richard J. Moore <rich at kde.org>
+  autorefresh/* ~ GPLv2+ ~ Copyright 2003 by Richard J. Moore <rich at kde.org>
 
   babelfish/* ~ LGPLv2 ~ Copyright (C) 2001 Kurt Granroth <granroth at kde.org>
                          Copyright (C) 2003 Rand2342 <rand2342 at yahoo.com>
                          Copyright (C) 2008 Montel Laurent <montel at kde.org>
 
-  crashes/* ~ LGPLv2h ~ Copyright (c) 2002-2003 Alexander Kellett <lypanov at kde.org>
+  crashes/* ~ LGPLv2+ ~ Copyright (c) 2002-2003 Alexander Kellett <lypanov at kde.org>
 
   dirfilter/* ~ LGPLv2 ~ Copyright (C) 2000, 2001, 2002 Dawit Alemayehu <adawit at kde.org>
 
-  domtreeviewer/domlistviewitem.cpp ~ GPLv2h ~ Andreas Schlapbach <schlpbch at iam.unibe.ch>
-  domtreeviewer/domlistviewitem.h ~ GPLv2h ~ Andreas Schlapbach <schlpbch at iam.unibe.ch>
-  domtreeviewer/domtreecommands.cpp ~ LGPLv2h ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
-  domtreeviewer/domtreecommands.h ~ LGPLv2h ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
-  domtreeviewer/domtreeview.cpp ~ GPLv2h ~ (C) 2001 - The Kafka Team/Andreas Schlapbach
+  domtreeviewer/domlistviewitem.cpp ~ GPLv2+ ~ Andreas Schlapbach <schlpbch at iam.unibe.ch>
+  domtreeviewer/domlistviewitem.h ~ GPLv2+ ~ Andreas Schlapbach <schlpbch at iam.unibe.ch>
+  domtreeviewer/domtreecommands.cpp ~ LGPLv2+ ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
+  domtreeviewer/domtreecommands.h ~ LGPLv2+ ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
+  domtreeviewer/domtreeview.cpp ~ GPLv2+ ~ (C) 2001 - The Kafka Team/Andreas Schlapbach
                                                       <kde-kafka at master.kde.org>
                       (C) 2005 - Leo Savernik <schlpbch at iam.unibe.ch>
-  domtreeviewer/domtreeview.h ~ GPLv2h ~ (C) 2001 - The Kafka Team/Andreas Schlapbach
+  domtreeviewer/domtreeview.h ~ GPLv2+ ~ (C) 2001 - The Kafka Team/Andreas Schlapbach
                                                     <kde-kafka at master.kde.org>
                     (C) 2005 - Leo Savernik <schlpbch at iam.unibe.ch>
-  domtreeviewer/domtreewindow.cpp ~ LGPLv2h ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
-  domtreeviewer/domtreewindow.h ~ LGPLv2h ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
-  domtreeviewer/signalreceiver.cpp ~ LGPLv2h ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
-  domtreeviewer/signalreceiver.h ~ LGPLv2h ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
+  domtreeviewer/domtreewindow.cpp ~ LGPLv2+ ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
+  domtreeviewer/domtreewindow.h ~ LGPLv2+ ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
+  domtreeviewer/signalreceiver.cpp ~ LGPLv2+ ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
+  domtreeviewer/signalreceiver.h ~ LGPLv2+ ~ Copyright (C) 2005 Leo Savernik <l.savernik at aon.at>
 
   fsview/* ~ GPLv2 ~ Copyright (C) 2002, 2003 Josef Weidendorfer <Josef.Weidendorfer at gmx.de>
 
@@ -91,24 +91,24 @@
                         # POSSIBILITY OF SUCH DAMAGE.
 
 
-  khtmlsettingsplugin/* ~ GPLv2h ~ Copyright (C) 2001 Carsten Pfeiffer <pfeiffer at kde.org>
+  khtmlsettingsplugin/* ~ GPLv2+ ~ Copyright (C) 2001 Carsten Pfeiffer <pfeiffer at kde.org>
 
   kimgalleryplugin/*  ~ LGPLv2 ~ Copyright (C) 2001, 2003 Lukas Tinkl <lukas at kde.org>
 
-  microformat/konqmficon.cpp ~ GPLv2h ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
+  microformat/konqmficon.cpp ~ GPLv2+ ~ Copyright (C) 2004 Teemu Rytilahti <tpr at d5k.net>
                                         Copyright (C) 2005 George Staikos <staikos at kde.org>
 
-  minitools/* ~ LGPLv2h ~ Copyright (c) 2003 Alexander Kellett <lypanov at kde.org>
+  minitools/* ~ LGPLv2+ ~ Copyright (c) 2003 Alexander Kellett <lypanov at kde.org>
 
-  rellinks/*  ~ GPLv2h ~ Copyright (C) 2002, Anders Lund <anders at alweb.dk>
+  rellinks/*  ~ GPLv2+ ~ Copyright (C) 2002, Anders Lund <anders at alweb.dk>
                          Copyright (C) 2003, 2004, Franck Quélain <shift at free.fr>
                          Copyright (C) 2004, Kevin Krammer <kevin.krammer at gmx.at>
                          Copyright (C) 2004, 2006, Olivier Goffart <ogoffart @ kde.org>
 
-  searchbar/searchbar.cpp ~ GPLv2h ~ Copyright (C) 2004 Arend van Beelen jr. <arend at auton.nl>
+  searchbar/searchbar.cpp ~ GPLv2+ ~ Copyright (C) 2004 Arend van Beelen jr. <arend at auton.nl>
 
-  sidebar/mediaplayer/* ~ GPLv2h ~ Joseph Wenninger <jowenn at kde.org>
-                        # Contains GPLv2h code from kaboodle and noatun, written by :
+  sidebar/mediaplayer/* ~ GPLv2+ ~ Joseph Wenninger <jowenn at kde.org>
+                        # Contains GPLv2+ code from kaboodle and noatun, written by :
                         # - Neil Stevens <multivac at fcmail.com>
                         # - Charles Samuels <charles at kde.org>
                         # - Stefan Schimanski <1Stein at gmx.de>
@@ -116,35 +116,49 @@
                         # - Stefan Westerfeld <stefan at space.twc.de>
                         # - Nikolas Zimmermann <wildfox at kde.org>
 
-  sidebar/metabar/* ~ GPLv2h ~ Florian Roth <florian at synatic.net>
+  sidebar/metabar/* ~ GPLv2+ ~ Florian Roth <florian at synatic.net>
 
-  uachanger/* ~ LGPLv2h ~ Copyright (c) 2001 Dawit Alemayehu <adawit at kde.org>
+  uachanger/* ~ LGPLv2+ ~ Copyright (c) 2001 Dawit Alemayehu <adawit at kde.org>
 
-  validators/plugin_validators.cpp ~ LGPLv2h ~ Copyright (C) 2001 by  Richard Moore <rich at kde.org>
-  validators/plugin_validators.h ~ LGPLv2h ~ Copyright (C) 2001 by  Richard Moore <rich at kde.org>
-  validators/validatorsdialog.cpp ~ LGPLv2h ~ Copyright (C) 2001 Andreas Schlapbach <schlpbch at iam.unibe.ch>
-  validators/validatorsdialog.h ~ LGPLv2h ~ Copyright (C) 2001 Andreas Schlapbach <schlpbch at iam.unibe.ch>
+  validators/clickiconlabel.cpp ~ GPLv2+ ~ Copyright (C) 2008 by  Pino Toscano <pino at kde.org>
+  validators/clickiconlabel.h ~ GPLv2+ ~ Copyright (C) 2008 by  Pino Toscano <pino at kde.org>
+  validators/FindLibTidy.cmake ~ BSD ~ Copyright (c) 2007, Paulo Moura Guedes, <moura at kdewebdev.org>
+  validators/plugin_validators.cpp ~ LGPLv2+ ~ Copyright (C) 2001 by  Richard Moore <rich at kde.org>
+                                               Copyright (C) 2008-2009 by  Pino Toscano <pino at kde.org>
+  validators/plugin_validators.h ~ LGPLv2+ ~ Copyright (C) 2001 by  Richard Moore <rich at kde.org>
+                                             Copyright (C) 2008-2009 by  Pino Toscano <pino at kde.org>
+  validators/reportdialog.cpp ~ GPLv2+ ~ Copyright (C) 2008 by  Pino Toscano <pino at kde.org>
+  validators/reportdialog.h ~ GPLv2+ ~ Copyright (C) 2008 by  Pino Toscano <pino at kde.org>
+  validators/tidy_validator.cpp ~ GPLv2+ ~ Copyright (C) 2008 by  Pino Toscano <pino at kde.org>
+  validators/tidy_validator.h ~ GPLv2+ ~ Copyright (C) 2008 by  Pino Toscano <pino at kde.org>
+  validators/validatorsdialog.cpp ~ LGPLv2+ ~ Copyright (C) 2001 Andreas Schlapbach <schlpbch at iam.unibe.ch>
+                                              Copyright (C) 2008 Pino Toscano <pino at kde.org>
+  validators/validatorsdialog.h ~ LGPLv2+ ~ Copyright (C) 2001 Andreas Schlapbach <schlpbch at iam.unibe.ch>
+                                            Copyright (C) 2008 Pino Toscano <pino at kde.org>
 
-  webarchiver/archivedialog.cpp ~ GPLv2h ~ Copyright (C) 2001 Andreas Schlapbach <schlpbch at iam.unibe.ch>
-                                          Copyright (C) 2003 Antonio Larrosa <larrosa at kde.org>
-  webarchiver/archivedialog.h ~ GPLv2h ~ Copyright (C) 2003 Antonio Larrosa <larrosa at kde.org>
+  webarchiver/archivedialog.cpp ~ GPLv2+ ~ Copyright (C) 2001 Andreas Schlapbach <schlpbch at iam.unibe.ch>
+                                           Copyright (C) 2003 Antonio Larrosa <larrosa at kde.org>
+                                           Copyright (C) 2008 Matthias Grimrath <maps4711 at gmx.de>
+  webarchiver/archivedialog.h ~ GPLv2+ ~ Copyright (C) 2003 Antonio Larrosa <larrosa at kde.org>
+                                         Copyright (C) 2008 Matthias Grimrath <maps4711 at gmx.de>
 
-  webarchiver/plugin_webarchiver.cpp ~ LGPLv2h ~ Copyright (C) 2001 by Andreas Schlapbach <schlpbch at iam.unibe.ch>
-  webarchiver/plugin_webarchiver.h ~ LGPLv2h ~ Copyright (C) 2001 by Andreas Schlapbach <schlpbch at iam.unibe.ch>
-  webarchiver/webarchivecreator.cpp ~ GPLv2h ~ Copyright (C) 2001 Malte Starostik <malte at kde.org>
-  webarchiver/webarchivecreator.h ~ GPLv2h ~ Copyright (C) 2001 Malte Starostik <malte at kde.org>
+  webarchiver/plugin_webarchiver.cpp ~ LGPLv2+ ~ Copyright (C) 2001 by Andreas Schlapbach <schlpbch at iam.unibe.ch>
+  webarchiver/plugin_webarchiver.h ~ LGPLv2+ ~ Copyright (C) 2001 by Andreas Schlapbach <schlpbch at iam.unibe.ch>
+  webarchiver/webarchivecreator.cpp ~ GPLv2+ ~ Copyright (C) 2001 Malte Starostik <malte at kde.org>
+  webarchiver/webarchivecreator.h ~ GPLv2+ ~ Copyright (C) 2001 Malte Starostik <malte at kde.org>
 
 -------------------------------------------------------------------------------
 Legend:
  - "unspec":    The file contains no specific copyright/license notice. This
                 means that the copyright holder is the KDE Development Team (as
                 listed above) and the license is GPL2, unless specified otherwise.
+ - "BSD":       The BSD License.
  - "GPLv2":     The GNU General Public License, version 2.
- - "GPLv2h":    The GNU General Public License, version 2 or (at your
+ - "GPLv2+":    The GNU General Public License, version 2 or (at your
                 option) higher.
 
- - "LGPLv2h":   The Lesser (or Library) GNU General Public License, version 2.
- - "LGPLv2h":   The Lesser (or Library) GNU General Public License, version
+ - "LGPLv2+":   The Lesser (or Library) GNU General Public License, version 2.
+ - "LGPLv2+":   The Lesser (or Library) GNU General Public License, version
                 2 or (at your option).
 
   GPLv2 pre-text :

Modified: kde-extras/konq-plugins/trunk/debian/rules
===================================================================
--- kde-extras/konq-plugins/trunk/debian/rules	2009-01-28 22:19:56 UTC (rev 13638)
+++ kde-extras/konq-plugins/trunk/debian/rules	2009-01-28 22:39:58 UTC (rev 13639)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
 binary-install/konq-plugins::
 	dh_installman -pkonq-plugins --language=C debian/man/*.1




More information about the pkg-kde-commits mailing list