--- kdeplasma-addons-4.3.2.orig/debian/liblancelot0.install +++ kdeplasma-addons-4.3.2/debian/liblancelot0.install @@ -0,0 +1,2 @@ +usr/lib/liblancelot.so.0 +usr/lib/liblancelot.so.0.7.0 --- kdeplasma-addons-4.3.2.orig/debian/plasma-runners-addons.install +++ kdeplasma-addons-4.3.2/debian/plasma-runners-addons.install @@ -0,0 +1,16 @@ +usr/lib/kde4/kcm_krunner_spellcheck.so +usr/lib/kde4/krunner_browserhistory.so +usr/lib/kde4/krunner_contacts.so +usr/lib/kde4/krunner_converter.so +usr/lib/kde4/krunner_katesessions.so +usr/lib/kde4/krunner_konquerorsessions.so +usr/lib/kde4/krunner_konsolesessions.so +usr/lib/kde4/krunner_spellcheckrunner.so +usr/share/kde4/services/browserhistory.desktop +usr/share/kde4/services/katesessions.desktop +usr/share/kde4/services/konquerorsessions.desktop +usr/share/kde4/services/konsolesessions.desktop +usr/share/kde4/services/plasma-runner-contacts.desktop +usr/share/kde4/services/plasma-runner-converter.desktop +usr/share/kde4/services/plasma-runner-spellchecker_config.desktop +usr/share/kde4/services/plasma-runner-spellchecker.desktop --- kdeplasma-addons-4.3.2.orig/debian/liblancelot-dev.install +++ kdeplasma-addons-4.3.2/debian/liblancelot-dev.install @@ -0,0 +1,23 @@ +usr/include/lancelot/Global.h +usr/include/lancelot/lancelot.h +usr/include/lancelot/lancelot_export.h +usr/include/lancelot/layouts/CardLayout.h +usr/include/lancelot/layouts/ColumnLayout.h +usr/include/lancelot/models/ActionListModel.h +usr/include/lancelot/models/ActionTreeModel.h +usr/include/lancelot/models/ActionTreeModelProxy.h +usr/include/lancelot/models/MergedActionListModel.h +usr/include/lancelot/models/PlasmaServiceListModel.h +usr/include/lancelot/models/StandardActionListModel.h +usr/include/lancelot/models/StandardActionTreeModel.h +usr/include/lancelot/widgets/ActionListView.h +usr/include/lancelot/widgets/BasicWidget.h +usr/include/lancelot/widgets/ExtenderButton.h +usr/include/lancelot/widgets/HoverIcon.h +usr/include/lancelot/widgets/Panel.h +usr/include/lancelot/widgets/PassagewayView.h +usr/include/lancelot/widgets/PopupList.h +usr/include/lancelot/widgets/PopupMenu.h +usr/include/lancelot/widgets/ResizeBordersPanel.h +usr/include/lancelot/widgets/Widget.h +usr/lib/liblancelot.so --- kdeplasma-addons-4.3.2.orig/debian/copyright +++ kdeplasma-addons-4.3.2/debian/copyright @@ -0,0 +1,133 @@ +This package was debianized by Armin Berres on +Thu, 11 Oct 2007 22:41:12 +0200. + +It was downloaded from ftp://ftp.kde.org + +Upstream Authors and copyright holders: + Copyright (C) 1989, 1991, 1999-2002, 2007 Free Software Foundation, Inc. + Copyright (C) 1996 Christopher Osburn, Lunar Outreach Services, + Copyright (C) 1998,2000 Stephan Kulow + Copyright (c) 1996-2002 the kicker authors. (fuzzy logic) + Copyright (C) 2005,2006,2007 Siraj Razick + Copyright (C) 2006-2007 Rivo Laks + Copyright (C) 2007,2008 Alex Merry + Copyright (C) 2007, 2008 Petri Damsten + Copyright (C) 2007, 2008 Rob Scheepmaker + Copyright (C) 2007-2008 Shawn Starr + Copyright (C) 2007 Alexis Ménard + Copyright (C) 2007 André Duffeck + Copyright (C) 2007-2008 Anne-Marie Mahfouf + Copyright (C) 2007 Antonio Vinci + Copyright (C) 2007-2008 Artur Duque de Souza + Copyright (C) 2007 Brad Hards + Copyright (C) 2007 Chani Armitage + Copyright (C) 2007-2008 Davide Bettio + Copyright (C) 2007 David Faure + Copyright (C) 2007 Henry Stanaland + Copyright (C) 2007 Ivan Cukic + Copyright (C) 2007 Jesper Thomschutz + Copyright (C) 2007 Lukas Kropatschek + Copyright (C) 2007-2008 Marco Martin + Copyright (C) 2007 Pino Toscano + Copyright (C) 2007 Riccardo Iaconelli + Copyright (C) 2007 Robert Knight + Copyright (C) 2007 Ryan P. Bitanga + Copyright (C) 2007-2008 Sebastian Kuegler + Copyright (C) 2007 Sven Burmeister + Copyright (C) 2007 Teemu Rytilahti + Copyright (C) 2007 Thomas Georgiou + Copyright (C) 2007 Jeff Cooper + Copyright (C) 2007 Tobias Koenig + Copyright (C) 2007 Trever Fischer + Copyright (C) 2008 Aaron Seigo + Copyright (C) 2008 Alessandro Diaferia + Copyright (C) 2008 Christian Weilbach + Copyright (C) 2008 Kristof Bal + Copyright (C) 2008 Laurent Montel + Copyright (C) 2008 Marco Gulino + Copyright (C) 2008 Montel Laurent + Copyright (C) 2008 Nick Shaforostoff + Copyright (C) 2008 Olivier Goffart + Copyright (C) 2008 Ryan P. Bitanga + Copyright (C) 2008 Thomas Coopman + Copyright (C) 2008 Thomas Gillespie + Copyright (C) 2008 Tobias Koenig + + + +License: + + +Most widgets are under gplv2 or later. +Within the files there is occasionally a lgplv2 or later, but together with gplv2 files, +these all becomes gplv2 or later. i + +applets/bluemarble/ is gplv2 only. +applets/incomingmsg/ is GNU Library Public License v2. +applets/leavenote/ is GNU library Public License v2. +applets/rssnow/ is a mix of LGPLv2 or later and GPLv2 or later. + + + +applets/lancelot/ Lancelot is almost entirely gplv2 or later, but at least + some files is under lgplv2 or later (especially the lib/ dir), so entire + lancelot is gplv2 or later as well. + + + +dataengines/comic is under GNU Library General Public License v2 +dataengines/twitter is under GNU Library General Public License v2 or later. + +runners/browserhistory: gplv2 or later +Runners/contacts: lgplv2 or later +Runners/converter: gplv2 or later +runners/katesessions: lgplv2 or later +runners/konsolesessions: lpglv2 or later +runners/konquerorsessinos: lgplv2 or later +runners/spellchecker: mix of lgplv2 or later and gplv2 or later => gpl v2 or later. + +GPLv2: + + 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 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, write to the + Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . + + +LGPLv2: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser/Library General Public License version 2, + or (at your option) any later version, as published by the Free + Software Foundation + + 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 Lesser/Library General Public License for more details + + You should have received a copy of the GNU Lesser/Library General Public + License along with this program; 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 version 2 can be found in `/usr/share/common-licenses/GPL-2 + +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'. + +The Debian packaging is (C) 2007-2008, Debian Qt/KDE Maintainers and +is licensed under the GPL, see above. --- kdeplasma-addons-4.3.2.orig/debian/plasma-widgets-addons.install +++ kdeplasma-addons-4.3.2/debian/plasma-widgets-addons.install @@ -0,0 +1,123 @@ +usr/lib/kde4/plasma_applet_bball.so +usr/lib/kde4/plasma_applet_binaryclock.so +usr/lib/kde4/plasma_applet_bubblemon.so +usr/lib/kde4/plasma_applet_calculator.so +usr/lib/kde4/plasma_applet_charselect.so +usr/lib/kde4/plasma_applet_comic.so +usr/lib/kde4/plasma_applet_dict.so +usr/lib/kde4/plasma_applet_eyes.so +usr/lib/kde4/plasma_applet_fifteenPuzzle.so +usr/lib/kde4/plasma_applet_fileWatcher.so +usr/lib/kde4/plasma_applet_frame.so +usr/lib/kde4/plasma_applet_fuzzy_clock.so +usr/lib/kde4/plasma_applet_incomingmsg.so +usr/lib/kde4/plasma_applet_kolourpicker.so +usr/lib/kde4/plasma_applet_konqprofiles.so +usr/lib/kde4/plasma_applet_konsoleprofiles.so +usr/lib/kde4/plasma_applet_leavenote.so +usr/lib/kde4/plasma_applet_life.so +usr/lib/kde4/plasma_applet_luna.so +usr/lib/kde4/plasma_applet_magnifique.so +usr/lib/kde4/plasma_applet_mediaplayer.so +usr/lib/kde4/plasma_applet_microblog.so +usr/lib/kde4/plasma_applet_news.so +usr/lib/kde4/plasma_applet_notes.so +usr/lib/kde4/plasma_applet_nowplaying.so +usr/lib/kde4/plasma_applet_opendesktop.so +usr/lib/kde4/plasma_applet_paste.so +usr/lib/kde4/plasma_applet_pastebin.so +usr/lib/kde4/plasma_applet_previewer.so +usr/lib/kde4/plasma_applet_rssnow.so +usr/lib/kde4/plasma_applet_rtm.so +usr/lib/kde4/plasma_applet_showdashboard.so +usr/lib/kde4/plasma_applet_showdesktop.so +usr/lib/kde4/plasma-applet_systemloadviewer.so +usr/lib/kde4/plasma_applet_timer.so +usr/lib/kde4/plasma_applet_unitconverter.so +usr/lib/kde4/plasma_applet_weatherstation.so +usr/lib/kde4/plasma_applet_weather.so +usr/share/icons/hicolor/128x128/apps/previewer.png +usr/share/icons/hicolor/16x16/apps/previewer.png +usr/share/icons/hicolor/22x22/apps/previewer.png +usr/share/icons/hicolor/32x32/apps/previewer.png +usr/share/icons/hicolor/48x48/apps/previewer.png +usr/share/icons/hicolor/64x64/apps/previewer.png +usr/share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz +usr/share/kde4/apps/bball/bball.svgz +usr/share/kde4/apps/bball/bounce.ogg +usr/share/kde4/apps/bball/football.svgz +usr/share/kde4/apps/desktoptheme/default/bubblemon/bubble.svg +usr/share/kde4/apps/desktoptheme/default/fifteenPuzzle/greensquare.svgz +usr/share/kde4/apps/desktoptheme/default/rssnow/background.svgz +usr/share/kde4/apps/desktoptheme/default/rssnow/left.svgz +usr/share/kde4/apps/desktoptheme/default/rssnow/right.svgz +usr/share/kde4/apps/desktoptheme/default/rssnow/rssnow.svgz +usr/share/kde4/apps/desktoptheme/default/stylesheets/news.css +usr/share/kde4/apps/desktoptheme/default/weather/wind-arrows.svgz +usr/share/kde4/apps/desktoptheme/default/weatherstation/lcd.svgz +usr/share/kde4/apps/desktoptheme/default/weatherstation/lcd_panel.svgz +usr/share/kde4/apps/desktoptheme/default/widgets/eyes.svg +usr/share/kde4/apps/desktoptheme/default/widgets/luna.svgz +usr/share/kde4/apps/desktoptheme/default/widgets/notes.svgz +usr/share/kde4/apps/desktoptheme/default/widgets/previewer-16.svgz +usr/share/kde4/apps/desktoptheme/default/widgets/previewer-22.svgz +usr/share/kde4/apps/desktoptheme/default/widgets/timer.svgz +usr/share/kde4/apps/desktoptheme/default/widgets/microblog.svgz +usr/share/kde4/apps/plasma_pastebin/plasma_pastebin.notifyrc +usr/share/kde4/apps/plasma-applet-frame/picture-frame-default.jpg +usr/share/kde4/apps/plasma-applet-opendesktop/user.css +usr/share/kde4/apps/plasma/services/rtmauth.operations +usr/share/kde4/apps/plasma/services/rtmtask.operations +usr/share/kde4/apps/plasma/services/rtmtasks.operations +usr/share/kde4/apps/rssnow/feeds +usr/share/kde4/config/comic.knsrc +usr/share/kde4/services/ServiceMenus/preview.desktop +usr/share/kde4/services/apodprovider.desktop +usr/share/kde4/services/epodprovider.desktop +usr/share/kde4/services/flickrprovider.desktop +usr/share/kde4/services/oseiprovider.desktop +usr/share/kde4/services/plasma-applet-bball.desktop +usr/share/kde4/services/plasma-applet-binaryclock.desktop +usr/share/kde4/services/plasma-applet-bubblemon.desktop +usr/share/kde4/services/plasma-applet-calculator.desktop +usr/share/kde4/services/plasma-applet-charselect.desktop +usr/share/kde4/services/plasma-applet-eyes.desktop +usr/share/kde4/services/plasma-applet-fifteenPuzzle.desktop +usr/share/kde4/services/plasma-applet-incomingmsg.desktop +usr/share/kde4/services/plasma-applet-konqprofiles.desktop +usr/share/kde4/services/plasma-applet-konsoleprofiles.desktop +usr/share/kde4/services/plasma-applet-leavenote.desktop +usr/share/kde4/services/plasma-applet-life.desktop +usr/share/kde4/services/plasma-applet-luna.desktop +usr/share/kde4/services/plasma-applet-magnifique.desktop +usr/share/kde4/services/plasma-applet-mediaplayer.desktop +usr/share/kde4/services/plasma-applet-microblog.desktop +usr/share/kde4/services/plasma-applet-news.desktop +usr/share/kde4/services/plasma-applet-nowplaying.desktop +usr/share/kde4/services/plasma-applet-opendesktop.desktop +usr/share/kde4/services/plasma-applet-paste.desktop +usr/share/kde4/services/plasma-applet-pastebin.desktop +usr/share/kde4/services/plasma-applet-previewer.desktop +usr/share/kde4/services/plasma-applet-rememberthemilk.desktop +usr/share/kde4/services/plasma-applet-rssnow.desktop +usr/share/kde4/services/plasma-applet-showdashboard.desktop +usr/share/kde4/services/plasma-applet-showdesktop.desktop +usr/share/kde4/services/plasma-applet-systemloadviewer.desktop +usr/share/kde4/services/plasma-applet-timer.desktop +usr/share/kde4/services/plasma-applet-unitconverter.desktop +usr/share/kde4/services/plasma-applet-weather.desktop +usr/share/kde4/services/plasma-applet-weatherstation.desktop +usr/share/kde4/services/plasma-clock-fuzzy.desktop +usr/share/kde4/services/plasma-comic-default.desktop +usr/share/kde4/services/plasma-dict-default.desktop +usr/share/kde4/services/plasma-fileWatcher-default.desktop +usr/share/kde4/services/plasma-frame-default.desktop +usr/share/kde4/services/plasma-kolourpicker-default.desktop +usr/share/kde4/services/plasma-notes-default.desktop +usr/share/icons/hicolor/128x128/apps/bball.png +usr/share/icons/hicolor/16x16/apps/bball.png +usr/share/icons/hicolor/32x32/apps/bball.png +usr/share/icons/hicolor/48x48/apps/bball.png +usr/share/icons/hicolor/64x64/apps/bball.png +usr/share/icons/hicolor/scalable/apps/bball.svgz +usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz --- kdeplasma-addons-4.3.2.orig/debian/control +++ kdeplasma-addons-4.3.2/debian/control @@ -0,0 +1,160 @@ +Source: kdeplasma-addons +Section: utils +Priority: optional +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Uploaders: Ana Beatriz Guerrero Lopez , Sune Vuorela , Fathi Boudra , + Armin Berres , Modestas Vainius +Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2), + kdelibs5-dev (>= 4:4.3.2), kdepimlibs5-dev (>= 4:4.3.2), libqt4-opengl-dev, + kdebase-workspace-dev (>= 4:4.3.2), libboost1.38-dev, libkexiv2-7-dev, python, + libqimageblitz-dev, libeigen2-dev, libmarble-dev, libxrender-dev +Standards-Version: 3.8.0 +Homepage: http://plasma.kde.org/ +Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu +Vcs-Bzr: https://code.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu + +Package: kdeplasma-addons +Architecture: all +Section: kde +Depends: plasma-widgets-addons (>= ${source:Version}), + plasma-runners-addons (>= ${source:Version}), + plasma-widget-lancelot (>= ${source:Version}), + plasma-wallpapers-addons (>= ${source:Version}) +Description: addons for KDE 4 Plasma - metapackage + The KDE Plasma addons module is a collection of additional Plasma + data engines, widgets and krunner plugins. It is part of + the official KDE 4 distribution. + . + This package is a metapackage that installs all the widgets, data + engines and krunner plugins from the KDE Plasma addons module. + +Package: plasma-widgets-addons +Architecture: any +Section: kde +Depends: ${shlibs:Depends}, plasma-dataengines-workspace, + plasma-dataengines-addons (= ${binary:Version}), +Recommends: plasma-widget-lancelot +Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applets-addons, + plasma-widget-weather +Conflicts: kdeplasma-addons-data, plasma-applets-addons +Description: addons for KDE 4 Plasma - widgets + This package contains additional Plasma widgets shipped in the KDE 4 plasma + addons module. Install it if you want a variety of widgets on your plasma + desktop. + . + This package is part of the KDE 4 plasma addons module. + +Package: plasma-dataengines-addons +Architecture: any +Section: kde +Depends: ${shlibs:Depends} +Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, kdeplasma-addons-libs4 +Conflicts: kdeplasma-addons-data, kdeplasma-addons-libs4 +Description: addons for KDE 4 Plasma - data engines + This package contains additional Plasma data engines shipped in KDE 4 plasma + addons module. These engines are needed by some KDE 4 plasma addons + Plasma widgets, but they may be useful for any other Plasma widget too. + . + This package is part of the KDE 4 Plasma addons module. + +Package: plasma-dataengines-addons-dev +Architecture: any +Section: kde +Depends: plasma-dataengines-addons (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:plasma-dataengines-addons} +Description: addons for KDE 4 Plasma - data engine development headers + This package contains the development headers that are needed to compile + plasma widgets that use the extra libraries provides by plasma-addons. It is + part of the KDE 4 plasma addons module. + +Package: plasma-runners-addons +Architecture: any +Section: kde +Depends: ${shlibs:Depends} +Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, kdeplasma-addons-libs4 +Conflicts: kdeplasma-addons-data, kdeplasma-addons-libs4 +Description: addons for KDE 4 Plasma - krunner plugins + This package contains additional plasma runners that are used in krunner + (the "run command" dialog of KDE 4) to reveal special search results. + If you use krunner a lot, you will probably like this package. + . + This package is part of the KDE 4 Plasma addons module. + +Package: plasma-wallpapers-addons +Architecture: any +Section: kde +Depends: ${shlibs:Depends}, plasma-dataengines-workspace, + plasma-dataengines-addons (= ${binary:Version}), kdewallpapers, + kdebase-workspace-wallpapers +Conflicts: kdeplasma-addons-data, plasma-applets-addons +Description: addons for KDE 4 Plasma - wallpapers + This package contains additional Plasma wallpapers shipped in the KDE 4 + plasma addons module. Install it if you want a variety of wallpapers on your + plasma desktop. + . + This package is part of the KDE 4 plasma addons module. + +Package: plasma-widget-lancelot +Architecture: any +Section: kde +Depends: ${shlibs:Depends} +Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applet-lancelot +Conflicts: kdeplasma-addons-data, plasma-applet-lancelot +Description: addons for KDE 4 Plasma - lancelot widget + Lancelot is an application launcher menu (or ALI) for KDE 4 designed to + provide a place from which all your jobs begin. It provides quick access + to applications, places, documents, contacts and system information. + . + This package is part of the KDE 4 plasma addons module. + +Package: liblancelot0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: kdeplasma-addons-libs4 +Conflicts: kdeplasma-addons-libs4 +Description: library that contains all UI widgets and layouts used in the Lancelot project + Liblancelot is a base framework for everything in the world of Lancelot. + It is built on top of Plasma. It provides a set of custom widgets, layouts + and has a few more advanced concepts for allowing for quicker development + of Plasma-based applications. + . + Lancelot is an application launcher menu (or ALI) for KDE 4 designed to + provide a place from which all your jobs begin. It provides quick access + to applications, places, documents, contacts and system information. + . + This package is part of the KDE 4 plasma addons module. + +Package: liblancelot-dev +Architecture: any +Section: libdevel +Replaces: kdeplasma-addons-dev +Conflicts: kdeplasma-addons-dev +Depends: liblancelot0 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:liblancelot0} +Description: development headers for liblancelot + Liblancelot is a base framework for everything in the world of Lancelot. + It is built on top of Plasma. It provides a set of custom widgets, layouts + and has a few more advanced concepts for allowing for quicker development + of Plasma-based applications. + . + Lancelot is an application launcher menu (or ALI) for KDE 4 designed to + provide a place from which all your jobs begin. It provides quick access + to applications, places, documents, contacts and system information. + . + This package contains the development headers that are needed to compile + plasma widgets that use the lancelot library. It is part of the KDE 4 + plasma addons module. + +Package: kdeplasma-addons-dbg +Section: libdevel +Architecture: any +Priority: extra +Conflicts: kdeplasmoids-dbg +Replaces: kdeplasmoids-dbg +Depends: plasma-widgets-addons (= ${binary:Version}), plasma-dataengines-addons (= ${binary:Version}), + plasma-runners-addons (= ${binary:Version}), plasma-widget-lancelot (= ${binary:Version}), + liblancelot0 (= ${binary:Version}), kdebase-workspace-dbg +Description: debugging symbols for kdeplasma-addons + This package contains the debugging symbols associated with kdeplasma-addons. + They will automatically be used by gdb for debugging kdeplasma-addons related + issues. --- kdeplasma-addons-4.3.2.orig/debian/plasma-widget-lancelot.install +++ kdeplasma-addons-4.3.2/debian/plasma-widget-lancelot.install @@ -0,0 +1,132 @@ +usr/bin/lancelot +usr/lib/kde4/plasma_applet_lancelot_launcher.so +usr/lib/kde4/plasma_applet_lancelot_part.so +usr/share/dbus-1/services/org.kde.lancelot.service +usr/share/icons/hicolor/128x128/apps/lancelot-part.png +usr/share/icons/hicolor/128x128/apps/lancelot.png +usr/share/icons/hicolor/16x16/apps/lancelot-part.png +usr/share/icons/hicolor/16x16/apps/lancelot.png +usr/share/icons/hicolor/22x22/apps/lancelot-part.png +usr/share/icons/hicolor/22x22/apps/lancelot.png +usr/share/icons/hicolor/32x32/apps/lancelot-part.png +usr/share/icons/hicolor/32x32/apps/lancelot.png +usr/share/icons/hicolor/48x48/apps/lancelot-part.png +usr/share/icons/hicolor/48x48/apps/lancelot.png +usr/share/icons/hicolor/64x64/apps/lancelot-part.png +usr/share/icons/hicolor/64x64/apps/lancelot.png +usr/share/kde4/apps/desktoptheme/Aya/lancelot/action-list-view-categories-applet.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/action-list-view-categories-extender.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/action-list-view-categories.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/action-list-view-headers-plasma-applet.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/action-list-view-headers.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/action-list-view-items-extender.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/action-list-view-items.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/inner-background.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/passageway-view-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/passageway-view-buttons.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/passageway-view-inactivebuttons.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/passageway-view-spacer.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/theme.config +usr/share/kde4/apps/desktoptheme/Aya/lancelot/section-buttons.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/system-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/system-buttons.svgz +usr/share/kde4/apps/desktoptheme/Aya/lancelot/theme.config +usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-categories-extender.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-categories.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-headers.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-items-extender.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-items.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/extender-button-icon.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/inner-background.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/main-background.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-buttons.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-inactivebuttons.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-spacer.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/section-buttons.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/system-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/system-buttons.svgz +usr/share/kde4/apps/desktoptheme/default/lancelot/theme.config +usr/share/kde4/apps/desktoptheme/Elegance/lancelot/inner-background.svgz +usr/share/kde4/apps/desktoptheme/Elegance/lancelot/theme.config +usr/share/kde4/apps/desktoptheme/Elegance/lancelot/system-buttons.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/system-buttons.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/theme.config +usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-categories-applet.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-categories-extender.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-categories.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-headers-plasma-applet.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-headers.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-items-extender.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/action-list-view-items.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/extender-button-icon.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/inner-background.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/lancelot-context-extender.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/lancelot-context.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/passageway-view-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/passageway-view-buttons.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/passageway-view-inactivebuttons.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/passageway-view-spacer.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/section-buttons.svgz +usr/share/kde4/apps/desktoptheme/heron/lancelot/system-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/action-list-view-categories-applet.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/action-list-view-categories-extender.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/action-list-view-categories.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/action-list-view-headers-plasma-applet.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/action-list-view-headers.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/action-list-view-items-extender.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/action-list-view-items.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/extender-button-icon.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/inner-background.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/lancelot-context-extender.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/lancelot-context.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/passageway-view-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/passageway-view-buttons.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/passageway-view-inactivebuttons.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/passageway-view-spacer.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/section-buttons.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/system-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/system-buttons.svgz +usr/share/kde4/apps/desktoptheme/oxygen/lancelot/theme.config +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/section-buttons.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/system-buttons.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/theme.config +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/action-list-view-categories-applet.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/action-list-view-categories-extender.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/action-list-view-categories.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/action-list-view-headers-plasma-applet.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/action-list-view-headers.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/action-list-view-items-extender.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/action-list-view-items.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/extender-button-icon.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/inner-background.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/lancelot-context-extender.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/lancelot-context.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/passageway-view-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/passageway-view-buttons.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/passageway-view-inactivebuttons.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/passageway-view-spacer.svgz +usr/share/kde4/apps/desktoptheme/Silicon/lancelot/system-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/theme.config +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/action-list-view-categories-applet.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/action-list-view-categories-extender.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/action-list-view-categories.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/action-list-view-headers-plasma-applet.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/action-list-view-headers.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/action-list-view-items-extender.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/action-list-view-items.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/extender-button-icon.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/inner-background.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/lancelot-context-extender.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/lancelot-context.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/passageway-view-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/passageway-view-buttons.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/passageway-view-inactivebuttons.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/passageway-view-spacer.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/section-buttons.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/system-buttons-extender.svgz +usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/system-buttons.svgz +usr/share/kde4/apps/lancelot/lancelot.notifyrc +usr/share/kde4/services/plasma-applet-lancelot-launcher.desktop +usr/share/kde4/services/plasma-applet-lancelot-part.desktop +usr/share/mime/packages/lancelotpart-mime.xml --- kdeplasma-addons-4.3.2.orig/debian/plasma-wallpapers-addons.install +++ kdeplasma-addons-4.3.2/debian/plasma-wallpapers-addons.install @@ -0,0 +1,27 @@ +usr/lib/kde4/plasma_wallpaper_mandelbrot.so +usr/lib/kde4/plasma_wallpaper_marble.so +usr/lib/kde4/plasma_wallpaper_pattern.so +usr/lib/kde4/plasma_wallpaper_virus.so +usr/lib/kde4/plasma_wallpaper_weather.so +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/fish.desktop +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/fish.png +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/flowers.desktop +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/flowers.png +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/night-rock.desktop +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/night-rock.jpg +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/pavement.desktop +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/pavement.png +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/rattan.desktop +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/rattan.png +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/stonewall2.desktop +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/stonewall2.png +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/triangles.desktop +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/triangles.png +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/xeroxstar.desktop +usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/xeroxstar.png +usr/share/kde4/config/virus_wallpaper.knsrc +usr/share/kde4/services/plasma-wallpaper-mandelbrot.desktop +usr/share/kde4/services/plasma-wallpaper-marble.desktop +usr/share/kde4/services/plasma-wallpaper-pattern.desktop +usr/share/kde4/services/plasma-wallpaper-virus.desktop +usr/share/kde4/services/plasma-wallpaper-weather.desktop --- kdeplasma-addons-4.3.2.orig/debian/compat +++ kdeplasma-addons-4.3.2/debian/compat @@ -0,0 +1 @@ +7 --- kdeplasma-addons-4.3.2.orig/debian/installgen +++ kdeplasma-addons-4.3.2/debian/installgen @@ -0,0 +1,21 @@ +[liblancelot-dev] +from:/applets/lancelot/ dst:usr/include/lancelot +from:/applets/lancelot/ dst:usr/lib/liblancelot.so$ link: + +[useless-dev_virtual] +miss dst:usr/lib/lib[^/]+.so$ link: + +[liblancelot0] +from:/applets/lancelot/ dst:usr/lib/liblancelot.so.0($|\.) + +[plasma-widget-lancelot] +from:/applets/lancelot/ + +[plasma-widgets-addons] +from:/applets/ + +[plasma-dataengines-addons] +from:/dataengines/ + +[plasma-runners-addons] +from:/runners/ --- kdeplasma-addons-4.3.2.orig/debian/README.source +++ kdeplasma-addons-4.3.2/debian/README.source @@ -0,0 +1,6 @@ +This package uses quilt for upstream source code patch management. Please read +/usr/share/doc/quilt/README.source for more information how to apply, unapply, +add, modify or remove patches. + +Please note that /usr/share/doc/quilt/README.source is only available in quilt +version 0.46-4.1 or later. --- kdeplasma-addons-4.3.2.orig/debian/rules +++ kdeplasma-addons-4.3.2/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk + +DEB_DH_MAKESHLIBS_ARGS_liblancelot0 := -V + +clean:: + find applets/lancelot/tools/puck -name *.pyc -delete --- kdeplasma-addons-4.3.2.orig/debian/changelog +++ kdeplasma-addons-4.3.2/debian/changelog @@ -0,0 +1,658 @@ +kdeplasma-addons (4:4.3.2-0ubuntu3) karmic; urgency=low + + * Update kubuntu_02_microblog_default_configuration.diff, fix + setting of when applet needs configuration and fix downloading of + authenticated accounts timelines. Closes LP: #414572 (also + https://bugs.kde.org/200475) + + -- Jonathan Riddell Mon, 12 Oct 2009 14:05:24 +0100 + +kdeplasma-addons (4:4.3.2-0ubuntu2) karmic; urgency=low + + * Adding kubuntu_05_rememberthemilk_auth_fix.diff to fix the authorization + issue due to previous version incorrectly utilizing the RTM API. + + -- Richard A. Johnson Sat, 10 Oct 2009 20:42:38 -0500 + +kdeplasma-addons (4:4.3.2-0ubuntu1) karmic; urgency=low + + * New upstream release + - Bump build deps + - Remove build dependency on libxcomposite-dev and libxdamage-dev + as they are no longer needed for building lancelot compositing + support + - Remove kubuntu_01_fix_armel_build.diff, fixed by upstream + - Update plasma-widget-addons.install + + -- Alessandro Ghersi Sat, 03 Oct 2009 18:52:18 +0200 + +kdeplasma-addons (4:4.3.1-0ubuntu3) karmic; urgency=low + + * Add wallpapers/mandelbrot/mandelbrot.cpp armel fixes to + kubuntu_01_fix_armel_build.diff + + -- Scott Kitterman Mon, 07 Sep 2009 12:29:57 -0400 + +kdeplasma-addons (4:4.3.1-0ubuntu2) karmic; urgency=low + + * Add another fix to kubuntu_01_fix_armel_build.diff + + -- Scott Kitterman Wed, 02 Sep 2009 23:47:42 -0400 + +kdeplasma-addons (4:4.3.1-0ubuntu1) karmic; urgency=low + + [ Christian Mangold ] + * New upstream release + * Bump version of KDE build-deps to 4.3.1 + + [Alessandro Ghersi] + * Add libxcomposite-dev, libxrender-dev and libxdamage-dev to build-deps + to build compositing support for Lancelot. (LP: #408235) + (Thanks to Khashayar Naderehvandi) + + [ Harald Sitter ] + * Fix armel build using kubuntu_01_fix_armel_build.diff + + -- Harald Sitter Sun, 30 Aug 2009 20:11:55 +0200 + +kdeplasma-addons (4:4.3.0-0ubuntu4) karmic; urgency=low + + * Add kubuntu_04_netbook_runners.diff from + plasma-netbook runners-patches/kdeplasma-addons_runners.diff + + -- Jonathan Riddell Wed, 19 Aug 2009 15:05:53 +0100 + +kdeplasma-addons (4:4.3.0-0ubuntu3) karmic; urgency=low + + * Disable kubuntu_03_opendestop_setup.diff, it causes it to crash + + -- Jonathan Riddell Thu, 06 Aug 2009 17:16:28 +0100 + +kdeplasma-addons (4:4.3.0-0ubuntu2) karmic; urgency=low + + * Remove kubuntu_03_microblog_allow_updating_status.diff, fixed upstream + * Add kubuntu_03_opendestop_setup.diff, make applet smaller and force minimum + size to stop is shrinking on startup + + -- Jonathan Riddell Wed, 05 Aug 2009 14:38:06 +0100 + +kdeplasma-addons (4:4.3.0-0ubuntu1) karmic; urgency=low + + * New upstream release + - Bump build-depends + - Add kubuntu_03_microblog_allow_updating_status.diff, to allow updating + of status via microblog plasmoid + + -- Alessandro Ghersi Thu, 30 Jul 2009 14:00:30 +0200 + +kdeplasma-addons (4:4.2.98-0ubuntu2) karmic; urgency=low + + * Rebuild with new pkg-kde-tools to build translation templates + + -- Jonathan Riddell Wed, 29 Jul 2009 18:12:02 +0100 + +kdeplasma-addons (4:4.2.98-0ubuntu1) karmic; urgency=low + + * New upstream release. + * Bump on Build-Deps + * Fixes in plasma-widgets-addons.install + + -- Michał Zając Thu, 23 Jul 2009 01:59:29 +0200 + +kdeplasma-addons (4:4.2.96-0ubuntu1) karmic; urgency=low + + * New upstream release + - Bump build-depend versions + - Update plasma-widget-lancelot.installed + - Update kubuntu_02_microblog_default_configuration.diff + - Remove kubuntu_01_qt_phonon.diff no longer need + + -- Alessandro Ghersi Fri, 10 Jul 2009 13:55:16 +0200 + +kdeplasma-addons (4:4.2.95-0ubuntu1) karmic; urgency=low + + * New upstream release + - Bump build-depend versions + - Update plasma-widget-addons.install + + -- Alessandro Ghersi Sat, 27 Jun 2009 19:11:06 +0200 + +kdeplasma-addons (4:4.2.90-0ubuntu3) karmic; urgency=low + + * bzr add patch before upload + + -- Jonathan Riddell Fri, 19 Jun 2009 20:19:30 +0100 + +kdeplasma-addons (4:4.2.90-0ubuntu2) karmic; urgency=low + + * Add kubuntu_02_microblog_default_configuration.diff, make + microblog applet show kubuntu feed by default + + -- Jonathan Riddell Fri, 19 Jun 2009 18:24:04 +0100 + +kdeplasma-addons (4:4.2.90-0ubuntu1) karmic; urgency=low + + * New upstream release: + - Bump build-depend versions + - Update various .install files + * Build-depend on libeigen2-dev to build the mandlebrot wallpaper + * Build-depend on libmarble-dev to build the marble wallpaper + * widgets -> wallpapers in plasma-widget-wallpapers short description + (LP: #377707) + + -- Jonathan Thomas Fri, 05 Jun 2009 11:57:58 -0400 + +kdeplasma-addons (4:4.2.85-0ubuntu2) karmic; urgency=low + + * Add a build-dep on libqimageblitz-dev to prevent FTBFS + + -- Jonathan Thomas Sat, 16 May 2009 21:37:38 -0400 + +kdeplasma-addons (4:4.2.85-0ubuntu1) karmic; urgency=low + + * New upstream beta release: + - Bump build-depends + - Add new plasma-wallpapers-addons package + - Add new plasma-dataengines-addons-dev package + - Remove 01_lancelot_qt4.5_support.diff, merged upstream + - Add kubuntu_01_qt_phonon.diff, for real + - Add conflicts of plasma-widget-weather to plasma-widgets-addons + + -- Jonathan Thomas Sat, 16 May 2009 16:18:34 -0400 + +kdeplasma-addons (4:4.2.2-1ubuntu2) karmic; urgency=low + + * Add kubuntu_01_qt_phonon.diff to make it compile with Qt's Phonon + + -- Jonathan Riddell Mon, 11 May 2009 22:37:02 +0000 + +kdeplasma-addons (4:4.2.2-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining changes: + - Keep Ubuntu-specific boost changes in debian/control + + -- Jonathan Thomas Fri, 08 May 2009 12:02:47 -0400 + +kdeplasma-addons (4:4.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Ana Beatriz Guerrero Lopez Wed, 01 Apr 2009 15:41:34 +0200 + +kdeplasma-addons (4:4.2.2-0ubuntu1) jaunty; urgency=low + + * New upstream release + * Bump KDE version in debian/control to 4.2.2 + + -- Steve Stalcup Sun, 29 Mar 2009 18:03:53 -0400 + +kdeplasma-addons (4:4.2.1-2) experimental; urgency=low + + +++ Changes by Fathi Boudra: + + * Add patch to fix lancelot when Qt 4.5 is used. + + -- Debian Qt/KDE Maintainers Sat, 14 Mar 2009 13:52:37 +0100 + +kdeplasma-addons (4:4.2.1-0ubuntu2) jaunty; urgency=low + + * Reupload since all built failed due to missing deps appart + from i386. + + -- Anthony Mercatante Thu, 05 Mar 2009 17:50:09 +0100 + +kdeplasma-addons (4:4.2.1-0ubuntu1) jaunty; urgency=low + + * New upstream release: + - Bump various build-depend versions for update + + -- Jonathan Thomas Fri, 27 Feb 2009 17:25:34 -0500 + +kdeplasma-addons (4:4.2.0-0ubuntu3) jaunty; urgency=low + + [ Michal Zajac ] + * Add kubuntu_01_lancelot_qt45.diff to fix Lancelot glitches with Qt 4.5. + + -- Jonathan Riddell Mon, 23 Feb 2009 10:50:09 +0000 + +kdeplasma-addons (4:4.2.0-0ubuntu2) jaunty; urgency=low + + * Rebuild for boost transition (LP: #297152) + * Changed build-dep in debian/control libboost-dev -> libboost1.35-dev + + -- Richard Birnie Sun, 01 Feb 2009 16:30:32 +0000 + +kdeplasma-addons (4:4.2.1-1) experimental; urgency=low + + * New upstream release. + + +++ Changes by Modestas Vainius: + + * Point Debian Vcs URLs to pkg-kde/trunk (new location). + * Rename plasma-applets-addons to plasma-widgets-addons, add appropriate + conflicts/replaces for the old packages. + * Rename plasma-applets-lancelot to plasma-widgets-lancelot, add appropriate + conflicts/replaces for the old package. + * Replace all references to plasma "applet" with "widget". + * Bump KDE build depends to 4.2.1. + + -- Debian Qt/KDE Maintainers Fri, 27 Feb 2009 23:49:30 +0200 + +kdeplasma-addons (4:4.2.0-0ubuntu1) jaunty; urgency=low + + * New upstream release + - remove kubuntu_01_qreal_portability_fixes.diff, resolved upstream + - bump version build-deps in debian/control + - add build-dep on quilt + + -- Steve Stalcup Sat, 24 Jan 2009 20:32:42 -0500 + +kdeplasma-addons (4:4.2.0-1) experimental; urgency=low + + * New upstream release. + * Includes lancelot (Closes: #499222). + + +++ Changes by Modestas Vainius: + + * Drop explicit build depend on cmake. + * Build depend on kdelibs5-dev and kdepimlibs5-dev + explicitly (4.2.0). Bump kdebase-workspace-dev dependency to + 4:4.2.0. + * Build depend on libkexiv2-6-dev and python (the latter is needed by + lancelot at build time). + * Add debian/installgen and update install files. + * Bump Standards-Version to 3.8.0: add README.source. + * Drop 97_fix_target_link_libraries.diff, no longer needed. + * Update install files. + * Add a clean rule to *.pyc from applets/lancelot/tools/puck. + * Bump liblancelot0 shlibs on each new upstream release. + * Do not build depend on libplasma-dev. Plasma headers are in kdelibs5-dev + for now. + * Bump debian/compat and debhelper build dependency to v7 (to get more + sophisticated debian/tmp handling). + * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools: + - build depend on pkg-kde-tools 0.4; + - remove debian/cdbs directory; + - replace debian/cdbs/kde.mk with + /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules. + + ++ Changes by George Kiagiadakis: + + * Add new packages: + - plasma-applets-addons - contains the plasma applets. + - plasma-dataengines-addons - contains the plasma dataengines. + - plasma-runners-addons - contains the plasma runners. + - plasma-applet-lancelot - contains the lancelot applet. + - liblancelot0 - contains the lancelot shared library. + * Make kdeplasma-addons be a metapackage that installs all of the above. + * Rename kdeplasma-addons-dev to liblancelot-dev. + * Remove the kdeplasma-addons-libs4 and kdeplasma-addons-data packages. + * Drop explicit build dependency on libglu1-mesa-dev. + + +++ Changes by Sune Vuorela: + + * Update copyright file. + + -- Debian Qt/KDE Maintainers Sat, 24 Jan 2009 03:39:52 +0200 + +kdeplasma-addons (4:4.1.96-0ubuntu2) jaunty; urgency=low + + * Rebuild against new libplasma-dev + + -- Steve Stalcup Thu, 15 Jan 2009 02:04:38 -0500 + +kdeplasma-addons (4:4.1.96-0ubuntu1) jaunty; urgency=low + + * New upstream release: + - Drop kubuntu_01_qreal_portability_fixes.diff, applied upstream + - Bump build-depend versions of various kde libs to (>= 4:4.1.96) + - Remove plasma themes from packaging, they live in kdeartwork now, + themes for kdeplasma-addons plasmoids stay + - Update various debian/.install files for new marble plasmoid + + -- Jonathan Thomas Fri, 09 Jan 2009 12:47:32 -0500 + +kdeplasma-addons (4:4.1.85-0ubuntu3) jaunty; urgency=low + + [ Harald Sitter ] + * Change Vcs-Browser to Launchpad and replace Vcs-Svn with Vcs-Bzr + + [ Michael Casadevall ] + * debian/patches/kubuntu_01_qreal_portability_fixes.diff + - Upcasts qreal in templated functions to fix ARM FTBFSes + + -- Michael Casadevall Thu, 01 Jan 2009 00:30:12 -0500 + +kdeplasma-addons (4:4.1.85-0ubuntu2) jaunty; urgency=low + + * Drop no longer needed transitional packages + - kdeplasmoids + - kdeplasmoids-data + - kdeplasmoids-dbg + * Add kdeplasma-addons replaces kdeplasmoids and not just conflicts + + -- Scott Kitterman Wed, 17 Dec 2008 13:38:10 -0500 + +kdeplasma-addons (4:4.1.85-0ubuntu1) jaunty; urgency=low + + * New upstream release + - Bump build-deps versions + - Add libxcomposite-dev to build-deps for updated lancelot requirements + - Add kdepimlibs5-dev to build-deps + - Updated debian/*.install files + + -- Steve Stalcup Tue, 16 Dec 2008 22:48:27 -0500 + +kdeplasma-addons (4:4.1.80-0ubuntu1) jaunty; urgency=low + + * New upstream beta release: + - Bump build-depends versions + - Add conflicts on plasmoid-lancelot and plasmoid-previewer to + kdeplasma-addons, + - Add python build-dep due to Lancelot's puck tool + - Add the execution puck's clean.sh script to debian/rule's make clean + target + - Add kdebase-workspace-data as a build-dep since Lancelot needs + /usr/share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml + - Update various debian/*.install files + - Remove kdeplasma-addons-libs4 and -dev packaging, libplasmaapletdialog + has moved to kdebase-workspace + - Change build-depend on libkexiv2-dev => libkexiv2-7-dev + + -- Jonathan Thomas Wed, 26 Nov 2008 20:14:49 -0500 + +kdeplasma-addons (4:4.1.2-1ubuntu2) jaunty; urgency=low + + * No change rebuild for new dh_sameversiondeps + + -- Jonathan Riddell Thu, 13 Nov 2008 16:34:21 +0000 + +kdeplasma-addons (4:4.1.3-1) experimental; urgency=low + + * New upstream release + - bump b-d. + + -- Sune Vuorela Sat, 01 Nov 2008 16:43:04 +0100 + +kdeplasma-addons (4:4.1.2-1ubuntu1) jaunty; urgency=low + + * Merge with Debian, remaining changes: + - Use our custom kde4.mk rather than built-in cdbs + - Keep our replaces/conflicts on old extragear-plasma/kdeplasma-addons packages + * Add changes to KUBUNTU-DEBIAN-DIFFERENCES + + -- Jonathan Thomas Fri, 07 Nov 2008 12:19:46 -0500 + +kdeplasma-addons (4:4.1.2-1) experimental; urgency=low + + * New upstream release. + * Update patch 97_fix_target_link_libraries.diff. + + -- Ana Beatriz Guerrero Lopez Tue, 30 Sep 2008 20:59:22 +0200 + +kdeplasma-addons (4:4.1.2-0ubuntu1) intrepid; urgency=low + + * New upstream release + + -- Jonathan Thomas Fri, 26 Sep 2008 09:26:38 -0400 + +kdeplasma-addons (4:4.1.1-0ubuntu2) intrepid; urgency=low + + * Rebuild against kdelibs 4:4.1.1+really4.1.1 + + -- Jonathan Thomas (The man) Mon, 01 Sep 2008 21:33:35 -0400 + +kdeplasma-addons (4:4.1.1-1) experimental; urgency=low + + * New upstreams release. + + +++ Changes by Sune Vuorela: + + * Change 97_ patch to fit with upstream changes and + debian specific pimlibs changes + + -- Debian Qt/KDE Maintainers Fri, 29 Aug 2008 08:46:37 +0200 + +kdeplasma-addons (4:4.1.1-0ubuntu1) intrepid; urgency=low + + * New upstream release. + + -- Jonathan Thomas (The man) Fri, 29 Aug 2008 08:11:18 -0400 + +kdeplasma-addons (4:4.1.0-0ubuntu3) intrepid; urgency=low + + * Fix typo in kdeplasma-addons-libs4' Conflicts: list. + + -- Martin Pitt Fri, 08 Aug 2008 16:24:09 +0200 + +kdeplasma-addons (4:4.1.0-0ubuntu2) intrepid; urgency=low + + * switch to kde4.mk from cdbs + + -- Jonathan Riddell Fri, 01 Aug 2008 15:29:42 +0000 + +kdeplasma-addons (4:4.1.0-1) experimental; urgency=low + + * New upstream release. + + +++ Changes by Modestas Vainius: + + * Adapt sameVersionDep substvars to new dh_sameversiondeps syntax. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Update installed files and build depend version. + + -- Debian Qt/KDE Maintainers Mon, 28 Jul 2008 03:12:14 +0200 + +kdeplasma-addons (4:4.1.0-0ubuntu1) intrepid; urgency=low + + * New upstream release + + -- Jonathan Thomas Thu, 24 Jul 2008 08:09:52 -0400 + +kdeplasma-addons (4:4.0.98-1) experimental; urgency=low + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Renaming package, again, to kdeplasma-addons. + * Update installed files. + * Add 97_fix_target_link_libraries to add missing references + to kio libs. + + +++ Changes by Sune Vuorela: + + * Update license file + + -- Debian Qt/KDE Maintainers Mon, 21 Jul 2008 00:01:13 +0200 + +kdeplasma-addons (4:4.0.98-0ubuntu1) intrepid; urgency=low + + * New upstream release candidate + * Bump Standards-Version to 3.8.0 + * Renamed source and binary packages to kdeplasma-addons + + Add replaces/conflicts for old packages + + -- Harald Sitter Sat, 12 Jul 2008 15:09:05 +0200 + +kdeplasmoids (4:4.0.84-1) experimental; urgency=low + + * New upstream snapshot. + + -- Sune Vuorela Sun, 29 Jun 2008 12:04:46 +0200 + +kdeplasmoids (4:4.0.83-0ubuntu1) intrepid; urgency=low + + * New upstream beta release + + -- Jonathan Riddell Mon, 23 Jun 2008 15:07:27 +0000 + +kdeplasmoids (4:4.0.82+svn820966-2) UNRELEASED; urgency=low + + +++ Changes by Modestas Vainius: + + * Fix typo in kdeplasmoids description. + + -- Debian Qt/KDE Maintainers Mon, 16 Jun 2008 16:29:31 +0300 + +kdeplasmoids (4:4.0.82+svn820966-1) experimental; urgency=low + + * New upstream development snapshot. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Rename package, it used to be extragear-plasma. + + +++ Changes by Modestas Vainius: + + * Add installgen files. + * Update install files. + * Add myself to Uploaders. + * Bump build depends to 4.0.82. + * Add Conflicts/Replaces with extragear-plasma-(data). + * Add new binary packages: + - kdeplasmoids-libs4 - public libraries. + - kdeplasmoids-dev - developments files for public libraries. + * Tweak descriptions. + + -- Debian Qt/KDE Maintainers Mon, 16 Jun 2008 13:39:58 +0200 + +extragear-plasma (4:4.0.80-1) experimental; urgency=low + + * New upstream snapshot. + * Add new needed build depends: libglu1-mesa-dev, libqt4-opengl-dev and + libboost-dev. + * Update installed files, shipping translations again. + + -- Ana Beatriz Guerrero Lopez Wed, 28 May 2008 01:17:45 +0200 + +extragear-plasma (4:4.0.72+svn802997-1) experimental; urgency=low + + * New snapshot. + * Some stuff disable because it is totally broken, still no translations. + + -- Ana Beatriz Guerrero Lopez Thu, 01 May 2008 16:29:42 +0200 + +extragear-plasma (4:4.0.68~svn794879-1) experimental; urgency=low + + * Build plasma against KDE 4.1 from trunk: + - Update build depends to kdebase-workspace-dev (>= 4:4.0.68). + * Translation no included in purpose, so extragear-plasma-l10n is empty. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Update installed files. + + +++ Changes by Matthew Rosewarne: + + * Move extragear-plasma packages to Section: kde. + * Move extragear-plasma-dbg to Section: libdevel. + + -- Debian Qt/KDE Maintainers Tue, 8 Apr 2008 21:41:57 +0200 + +extragear-plasma (4:4.0.1-1) experimental; urgency=low + + * New upstream release: + + lancelot and fifteenpuzzle applets have been removed. + + +++ Changes by Matthew Rosewarne: + + * Tweak descriptions. + * Tighten dependency versions. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Update installed files. + * Bump compat/debhelper to 6. + * Remove LDFLAGS+="-Wl,--as-needed". It was integrated into cdbs/kde.mk. + + +++ Changes by Fathi Boudra: + + * Add Vcs-Browser and Vcs-Svn fields. + + -- Debian Qt/KDE Maintainers Sat, 02 Feb 2008 06:45:02 +0100 + +extragear-plasma (4:4.0.0-1) experimental; urgency=low + + * New upstream release. + * Update extragear-plasma-l10n.install. + * Update years in copyright. + * Build depend on kdebase-workspace-dev >= 4:4.0.0-1. + + -- Ana Beatriz Guerrero Lopez Wed, 09 Jan 2008 13:30:33 +0100 + +extragear-plasma (4:3.98.0~svn756095-1) experimental; urgency=low + + * Svn snapshot of revision 756095. + * Update extragear-plasma-l10n.install. + + -- Ana Beatriz Guerrero Lopez Thu, 03 Jan 2008 07:49:11 +0100 + +extragear-plasma (4:3.98~svn754166-1) experimental; urgency=low + + * Svn snapshot of revision 754166. + * Update *.install files. + + -- Ana Beatriz Guerrero Lopez Sat, 29 Dec 2007 09:47:33 +0100 + +extragear-plasma (4:3.97.0-2) experimental; urgency=low + + * Update Standards-Version to 3.7.3. + * Remove extra LDFLAGS. Included via CDBS now. + + -- Armin Berres Mon, 17 Dec 2007 23:49:29 +0100 + +extragear-plasma (4:3.97.0-1) experimental; urgency=low + + * New upstream release. + * Build depend on kdebase-workspace-dev >= 4:3.97.0. + * Update installed files. + * Add new package extragear-plasma-l10n for localization files. + * Remove dependency on sharutils. Not needed anymore. + * Add export LDFLAGS+="-Wl,--as-needed" in rules to make dpkg-shlibdeps + happier. + + -- Armin Berres Fri, 07 Dec 2007 17:24:14 +0100 + +extragear-plasma (4:3.96.0-2) experimental; urgency=low + + * Update to r739712. + * Build depend on kdebase-workspace 4:3.96.0-2 + * Build depend on sharutils for uudecoding the new images. + + -- Armin Berres Wed, 21 Nov 2007 17:09:17 +0000 + +extragear-plasma (4:3.96.0-1) experimental; urgency=low + + * New upstream release. + * Update *.install files. + * Move Homepage into control field. + * Build depend on kdebase-workspace-dev >= 4:3.96.0. + + -- Ana Beatriz Guerrero Lopez Thu, 15 Nov 2007 18:46:33 +0100 + +extragear-plasma (3.95.2-1) experimental; urgency=low + + * New upstream release. + + +++ Changes by Fathi Boudra: + + * Update installed files. + + -- Debian Qt/KDE Maintainers Fri, 09 Nov 2007 19:38:54 +0100 + +extragear-plasma (3.95.0-1) experimental; urgency=low + + * New upstream release: KDE4 beta4. First upload to the Debian archive. + * Build depend on kdebase-workspace-dev >= 4:3.95.0. + * Readd picture frame applet which isn't anymore a part of kdebase-workspace + and add replaces kdebase-workspace-bin << 4:3.95.0. + * Update *.install files. + + -- Armin Berres Sat, 27 Oct 2007 18:45:56 +0200 + +extragear-plasma (3.94.0-1) experimental; urgency=low + + * Initial release. + + -- Armin Berres Wed, 24 Oct 2007 01:14:25 +0200 --- kdeplasma-addons-4.3.2.orig/debian/plasma-dataengines-addons.install +++ kdeplasma-addons-4.3.2/debian/plasma-dataengines-addons.install @@ -0,0 +1,36 @@ +usr/lib/kde4/plasma_comic_krossprovider.so +usr/lib/kde4/plasma_engine_comic.so +usr/lib/kde4/plasma_engine_microblog.so +usr/lib/kde4/plasma_engine_ocs.so +usr/lib/kde4/plasma_engine_potd.so +usr/lib/kde4/plasma_engine_rtm.so +usr/lib/kde4/plasma_packagestructure_comic.so +usr/lib/kde4/plasma_potd_apodprovider.so +usr/lib/kde4/plasma_potd_epodprovider.so +usr/lib/kde4/plasma_potd_flickrprovider.so +usr/lib/kde4/plasma_potd_oseiprovider.so +usr/lib/kde4/plasma_potd_wcpotdprovider.so +usr/lib/libconversion.so.4 +usr/lib/libconversion.so.4.3.0 +usr/lib/libocsclient.so +usr/lib/libocsclient.so.4 +usr/lib/libocsclient.so.4.3.0 +usr/lib/libplasmacomicprovidercore.so.1 +usr/lib/libplasmacomicprovidercore.so.1.0.0 +usr/lib/libplasmapotdprovidercore.so.1 +usr/lib/libplasmapotdprovidercore.so.1.0.0 +usr/lib/libplasmaweather.so.4 +usr/lib/libplasmaweather.so.4.3.0 +usr/lib/librtm.so +usr/lib/librtm.so.4 +usr/lib/librtm.so.4.3.0 +usr/share/kde4/apps/plasma/services/tweet.operations +usr/share/kde4/services/plasma-engine-rtm.desktop +usr/share/kde4/services/plasma-dataengine-comic.desktop +usr/share/kde4/services/plasma-dataengine-microblog.desktop +usr/share/kde4/services/plasma-dataengine-ocs.desktop +usr/share/kde4/services/plasma-dataengine-potd.desktop +usr/share/kde4/services/plasma-packagestructure-comic.desktop +usr/share/kde4/services/wcpotdprovider.desktop +usr/share/kde4/servicetypes/plasma_comicprovider.desktop +usr/share/kde4/servicetypes/plasma_potdprovider.desktop --- kdeplasma-addons-4.3.2.orig/debian/not-installed +++ kdeplasma-addons-4.3.2/debian/not-installed @@ -0,0 +1,6 @@ +#development symlink +./usr/lib/libconversion.so +./usr/lib/libplasmacomicprovidercore.so +./usr/lib/libplasmaconverter.so +./usr/lib/libplasmapotdprovidercore.so +./usr/lib/libplasmaweather.so --- kdeplasma-addons-4.3.2.orig/debian/plasma-dataengines-addons-dev.install +++ kdeplasma-addons-4.3.2/debian/plasma-dataengines-addons-dev.install @@ -0,0 +1,6 @@ +usr/include/conversion/converter.h +usr/include/conversion/plasmaconversion_export.h +usr/include/conversion/unitcategory.h +usr/include/conversion/unit.h +usr/include/conversion/value.h +usr/share/kde4/apps/cmake/modules/FindConversion.cmake --- kdeplasma-addons-4.3.2.orig/debian/patches/kubuntu_04_netbook_runners.diff +++ kdeplasma-addons-4.3.2/debian/patches/kubuntu_04_netbook_runners.diff @@ -0,0 +1,35 @@ +Index: contacts/contactsrunner.cpp +=================================================================== +--- kdeplasma-addons-4.3.0/runners/contacts/contactsrunner.cpp (revision 979287) ++++ kdeplasma-addons-4.3.0/runners/contacts/contactsrunner.cpp (working copy) +@@ -47,6 +47,7 @@ + setIgnoredTypes(Plasma::RunnerContext::Directory | Plasma::RunnerContext::File | + Plasma::RunnerContext::NetworkLocation); + addSyntax(Plasma::RunnerSyntax(":q:", i18n("Finds people in your address book matching :q:."))); ++ addSyntax(Plasma::RunnerSyntax(i18nc("list of all people in address book", "list contacts"), i18n("List all people in your address book."))); + } + + ContactsRunner::~ContactsRunner() +@@ -69,10 +69,18 @@ + return; + } + +- const bool matchedName = a.realName().contains(term, Qt::CaseInsensitive); +- bool matchedMail = false; +- +- if (!matchedName) { ++ bool matchedName; ++ bool matchedMail; ++ ++ if (term.compare(i18nc("list of all people in address book", "list contacts"), Qt::CaseInsensitive) == 0) { ++ matchedName = true; ++ matchedMail = true; ++ } else { ++ matchedName = a.realName().contains(term, Qt::CaseInsensitive); ++ matchedMail = false; ++ } ++ ++ if (!matchedName && !matchedMail) { + // Name didn't match, so lets try the name portion of the email address + const int indexOf = a.preferredEmail().indexOf(term, Qt::CaseInsensitive); + matchedMail = indexOf > -1 && indexOf < a.preferredEmail().indexOf('@'); --- kdeplasma-addons-4.3.2.orig/debian/patches/kubuntu_02_microblog_default_configuration.diff +++ kdeplasma-addons-4.3.2/debian/patches/kubuntu_02_microblog_default_configuration.diff @@ -0,0 +1,211 @@ +Index: kdeplasma-addons-4.2.96/applets/microblog/microblog.cpp +=================================================================== +--- kdeplasma-addons-4.2.96.orig/applets/microblog/microblog.cpp 2009-07-10 14:23:01.317966112 +0200 ++++ kdeplasma-addons-4.2.96/applets/microblog/microblog.cpp 2009-07-10 14:41:55.064962161 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -172,7 +173,7 @@ + m_serviceUrl = cg.readEntry("serviceUrl", "https://identi.ca/api/"); + m_username = cg.readEntry("username"); + m_password = KStringHandler::obscure(cg.readEntry("password")); +- m_historySize = cg.readEntry("historySize", 2); ++ m_historySize = cg.readEntry("historySize", 10); + m_historyRefresh = cg.readEntry("historyRefresh", 5); + m_includeFriends = cg.readEntry("includeFriends", true); + +@@ -210,12 +211,12 @@ + + m_layout->addItem(flashLayout); + +- Plasma::Frame *headerFrame = new Plasma::Frame(this); +- m_headerLayout = new QGraphicsLinearLayout( Qt::Horizontal, headerFrame ); ++ m_headerFrame = new Plasma::Frame(this); ++ m_headerLayout = new QGraphicsLinearLayout( Qt::Horizontal, m_headerFrame ); + m_headerLayout->setContentsMargins( 5, 5, 5, 10 ); + m_headerLayout->setSpacing( 5 ); +- m_layout->addItem( headerFrame ); +- ++ ++ m_layout->addItem( m_headerFrame ); + + m_icon = new Plasma::IconWidget(this); + m_icon->setIcon(KIcon("user-identity")); +@@ -259,6 +260,7 @@ + //set things in motion + if (m_username.isEmpty()) { + setAuthRequired(true); ++ downloadHistory(); + } else if (m_password.isEmpty()) { + kDebug() << "started, password is not in config file, trying wallet"; + m_walletWait = Read; +@@ -325,7 +327,9 @@ + } else if (m_password.isEmpty()) { + //FIXME: when out of string freeze, tell the user WHY they need + // to configure the widget; +- setConfigurationRequired(true); ++ if (!QFile::exists("/usr/bin/ubiquity")) { //don't show on live CD ++ setConfigurationRequired(true); ++ } + kDebug() << "failed to read password"; + } + +@@ -350,7 +354,9 @@ + + void MicroBlog::setAuthRequired(bool required) + { +- setConfigurationRequired(required); ++ if (!QFile::exists("/usr/bin/ubiquity")) { ++ setConfigurationRequired(required); ++ } + m_statusEdit->setEnabled(!required); + } + +@@ -773,19 +779,25 @@ + { + //kDebug() ; + if (m_username.isEmpty() || m_password.isEmpty()) { ++ /* + if (!m_curTimeline.isEmpty()) { + m_engine->disconnectSource(m_curTimeline, this); + m_engine->disconnectSource("Error:" + m_curTimeline, this); + } + return; ++ */ ++ m_username = "kubuntu"; //default to show when unconfigured ++ m_headerFrame->hide(); ++ } else { ++ m_headerFrame->show(); + } + + m_flash->flash(i18n("Refreshing timeline..."), -1); + + QString query; +- if (m_includeFriends) { +- query = QString("TimelineWithFriends:%1@%2"); +- } else { ++ if (m_password.isEmpty()) { ++ query = QString("NoAuth:%1@%2"); ++ } else if ( m_includeFriends ) { + query = QString("Timeline:%1@%2"); + } + +@@ -813,7 +825,9 @@ + m_service = m_engine->serviceForSource(m_curTimeline); + connect(m_service, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(serviceFinished(Plasma::ServiceJob*))); + KConfigGroup cg = m_service->operationDescription("auth"); +- cg.writeEntry("password", m_password); ++ if (!m_password.isEmpty()) { ++ cg.writeEntry("password", m_password); ++ } + m_service->startOperationCall(cg); + + //get the profile to retrieve the user icon +Index: kdeplasma-addons-4.2.96/applets/microblog/microblog.h +=================================================================== +--- kdeplasma-addons-4.2.96.orig/applets/microblog/microblog.h 2009-07-10 14:42:11.037966917 +0200 ++++ kdeplasma-addons-4.2.96/applets/microblog/microblog.h 2009-07-10 14:42:54.931087479 +0200 +@@ -142,6 +142,7 @@ + QGraphicsLinearLayout *m_tweetsLayout; + QGraphicsLinearLayout *m_layout; + QGraphicsLinearLayout *m_headerLayout; ++ Plasma::Frame *m_headerFrame; + QGraphicsWidget *m_graphicsWidget; + QPixmap m_popupIcon; + +Index: kdeplasma-addons-4.2.96/dataengines/microblog/timelinesource.cpp +=================================================================== +--- kdeplasma-addons-4.2.96.orig/dataengines/microblog/timelinesource.cpp 2009-07-10 14:43:26.698712347 +0200 ++++ kdeplasma-addons-4.2.96/dataengines/microblog/timelinesource.cpp 2009-07-10 14:46:44.657836722 +0200 +@@ -91,6 +91,9 @@ + case TimelineWithFriends: + m_url = KUrl(m_serviceBaseUrl, "statuses/friends_timeline.xml"); + break; ++ case NoAuth: ++ m_url = KUrl(m_serviceBaseUrl, QString("statuses/user_timeline/%1.xml").arg(account.at(0))); ++ break; + case Timeline: + default: + m_url = KUrl(m_serviceBaseUrl, "statuses/user_timeline.xml"); +@@ -134,7 +137,7 @@ + + void TimelineSource::update() + { +- if (m_job || (!account().isEmpty() && password().isEmpty())) { ++ if ( account() != "kubuntu" && (m_job || (!account().isEmpty() && password().isEmpty())) ) { + // We are already performing a fetch, let's not bother starting over + //kDebug() << "already updating....." << account() << password(); + return; +Index: kdeplasma-addons-4.2.96/dataengines/microblog/timelinesource.h +=================================================================== +--- kdeplasma-addons-4.2.96.orig/dataengines/microblog/timelinesource.h 2009-07-10 14:46:53.585027477 +0200 ++++ kdeplasma-addons-4.2.96/dataengines/microblog/timelinesource.h 2009-07-10 14:47:29.400961898 +0200 +@@ -78,7 +78,8 @@ + enum RequestType { + Timeline = 0, + TimelineWithFriends, +- Profile ++ Profile, ++ NoAuth + }; + + TimelineSource(const QString &who, RequestType requestType, QObject* parent); +Index: kdeplasma-addons-4.2.96/dataengines/microblog/twitterengine.cpp +=================================================================== +--- kdeplasma-addons-4.2.96.orig/dataengines/microblog/twitterengine.cpp 2009-07-10 14:47:45.791711672 +0200 ++++ kdeplasma-addons-4.2.96/dataengines/microblog/twitterengine.cpp 2009-07-10 14:53:01.429962505 +0200 +@@ -37,6 +37,7 @@ + const QString TwitterEngine::timelinePrefix("Timeline:"); + const QString TwitterEngine::timelineWithFriendsPrefix("TimelineWithFriends:"); + const QString TwitterEngine::profilePrefix("Profile:"); ++const QString TwitterEngine::noauthPrefix("NoAuth:"); + + TwitterEngine::TwitterEngine(QObject* parent, const QVariantList& args) + : Plasma::DataEngine(parent, args) +@@ -56,7 +57,7 @@ + return true; + } + +- if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix) && !name.startsWith(profilePrefix)) { ++ if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix) && !name.startsWith(profilePrefix) && !name.startsWith(noauthPrefix)) { + return false; + } + +@@ -84,9 +85,8 @@ + //always returns false becaues everything is async + bool TwitterEngine::updateSourceEvent(const QString &name) + { +- //kDebug() << name; + //right now it only makes sense to do an update on timelines +- if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix) && !name.startsWith(profilePrefix)) { ++ if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix) && !name.startsWith(profilePrefix) && !name.startsWith(noauthPrefix)) { + return false; + } + +@@ -99,6 +99,9 @@ + } else if (name.startsWith(profilePrefix)) { + requestType = TimelineSource::Profile; + who.remove(profilePrefix); ++ } else if (name.startsWith(noauthPrefix)) { ++ requestType = TimelineSource::NoAuth; ++ who.remove(noauthPrefix); + }else{ + requestType = TimelineSource::Timeline; + who.remove(timelinePrefix); +Index: kdeplasma-addons-4.2.96/dataengines/microblog/twitterengine.h +=================================================================== +--- kdeplasma-addons-4.2.96.orig/dataengines/microblog/twitterengine.h 2009-07-10 14:53:12.268837153 +0200 ++++ kdeplasma-addons-4.2.96/dataengines/microblog/twitterengine.h 2009-07-10 14:53:56.846836911 +0200 +@@ -70,6 +70,7 @@ + static const QString timelinePrefix; + static const QString timelineWithFriendsPrefix; + static const QString profilePrefix; ++ static const QString noauthPrefix; + ImageSource *m_imageSource; + + }; --- kdeplasma-addons-4.3.2.orig/debian/patches/kubuntu_05_rememberthemilk_auth_fix.diff +++ kdeplasma-addons-4.3.2/debian/patches/kubuntu_05_rememberthemilk_auth_fix.diff @@ -0,0 +1,1073 @@ +diff -rupN 4.3-kdeplasma-addons/applets/rememberthemilk/authenticate.ui trunk-kdeplasma-addons/applets/rememberthemilk/authenticate.ui +--- 4.3-kdeplasma-addons/applets/rememberthemilk/authenticate.ui 2009-10-10 11:00:29.000000000 -0400 ++++ trunk-kdeplasma-addons/applets/rememberthemilk/authenticate.ui 2009-10-10 11:06:42.000000000 -0400 +@@ -47,44 +47,25 @@ + + + +- Authenticate as: ++ Re-Authenticate + + + true + + +- +- +- +- Username: +- +- +- ++ ++ QFormLayout::ExpandingFieldsGrow ++ ++ ++ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter ++ ++ ++ Qt::AlignHCenter|Qt::AlignTop ++ + +- +- +- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +-<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +-p, li { white-space: pre-wrap; } +-</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> +-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Enter your Remember The Milk username here. If you do not have an account, visit <a href="http://www.rememberthemilk.com/signup/"><span style=" text-decoration: underline; color:#0000ff;">http://www.rememberthemilk.com/signup/</span></a> to create one.</p></body></html> +- +- +- +- +- ++ + +- Password: +- +- +- +- +- +- +- Enter your Remember The Milk password here. +- +- +- true ++ Authenticate with Remember The Milk Service + + + +@@ -136,17 +117,12 @@ p, li { white-space: pre-wrap; } + + + KLed +- ++ QWidget +
kled.h
+ + +- KLineEdit +- +-
klineedit.h
+- +- + KUrlLabel +- ++ QLabel +
kurllabel.h
+ + +diff -rupN 4.3-kdeplasma-addons/applets/rememberthemilk/rememberthemilk-plasmoid.cpp trunk-kdeplasma-addons/applets/rememberthemilk/rememberthemilk-plasmoid.cpp +--- 4.3-kdeplasma-addons/applets/rememberthemilk/rememberthemilk-plasmoid.cpp 2009-10-10 11:00:29.000000000 -0400 ++++ trunk-kdeplasma-addons/applets/rememberthemilk/rememberthemilk-plasmoid.cpp 2009-10-10 11:06:42.000000000 -0400 +@@ -20,23 +20,12 @@ + #include "rememberthemilk-plasmoid.h" + + // Qt Includes +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include + #include + #include ++#include + + // KDE Includes +-#include + #include +-#include + #include + #include + +@@ -55,6 +44,7 @@ + #include "ui_general.h" + #include "taskmodel.h" + #include "tasksortfilter.h" ++#include + + RememberTheMilkPlasmoid::RememberTheMilkPlasmoid(QObject* parent, const QVariantList& args) + : Plasma::PopupApplet(parent, args), +@@ -125,16 +115,16 @@ void RememberTheMilkPlasmoid::init() { + Plasma::Applet::init(); + } + ++ ++void RememberTheMilkPlasmoid::startAuth() ++{ ++ KConfigGroup cg = m_authService->operationDescription("Login"); ++ busyUntil(m_authService->startOperationCall(cg)); ++ busyUntil(0); // Sets busy until we manually call jobFinished(0). Busy until first tasks refresh ++ m_authenticated = false; ++} ++ + void RememberTheMilkPlasmoid::configAccepted() { +- if (!m_authWidgetUi->username->text().isEmpty()) { +- // Remove/replace tabs? +- KConfigGroup cg = m_authService->operationDescription("Login"); +- cg.writeEntry("username", m_authWidgetUi->username->text()); +- cg.writeEntry("password", m_authWidgetUi->password->text()); +- busyUntil(m_authService->startOperationCall(cg)); +- busyUntil(0); // Sets busy until we manually call jobFinished(0). Busy until first tasks refresh +- m_authenticated = false; +- } + switch(m_generalOptionsUi->sortType->currentIndex()) { + case 0: + setSortBy(SortDue); +@@ -155,18 +145,7 @@ void RememberTheMilkPlasmoid::createConf + connect(parent, SIGNAL(finished()), this, SLOT(configFinished())); + connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted())); + connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted())); +- +- if (m_authenticated) { +- m_authWidgetUi->authStatus->setText(i18n("Authenticated")); +- m_authWidgetUi->kled->setState(KLed::On); +- m_authWidgetUi->kled->setColor(Qt::green); +- } else { +- m_authWidgetUi->authStatus->setText(i18n("Not Authenticated")); +- m_authWidgetUi->kled->setState(KLed::Off); +- m_authWidgetUi->kled->setColor(Qt::red); +- } +- m_authWidgetUi->username->clear(); +- m_authWidgetUi->password->clear(); ++ connect(m_authWidgetUi->authenticate, SIGNAL(clicked(bool)), this, SLOT(startAuth())); + + m_generalOptionsUi->sortType->setCurrentIndex(m_sortBy); + +@@ -201,6 +180,17 @@ void RememberTheMilkPlasmoid::dataUpdate + if (name == "Auth") { + m_authenticated = data.value("ValidToken").toBool(); + kDebug() << "Auth: " << m_authenticated; ++ ++ if (m_authenticated) { ++ m_authWidgetUi->authStatus->setText(i18n("Authenticated")); ++ m_authWidgetUi->kled->setState(KLed::On); ++ m_authWidgetUi->kled->setColor(Qt::green); ++ } else { ++ m_authWidgetUi->authStatus->setText(i18n("Not Authenticated")); ++ m_authWidgetUi->kled->setState(KLed::Off); ++ m_authWidgetUi->kled->setColor(Qt::red); ++ } ++ + if (m_authenticated) { + setConfigurationRequired(false); + m_token = data.value("Token").toString(); +diff -rupN 4.3-kdeplasma-addons/applets/rememberthemilk/rememberthemilk-plasmoid.h trunk-kdeplasma-addons/applets/rememberthemilk/rememberthemilk-plasmoid.h +--- 4.3-kdeplasma-addons/applets/rememberthemilk/rememberthemilk-plasmoid.h 2009-10-10 11:00:29.000000000 -0400 ++++ trunk-kdeplasma-addons/applets/rememberthemilk/rememberthemilk-plasmoid.h 2009-10-10 11:06:42.000000000 -0400 +@@ -23,9 +23,6 @@ + #include + + #include +-#include +-#include +-#include + #include + + #include "taskitem.h" +@@ -74,6 +71,7 @@ class RememberTheMilkPlasmoid : public P + void createConfigurationInterface(KConfigDialog *parent); + void configAccepted(); + void configFinished(); ++ void startAuth(); + + void setSortBy(SortBy sortBy); + +diff -rupN 4.3-kdeplasma-addons/applets/rememberthemilk/taskitem.cpp trunk-kdeplasma-addons/applets/rememberthemilk/taskitem.cpp +--- 4.3-kdeplasma-addons/applets/rememberthemilk/taskitem.cpp 2009-10-10 11:00:29.000000000 -0400 ++++ trunk-kdeplasma-addons/applets/rememberthemilk/taskitem.cpp 2009-10-10 11:06:42.000000000 -0400 +@@ -19,8 +19,6 @@ + + #include "taskitem.h" + +-#include +-#include + + #include + +diff -rupN 4.3-kdeplasma-addons/applets/rememberthemilk/taskitemdelegate.cpp trunk-kdeplasma-addons/applets/rememberthemilk/taskitemdelegate.cpp +--- 4.3-kdeplasma-addons/applets/rememberthemilk/taskitemdelegate.cpp 2009-10-10 11:00:29.000000000 -0400 ++++ trunk-kdeplasma-addons/applets/rememberthemilk/taskitemdelegate.cpp 2009-10-10 11:06:42.000000000 -0400 +@@ -29,8 +29,6 @@ + #include + #include + #include +-#include +-#include + + #include + +@@ -112,9 +110,18 @@ void TaskItemDelegate::paintPriorityHead + QLinearGradient gradient(rect.topLeft(), rect.bottomRight()); + gradient.setColorAt(0, itemPriorityColor(index)); + gradient.setColorAt(1, Qt::transparent); +- painter->setBrush(gradient); +- painter->setPen(Qt::NoPen); +- painter->drawRect(rect); ++ ++ int h = QApplication::fontMetrics().height(); ++ QPainterPath path; ++ path.moveTo(rect.bottomLeft()); ++ path.quadTo(rect.bottomLeft()+QPointF(0, -h), rect.bottomLeft()+QPointF(2, -h)); ++ path.lineTo(rect.bottomRight()-QPointF(2, h)); ++ path.quadTo(rect.bottomRight()+QPointF(0, -h), rect.bottomRight()); ++ painter->setBrush(Qt::NoBrush); ++ QPen thickPen(itemPriorityColor(index)); ++ thickPen.setWidth(2); ++ painter->setPen(thickPen); ++ painter->drawPath(path); + + // Draw priority text + QString priority = index.data(Qt::DisplayRole).toString(); +diff -rupN 4.3-kdeplasma-addons/applets/rememberthemilk/tasksortfilter.cpp trunk-kdeplasma-addons/applets/rememberthemilk/tasksortfilter.cpp +--- 4.3-kdeplasma-addons/applets/rememberthemilk/tasksortfilter.cpp 2009-10-10 11:00:29.000000000 -0400 ++++ trunk-kdeplasma-addons/applets/rememberthemilk/tasksortfilter.cpp 2009-10-10 11:06:42.000000000 -0400 +@@ -20,7 +20,6 @@ + #include "tasksortfilter.h" + #include "taskitem.h" + #include "taskmodel.h" +-#include + + + TaskSortFilter::TaskSortFilter(TaskModel *model, QObject* parent) +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/authservice.cpp trunk-kdeplasma-addons/dataengines/rememberthemilk/authservice.cpp +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/authservice.cpp 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/authservice.cpp 2009-10-10 11:06:30.000000000 -0400 +@@ -48,7 +48,7 @@ void AuthJob::start() { + connect(m_session, SIGNAL(tokenCheck(bool)), SLOT(result(bool))); + //FIXME: error handling? + if (operationName() == "Login") { +- m_session->login(parameters().value("username").toString(), parameters().value("password").toString()); ++ m_session->showLoginWindow(); + } + else if (operationName() == "AuthWithToken") { + m_session->setToken(parameters().value("token").toString()); +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/authservice.h trunk-kdeplasma-addons/dataengines/rememberthemilk/authservice.h +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/authservice.h 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/authservice.h 2009-10-10 11:06:30.000000000 -0400 +@@ -24,7 +24,6 @@ + #include + + namespace RTM { +- class Request; + class Session; + } + +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/listssource.h trunk-kdeplasma-addons/dataengines/rememberthemilk/listssource.h +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/listssource.h 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/listssource.h 2009-10-10 11:06:30.000000000 -0400 +@@ -22,8 +22,6 @@ + + #include + +-#include +-#include + #include + + #include +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/rtmauth.operations trunk-kdeplasma-addons/dataengines/rememberthemilk/rtmauth.operations +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/rtmauth.operations 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/rtmauth.operations 2009-10-10 11:06:30.000000000 -0400 +@@ -3,12 +3,6 @@ + "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"> + + +- +- +- +- +- +- + + + +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/rtmengine.cpp trunk-kdeplasma-addons/dataengines/rememberthemilk/rtmengine.cpp +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/rtmengine.cpp 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/rtmengine.cpp 2009-10-10 11:06:30.000000000 -0400 +@@ -26,19 +26,16 @@ + #include "authservice.h" + #include "tasksservice.h" + +-#include +-#include + +-#include +-#include + + #include + + #include + #include + +-const QString RtmEngine::apiKey = "54c4c997b087ba69b5700efd49f774d4"; +-const QString RtmEngine::sharedSecret = "85dc83023257714a"; ++const QString RtmEngine::apiKey = "631e881f0e5671d237c1a2a0a64d5b98"; ++const QString RtmEngine::sharedSecret = "a1c48d8944bce414"; ++ + + RtmEngine::RtmEngine(QObject* parent, const QVariantList& args) + : Plasma::DataEngine(parent, args), +@@ -120,23 +117,23 @@ bool RtmEngine::updateSourceEvent(const + return true; + } + else if (source.startsWith("Lists")) { +- ListsSource *listssoruce = dynamic_cast(containerForSource(source)); ++ ListsSource *listssoruce = static_cast(containerForSource(source)); + listssoruce->refresh(); + return true; + } + else if (source.startsWith("Tasks")) { +- TasksSource *taskssource = dynamic_cast(containerForSource(source)); ++ TasksSource *taskssource = static_cast(containerForSource(source)); + taskssource->refresh(); + return true; + } + else if (source.startsWith("List:")) { +- ListSource *listsource = dynamic_cast(containerForSource(source)); ++ ListSource *listsource = static_cast(containerForSource(source)); + if (listsource) + listsource->update(); + return true; + } + else if (source.startsWith("Task:")) { +- TaskSource *tasksource = dynamic_cast(containerForSource(source)); ++ TaskSource *tasksource = static_cast(containerForSource(source)); + if (tasksource) + tasksource->update(); + return true; +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/rtmengine.h trunk-kdeplasma-addons/dataengines/rememberthemilk/rtmengine.h +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/rtmengine.h 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/rtmengine.h 2009-10-10 11:06:30.000000000 -0400 +@@ -24,9 +24,11 @@ + + #include + +-class TasksSource; +-class ListsSource; + class TaskSource; ++namespace RTM ++{ ++ class Session; ++} + + class RtmEngine : public Plasma::DataEngine + { +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/taskservice.cpp trunk-kdeplasma-addons/dataengines/rememberthemilk/taskservice.cpp +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/taskservice.cpp 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/taskservice.cpp 2009-10-10 11:06:30.000000000 -0400 +@@ -21,7 +21,6 @@ + #include "tasksource.h" + + #include +-#include + + TaskService::TaskService(RTM::Session* session, RTM::Task* task, TaskSource* parent) + : Plasma::Service(parent) +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/taskservice.h trunk-kdeplasma-addons/dataengines/rememberthemilk/taskservice.h +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/taskservice.h 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/taskservice.h 2009-10-10 11:06:30.000000000 -0400 +@@ -26,7 +26,6 @@ + class TaskSource; + + namespace RTM { +- class Request; + class Session; + class Task; + } +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/tasksservice.h trunk-kdeplasma-addons/dataengines/rememberthemilk/tasksservice.h +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/tasksservice.h 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/tasksservice.h 2009-10-10 11:06:30.000000000 -0400 +@@ -24,7 +24,6 @@ + #include + + namespace RTM { +- class Request; + class Session; + } + +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/taskssource.cpp trunk-kdeplasma-addons/dataengines/rememberthemilk/taskssource.cpp +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/taskssource.cpp 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/taskssource.cpp 2009-10-10 11:06:30.000000000 -0400 +@@ -23,10 +23,7 @@ + #include + #include + #include +-#include + +-#include +-#include + + #include + #include "rtmengine.h" +diff -rupN 4.3-kdeplasma-addons/dataengines/rememberthemilk/taskssource.h trunk-kdeplasma-addons/dataengines/rememberthemilk/taskssource.h +--- 4.3-kdeplasma-addons/dataengines/rememberthemilk/taskssource.h 2009-10-10 11:00:19.000000000 -0400 ++++ trunk-kdeplasma-addons/dataengines/rememberthemilk/taskssource.h 2009-10-10 11:06:30.000000000 -0400 +@@ -24,8 +24,6 @@ + #include + #include + +-#include +-#include + #include + + #include +@@ -34,7 +32,6 @@ + + // forward declarations + class TaskSource; +-class QNetworkReply; + class TasksSource; + class RtmEngine; + +diff -rupN 4.3-kdeplasma-addons/libs/rtm/CMakeLists.txt trunk-kdeplasma-addons/libs/rtm/CMakeLists.txt +--- 4.3-kdeplasma-addons/libs/rtm/CMakeLists.txt 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/CMakeLists.txt 2009-10-10 11:06:48.000000000 -0400 +@@ -23,7 +23,7 @@ set( rtm_LIB_SRCS + + kde4_add_library(rtm SHARED ${rtm_LIB_SRCS}) + set_target_properties(rtm PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) +-target_link_libraries(rtm ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KHTML_LIBS}) ++target_link_libraries(rtm ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTWEBKIT_LIBRARY}) + + + #### FOR 4.3 we are not including the library as a stable platform, hence no exporting of headers +diff -rupN 4.3-kdeplasma-addons/libs/rtm/Messages.sh trunk-kdeplasma-addons/libs/rtm/Messages.sh +--- 4.3-kdeplasma-addons/libs/rtm/Messages.sh 1969-12-31 19:00:00.000000000 -0500 ++++ trunk-kdeplasma-addons/libs/rtm/Messages.sh 2009-10-10 11:06:48.000000000 -0400 +@@ -0,0 +1,2 @@ ++#! /usr/bin/env bash ++$XGETTEXT *.cpp -o $podir/librtm.pot +diff -rupN 4.3-kdeplasma-addons/libs/rtm/auth.cpp trunk-kdeplasma-addons/libs/rtm/auth.cpp +--- 4.3-kdeplasma-addons/libs/rtm/auth.cpp 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/auth.cpp 2009-10-10 11:06:48.000000000 -0400 +@@ -24,20 +24,20 @@ + #include + #include + #include ++#include ++#include + + #include + #include +-#include +-#include +-#include +-#include ++#include ++#include + + RTM::Auth::Auth(RTM::Permissions permissions, const QString& apiKey, const QString& sharedSecret) +- : authPage(0) ++ : frobRequest(0), ++ tokenRequest(0) + { +- frobRequest = new RTM::Request("rtm.auth.getFrob", apiKey, sharedSecret); +- tokenRequest = new RTM::Request("rtm.auth.getToken", apiKey, sharedSecret); + arguments.insert("perms", getTextPermissions(permissions)); ++ this->apiKey = apiKey; + this->sharedSecret = sharedSecret; + arguments.insert("api_key", apiKey); + m_state = RTM::Mutable; +@@ -48,89 +48,62 @@ RTM::Auth::~Auth() { + tokenRequest->deleteLater(); + } + +-void RTM::Auth::login(const QString& authUrl, const QString& username, const QString& password) { +- kDebug() << "Starting Login for user: " << username; +- KIO::Job *job = KIO::get(KUrl(authUrl), KIO::NoReload, KIO::HideProgressInfo); +- QByteArray data; +- KIO::NetAccess::synchronousRun(job, 0, &data); +- job->deleteLater(); +- +- authPage = new KHTMLPart(); +- authPage->setJScriptEnabled(false); +- authPage->begin(KUrl(authUrl)); +- authPage->write(data.constData()); +- authPage->end(); +- +- //authPage->view()->resize(500, 400); +- //authPage->widget()->show(); +- +- m_username = username; +- m_password = password; +- +- connect(authPage, SIGNAL(completed()), SLOT(pageLoaded())); +- connect(authPage->browserExtension(), SIGNAL(openUrlRequestDelayed(const KUrl&, const KParts::OpenUrlArguments&, const KParts::BrowserArguments&)), +- SLOT(pageLoadingReq(const KUrl&, const KParts::OpenUrlArguments&, const KParts::BrowserArguments&))); +- +- authCount = 0; +-} +- +-void RTM::Auth::pageLoaded() { +- kDebug() << "Stage " << authCount; +- +- if (authCount >= 2) { +- disconnect(authPage); +- continueAuthForToken(); +- return; +- } +- +- DOM::HTMLInputElement auth = authPage->htmlDocument().getElementById("authorize_yes"); +- if (!auth.isNull()) { +- kDebug() << "Entering Stage 2"; +- authCount = 2; +- auth.click(); +- return; +- } ++ ++void RTM::Auth::showLoginWebpage() ++{ ++ if (frobRequest) ++ frobRequest->deleteLater(); + +- DOM::HTMLInputElement uname = authPage->htmlDocument().getElementById("username"); +- DOM::HTMLInputElement pword = authPage->htmlDocument().getElementById("password"); +- DOM::HTMLFormElement form = authPage->htmlDocument().getElementById("loginform"); +- +- if (uname.isNull()) { +- authCount = 2; +- disconnect(authPage); +- authPage->deleteLater(); +- continueAuthForToken(); +- return; +- } ++ frobRequest = new RTM::Request("rtm.auth.getFrob", apiKey, sharedSecret); ++ connect(frobRequest, SIGNAL(replyReceived(RTM::Request*)), SLOT(showLoginWindowInternal(RTM::Request*))); ++ frobRequest->sendRequest(); ++} ++ ++ ++void RTM::Auth::showLoginWindowInternal(RTM::Request *rawReply) ++{ ++ QString reply = rawReply->data(); ++ //QString reply = rawReply->readAll(); //FIXME: I have no idea why this line isn't working? ++ frob = reply.remove(0, reply.indexOf("")+6); ++ frob.truncate(frob.indexOf("")); ++ kDebug() << "Frob: " << frob; ++ arguments.insert("frob", frob); + +- uname.setValue(m_username); +- pword.setValue(m_password); + +- kDebug() << "Entering Stage 1"; +- +- form.submit(); ++ QWidget *authWidget = new QWidget(); ++ QVBoxLayout *layout = new QVBoxLayout(authWidget); ++ QPushButton *button = new QPushButton(authWidget); ++ QWebView *authPage = new QWebView(authWidget); ++ ++ button->setText(i18n("Click here after you've logged in and authorized the applet")); ++ ++ authPage->setUrl(getAuthUrl()); + +- authCount = 1; ++ authPage->resize(800, 600); ++ authPage->scroll(0, 200); ++ ++ layout->addWidget(authPage); ++ layout->addWidget(button); ++ ++ ++ connect(button, SIGNAL(clicked(bool)), authWidget, SLOT(hide())); ++ connect(button, SIGNAL(clicked(bool)), authWidget, SLOT(deleteLater())); ++ connect(button, SIGNAL(clicked(bool)), SLOT(pageClosed())); // Last because it takes more time. ++ ++ authWidget->show(); + } + +-void RTM::Auth::pageLoadingReq(const KUrl& url, const KParts::OpenUrlArguments& args, const KParts::BrowserArguments& browserArgs) +-{ +- kDebug() << url; +- authPage->setArguments(args); +- authPage->browserExtension()->setBrowserArguments(browserArgs); +- authPage->openUrl(url); ++ ++void RTM::Auth::pageClosed() { ++ continueAuthForToken(); + } + + QString RTM::Auth::getAuthUrl() { +- QString reply = frobRequest->sendSynchronousRequest(); +- frob = reply.remove(0, reply.indexOf("")+6); +- frob.truncate(frob.indexOf("")); +- kDebug() << "Frob: " << frob; +- arguments.insert("frob", frob); ++ if (frob.isEmpty()) ++ kWarning() << "Warning, Frob is EMPTY"; + return requestUrl(); + } + +- + QString RTM::Auth::getTextPermissions(RTM::Permissions permissions) + { + QString textPermissions; +@@ -156,12 +129,14 @@ QString RTM::Auth::getTextPermissions(RT + } + + QString RTM::Auth::requestUrl() { +- kDebug() << "RTM::Auth::getRequestUrl()"; ++ kDebug() << "RTM::Auth::getRequestUrl()" << m_state << RTM::Mutable; + switch(m_state) { + case RTM::Mutable: + sign(); + break; + case RTM::Hashed: ++ unsign(); ++ sign(); + break; + case RTM::RequestSent: + break; +@@ -176,11 +151,24 @@ QString RTM::Auth::requestUrl() { + + void RTM::Auth::continueAuthForToken() + { ++ kDebug() << "Token Time"; ++ if (tokenRequest) ++ tokenRequest->deleteLater(); ++ ++ tokenRequest = new RTM::Request("rtm.auth.getToken", apiKey, sharedSecret); + tokenRequest->addArgument("frob", arguments.value("frob")); +- QString reply = tokenRequest->sendSynchronousRequest(); ++ connect(tokenRequest, SIGNAL(replyReceived(RTM::Request*)), SLOT(tokenResponse(RTM::Request*))); ++ tokenRequest->sendRequest(); ++} ++ + ++void RTM::Auth::tokenResponse(RTM::Request* response) ++{ ++ QString reply = response->data(); ++ kDebug() << "Reply: " << reply; + QString token = reply.remove(0, reply.indexOf("")+7); + token.truncate(token.indexOf("")); + kDebug() << "Token: " << token; + emit tokenReceived(token); + } ++ +diff -rupN 4.3-kdeplasma-addons/libs/rtm/auth.h trunk-kdeplasma-addons/libs/rtm/auth.h +--- 4.3-kdeplasma-addons/libs/rtm/auth.h 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/auth.h 2009-10-10 11:06:48.000000000 -0400 +@@ -30,8 +30,8 @@ + + #include "request.h" + ++class QWebView; + +-class KHTMLPart; + + namespace RTM { + +@@ -40,7 +40,7 @@ class RTM_EXPORT Auth : public Request + Q_OBJECT + public: + Auth(RTM::Permissions permissions, const QString &apiKey, const QString &sharedSecret); +- void login(const QString &authUrl, const QString &username, const QString &password); ++ void showLoginWebpage(); + QString getAuthUrl(); + void continueAuthForToken(); + +@@ -49,20 +49,19 @@ Q_OBJECT + QString getTextPermissions(RTM::Permissions permissions); + QString requestUrl(); + QString frob; ++ QString apiKey; + Request *frobRequest; + Request *tokenRequest; +- KHTMLPart* authPage; +- QString m_username; +- QString m_password; +- int authCount; + + signals: + void authUrlReady(QString authUrl); + void tokenReceived(QString token); + + protected slots: +- void pageLoaded(); +- void pageLoadingReq(const KUrl& url, const KParts::OpenUrlArguments& args, const KParts::BrowserArguments& browserArgs); ++ void pageClosed(); ++ void showLoginWindowInternal(RTM::Request* rawReply); ++public slots: ++ void tokenResponse(RTM::Request*); + }; + + } // Namespace RTM +diff -rupN 4.3-kdeplasma-addons/libs/rtm/request.cpp trunk-kdeplasma-addons/libs/rtm/request.cpp +--- 4.3-kdeplasma-addons/libs/rtm/request.cpp 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/request.cpp 2009-10-10 11:06:48.000000000 -0400 +@@ -119,12 +119,18 @@ void RTM::Request::sign() { + m_state = RTM::Hashed; + } + ++void RTM::Request::unsign() { ++ arguments.remove("api_sig"); ++} ++ + QString RTM::Request::requestUrl() + { + switch(m_state) { + case RTM::Mutable: + sign(); + case RTM::Hashed: ++ unsign(); ++ sign(); + break; + case RTM::RequestSent: + break; +diff -rupN 4.3-kdeplasma-addons/libs/rtm/request.h trunk-kdeplasma-addons/libs/rtm/request.h +--- 4.3-kdeplasma-addons/libs/rtm/request.h 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/request.h 2009-10-10 11:06:48.000000000 -0400 +@@ -61,6 +61,7 @@ Q_OBJECT + protected: + Request() {} + void sign(); ++ void unsign(); + + QMap arguments; + QString m_response; +diff -rupN 4.3-kdeplasma-addons/libs/rtm/rtm.h trunk-kdeplasma-addons/libs/rtm/rtm.h +--- 4.3-kdeplasma-addons/libs/rtm/rtm.h 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/rtm.h 2009-10-10 11:06:48.000000000 -0400 +@@ -25,14 +25,12 @@ + #include + #include + +-class QStringList; + class QString; +-class QByteArray; + + namespace RTM { + enum State { Mutable, Hashed, RequestSent, RequestReceived }; + enum Permissions { None , Read, Write, Delete }; +- const QString baseAuthUrl = "http://www.rememberthemilk.com/services/auth/?"; ++ const QString baseAuthUrl = "https://www.rememberthemilk.com/services/auth/?"; + const QString baseMethodUrl = "http://api.rememberthemilk.com/services/rest/?"; + + /** Timlines are unsigned longs that map to a "session" in which +@@ -48,15 +46,11 @@ namespace RTM { + typedef QString Tag; + + class List; +- class Session; + class Request; + class Auth; + class Task; +- class StaticTask; + class Note; +- class Object; + +- class TasksReader; + + class Location + { +diff -rupN 4.3-kdeplasma-addons/libs/rtm/session.cpp trunk-kdeplasma-addons/libs/rtm/session.cpp +--- 4.3-kdeplasma-addons/libs/rtm/session.cpp 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/session.cpp 2009-10-10 11:06:48.000000000 -0400 +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + +@@ -47,6 +46,9 @@ RTM::Session::Session(QString apiKey, QS + d->apiKey = apiKey; + d->sharedSecret = sharedSecret; + d->permissions = permissions; ++ ++ connect(this, SIGNAL(tokenCheck(bool)), SLOT(handleValidToken(bool))); ++ + setToken(token); + } + +@@ -55,14 +57,15 @@ RTM::Session::~Session() + delete d; + } + +-void RTM::Session::login(const QString& username, const QString& password) { ++void RTM::Session::showLoginWindow() { + //FIXME: What happens when auth wasn't created? + if (!d->auth) + d->auth = new RTM::Auth(d->permissions, d->apiKey, d->sharedSecret); +- d->auth->login(d->authUrl, username, password); ++ d->auth->showLoginWebpage(); + } + + ++ + QString RTM::Session::getAuthUrl() const { + return d->authUrl; + } +@@ -94,22 +97,27 @@ QString RTM::Session::sharedSecret() con + RTM::Timeline RTM::Session::getTimeline() const { + return d->timeline; + } +- ++ + QString RTM::Session::token() const { + return d->token; + } + + void RTM::Session::setToken(const QString& token) + { ++ d->token = token; ++ d->tasks.clear(); //FIXME: Leak? Tasks/Lists are pointers. ++ d->lists.clear(); ++ ++ checkToken(); ++} ++ ++void RTM::Session::handleValidToken(bool valid) ++{ + if (d->auth) { + d->auth->deleteLater(); + d->auth = 0; + } +- +- d->token = token; +- d->tasks.clear(); //FIXME: Leak? Tasks/Lists are pointers. +- d->lists.clear(); +- if (!checkToken()) { ++ if (!valid) { + d->token.clear(); + d->auth = new RTM::Auth(d->permissions, d->apiKey, d->sharedSecret); + d->authUrl = d->auth->getAuthUrl(); +@@ -122,6 +130,7 @@ void RTM::Session::setToken(const QStrin + } + } + ++ + void RTM::Session::setTimeline(const RTM::Timeline& timeline) { + d->timeline = timeline; + } +@@ -131,37 +140,53 @@ void RTM::Session::continueAuthForToken( + d->auth->continueAuthForToken(); + } + +-bool RTM::Session::checkToken() { +- if (d->token.isEmpty()) +- return false; +- RTM::Request tokenRequest("rtm.auth.checkToken", d->apiKey, d->sharedSecret); +- tokenRequest.addArgument("auth_token", d->token); +- QString reply = tokenRequest.sendSynchronousRequest(); ++void RTM::Session::checkToken() { ++ if (d->token.isEmpty()) { ++ emit tokenCheck(false); ++ return; ++ } ++ RTM::Request *tokenRequest = new RTM::Request("rtm.auth.checkToken", d->apiKey, d->sharedSecret); ++ tokenRequest->addArgument("auth_token", d->token); ++ connect(tokenRequest, SIGNAL(replyReceived(RTM::Request*)), SLOT(tokenCheckReply(RTM::Request*))); ++ connect(tokenRequest, SIGNAL(replyReceived(RTM::Request*)), tokenRequest, SLOT(deleteLater())); ++ tokenRequest->sendRequest(); ++} ++ + ++void RTM::Session::tokenCheckReply(RTM::Request* response) ++{ ++ QString reply = response->data(); ++ + if (!reply.contains(d->token)) { + kDebug() << "Failed Token Check: " << reply; + emit tokenCheck(false); +- return false; + } + kDebug() << "Successful Token Check: " << reply; + emit tokenCheck(true); +- return true; + } + +-RTM::Timeline RTM::Session::createTimeline() { ++ ++void RTM::Session::createTimeline() { + RTM::Request *request = new RTM::Request("rtm.timelines.create", d->apiKey, d->sharedSecret); + request->addArgument("auth_token", d->token); +- QString reply = request->sendSynchronousRequest(); ++ connect(request, SIGNAL(replyReceived(RTM::Request*)), SLOT(timelineReply(RTM::Request*))); ++ connect(request, SIGNAL(replyReceived(RTM::Request*)), request, SLOT(deleteLater())); ++ request->sendRequest(); ++} ++ ++void RTM::Session::timelineReply(RTM::Request* response) ++{ ++ QString reply = response->data(); + QString timeline = reply.remove(0, reply.indexOf("")+10); + timeline.truncate(timeline.indexOf("")); + kDebug() << "Timeline: " << timeline; +- request->deleteLater(); + d->timeline = timeline.toLong(); + d->lastRefresh = QDateTime(); +- return getTimeline(); ++ emit timelineCreated(getTimeline()); + } + + ++ + void RTM::Session::handleResponse() + { + //TODO: Move data from buffer to response, then clear buffer. +diff -rupN 4.3-kdeplasma-addons/libs/rtm/session.h trunk-kdeplasma-addons/libs/rtm/session.h +--- 4.3-kdeplasma-addons/libs/rtm/session.h 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/session.h 2009-10-10 11:06:48.000000000 -0400 +@@ -32,7 +32,6 @@ namespace RTM { + class TasksReader; + } + +-class QNetworkReply; + + /** @file + * This file is part of librtm. It defines +@@ -60,7 +59,7 @@ Q_OBJECT + virtual ~Session(); + + QString getAuthUrl() const; +- void login(const QString &username, const QString &password); ++ void showLoginWindow(); + bool authenticated() const; + + RTM::Request* request(const QString& method); +@@ -69,9 +68,9 @@ Q_OBJECT + + void setTimeline(const RTM::Timeline& timeline); + RTM::Timeline getTimeline() const; +- RTM::Timeline createTimeline(); ++ void createTimeline(); + +- bool checkToken(); ++ void checkToken(); + + QString apiKey() const; + QString sharedSecret() const; +@@ -95,10 +94,15 @@ Q_OBJECT + void continueAuthForToken(); + void addTask(const QString &task, RTM::ListId listId); + RTM::Task* createTaskFromString(const QString& task); ++ void tokenCheckReply(RTM::Request*); ++ void handleValidToken(bool); ++ void timelineReply(RTM::Request*); + + Q_SIGNALS: + void tokenReceived(const QString& token); + void tokenCheck(bool success); ++ ++ void timelineCreated(RTM::Timeline timeline); + + void taskChanged(RTM::Task* task); + void listChanged(RTM::List* list); +diff -rupN 4.3-kdeplasma-addons/libs/rtm/session_p.h trunk-kdeplasma-addons/libs/rtm/session_p.h +--- 4.3-kdeplasma-addons/libs/rtm/session_p.h 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/session_p.h 2009-10-10 11:06:48.000000000 -0400 +@@ -32,7 +32,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -86,7 +85,7 @@ class RTM::SessionPrivate { + void smartListReply(RTM::Request* reply) { + QStringList parts = reply->requestUrl().split("&"); + RTM::ListId id = 0; +- foreach(QString part, parts) ++ foreach(const QString &part, parts) + if (part.contains("rtm_internal_list_id")) + id = part.split("=").last().toLongLong(); + +diff -rupN 4.3-kdeplasma-addons/libs/rtm/task.h trunk-kdeplasma-addons/libs/rtm/task.h +--- 4.3-kdeplasma-addons/libs/rtm/task.h 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/task.h 2009-10-10 11:06:48.000000000 -0400 +@@ -35,6 +35,7 @@ + namespace RTM { + + class TaskPrivate; ++class Session; + + class RTM_EXPORT Task : public QObject + { +diff -rupN 4.3-kdeplasma-addons/libs/rtm/tests/login.cpp trunk-kdeplasma-addons/libs/rtm/tests/login.cpp +--- 4.3-kdeplasma-addons/libs/rtm/tests/login.cpp 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/tests/login.cpp 2009-10-10 11:06:48.000000000 -0400 +@@ -5,23 +5,17 @@ + #include + #include + +-#include +-#include +- +-#include +-#include +-#include +-#include +- +-int main(int argc, char* argv[]) { ++int main(int argc, char* argv[]) { + KAboutData about("login", 0, ki18n("RTM Login Test"), "1.0", ki18n("A Simple RTM Login Test"), + KAboutData::License_GPL, ki18n("(C) 2009 Andrew Stromme"), KLocalizedString(), 0, "astromme@chatonka.com"); + KCmdLineArgs::init(argc, argv, &about); ++ + KApplication app; +- +- RTM::Session *session = new RTM::Session("myapikey", "mysharedsecret", RTM::Delete, QString(), &app); + +- session->login("myuser", "mypass"); ++ RTM::Session *session = new RTM::Session("myapikey", "mysharedsecret", RTM::Delete, QString(), &app); ++ ++ session->showLoginWindow(); + +- app.exec(); ++ return app.exec(); + } ++ +diff -rupN 4.3-kdeplasma-addons/libs/rtm/tests/refresh.cpp trunk-kdeplasma-addons/libs/rtm/tests/refresh.cpp +--- 4.3-kdeplasma-addons/libs/rtm/tests/refresh.cpp 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/tests/refresh.cpp 2009-10-10 11:06:48.000000000 -0400 +@@ -45,7 +45,7 @@ int main(int argc, char* argv[]) { + + RTM::Session *session = new RTM::Session("myapikey", "mysharedsecret", RTM::Delete, QString(), &app); + +- session->login("myuser", "mypass"); ++ session->showLoginWindow(); + + Refresher refresher; + refresher.session = session; +diff -rupN 4.3-kdeplasma-addons/libs/rtm/xmlreaders.h trunk-kdeplasma-addons/libs/rtm/xmlreaders.h +--- 4.3-kdeplasma-addons/libs/rtm/xmlreaders.h 2009-10-10 11:00:34.000000000 -0400 ++++ trunk-kdeplasma-addons/libs/rtm/xmlreaders.h 2009-10-10 11:06:48.000000000 -0400 +@@ -23,9 +23,7 @@ + namespace RTM { + class Request; + class Session; +- class SessionPrivate; + class Task; +- class TaskPrivate; + } + + #include --- kdeplasma-addons-4.3.2.orig/debian/patches/series +++ kdeplasma-addons-4.3.2/debian/patches/series @@ -0,0 +1,4 @@ +kubuntu_02_microblog_default_configuration.diff +#kubuntu_03_opendestop_setup.diff +kubuntu_04_netbook_runners.diff +kubuntu_05_rememberthemilk_auth_fix.diff --- kdeplasma-addons-4.3.2.orig/debian/patches/kubuntu_03_opendestop_setup.diff +++ kdeplasma-addons-4.3.2/debian/patches/kubuntu_03_opendestop_setup.diff @@ -0,0 +1,32 @@ +--- kdeplasma-addons-4.3.0/applets/opendesktop/opendesktop.cpp 2009-07-29 12:13:00.000000000 +0100 ++++ kdeplasma-addons-4.3.0/applets/opendesktop/opendesktop.cpp 2009-08-06 17:05:03.000000000 +0100 +@@ -81,6 +81,7 @@ + + + (void)graphicsWidget(); ++ setMinimumSize(300, 300); + } + + OpenDesktop::~OpenDesktop() +@@ -108,10 +109,11 @@ + } + m_username = cg.readEntry("username", QString()); + m_displayedUser = m_username; +- resize(420, 420); ++ resize(300, 300); + + if (m_username.isEmpty()) { + setConfigurationRequired(true); ++ m_tabs->setCurrentIndex(2); + } else { + connectPerson(m_username); + connectFriends(m_username); +@@ -159,7 +161,7 @@ + { + if (!m_tabs) { + m_tabs = new Plasma::TabBar(this); +- m_tabs->setPreferredSize(300, 400); ++ m_tabs->setPreferredSize(300, 300); + m_tabs->setMinimumSize(150, 200); + m_tabs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); +