rev 14896 - in trunk/packages/kdebase-workspace/debian: . patches

George Kiagiadakis gkiagia-guest at alioth.debian.org
Sat Jun 6 17:46:56 UTC 2009 

Author: gkiagia-guest
Date: 2009-06-06 17:46:55 +0000 (Sat, 06 Jun 2009)
New Revision: 14896

Removed:
   trunk/packages/kdebase-workspace/debian/plasma-scriptengine-javascript.install
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/control
   trunk/packages/kdebase-workspace/debian/kde-window-manager.install
   trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   trunk/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
   trunk/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.install
   trunk/packages/kdebase-workspace/debian/klipper.install
   trunk/packages/kdebase-workspace/debian/ksysguard.install
   trunk/packages/kdebase-workspace/debian/libkdecorations4.install
   trunk/packages/kdebase-workspace/debian/not-installed
   trunk/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
   trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
   trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
   trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
   trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff
   trunk/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff
   trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff
   trunk/packages/kdebase-workspace/debian/patches/26_run_kaboom_when_starting_kde.diff
   trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
   trunk/packages/kdebase-workspace/debian/plasma-dataengines-workspace.install
   trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install
   trunk/packages/kdebase-workspace/debian/systemsettings.install
Log:
kdebase-workspace 4.2.90


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,3 +1,26 @@
+kdebase-workspace (4:4.2.90+svn977760-0r1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+  +++ Changes by George Kiagiadakis:
+
+  * Bump build-dependency on kdelibs5-dev and kdepimlibs5-dev to version 4.2.90.
+  * Bump build-dependency on libqedje-dev to version 0.4.0.
+  * Move package plasma-scriptengine-javascript from kdebase-workspace
+    to kdebase-runtime as the sources for this component were moved upstream.
+  * Change plasma-scriptengines metapackage to depend on
+    plasma-scriptengine-javascript (>= 4:4.2.90) instead of (>= ${source:Version}),
+    as this is now part of kdebase-runtime.
+  * Add build dependencies on libpolkit-qt-dev, libpolkit-dbus-dev,
+    libpolkit-grant-dev.
+  * Refresh patches.
+  * Update installed files.
+  * Add build dependency on libakonadi-dev.
+  * Add build dependency on libknotificationitem-1-dev.
+  * Add myself to uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Jun 2009 14:58:36 +0300
+
 kdebase-workspace (4:4.2.4-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/control	2009-06-06 17:46:55 UTC (rev 14896)
@@ -2,9 +2,9 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2),
- kdelibs5-dev (>= 4:4.2.4), kdepimlibs5-dev (>= 4:4.2.4), libboost-dev,
+ kdelibs5-dev (>= 4:4.2.90), kdepimlibs5-dev (>= 4:4.2.90), libboost-dev,
  python-support (>= 0.6), python-dev,
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libcaptury-dev, libck-connector-dev, libdbus-1-dev, libnm-util-dev (>= 0.7), network-manager-dev (>= 0.7.0),
@@ -14,7 +14,8 @@
  libxrandr-dev, libxrender-dev, libxxf86misc-dev, libxi-dev,
  libsmbclient-dev, libxcb1-dev, libxine-dev, libfontconfig-dev, libglu1-mesa-dev,
  libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev,
- libxss-dev, libqedje-dev, libggadget-1.0-dev (>= 0.10.5~), libggadget-qt-1.0-dev (>= 0.10.5~),
+ libxss-dev, libqedje-dev (>= 0.4.0), libggadget-1.0-dev (>= 0.10.5~), libggadget-qt-1.0-dev (>= 0.10.5~),
+ libpolkit-qt-dev, libpolkit-dbus-dev, libpolkit-grant-dev, libakonadi-dev, libknotificationitem-1-dev
 Standards-Version: 3.8.1
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdebase-workspace
@@ -133,7 +134,7 @@
 Package: plasma-scriptengines
 Section: kde
 Architecture: all
-Depends: plasma-scriptengine-javascript (>= ${source:Version}),
+Depends: plasma-scriptengine-javascript (>= 4:4.2.90),
  plasma-scriptengine-qedje (>= ${source:Version}),
  plasma-scriptengine-ruby (>= ${source:Version}),
  plasma-scriptengine-python (>= ${source:Version}),
@@ -147,17 +148,6 @@
  .
  This package is part of the KDE 4 base workspace module.
 
-Package: plasma-scriptengine-javascript
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82)
-Description: javascript script engine for Plasma
- This package provides javascript script engine for Plasma. You have to install
- it if you want to use Plasma widgets and data engines written in javascript.
- .
- This package is part of the KDE 4 base workspace module.
-
 Package: plasma-scriptengine-qedje
 Section: kde
 Architecture: any

Modified: trunk/packages/kdebase-workspace/debian/kde-window-manager.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kde-window-manager.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/kde-window-manager.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -9,6 +9,7 @@
 usr/lib/kde4/kcm_kwindesktop.so
 usr/lib/kde4/kcm_kwinoptions.so
 usr/lib/kde4/kcm_kwinrules.so
+usr/lib/kde4/kcm_kwinscreenedges.so
 usr/lib/kde4/kwin3_b2.so
 usr/lib/kde4/kwin3_kde2.so
 usr/lib/kde4/kwin3_keramik.so
@@ -32,7 +33,7 @@
 usr/lib/libkdeinit4_kwin.so
 usr/lib/libkdeinit4_kwin_rules_dialog.so
 usr/lib/libkwinnvidiahack.so.4
-usr/lib/libkwinnvidiahack.so.4.2.0
+usr/lib/libkwinnvidiahack.so.4.3.0
 usr/share/doc/kde4/HTML/en/kcontrol/kwincompositing/common
 usr/share/doc/kde4/HTML/en/kcontrol/kwincompositing/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kwincompositing/index.docbook
@@ -116,8 +117,7 @@
 usr/share/kde4/services/kwin/coverswitch_config.desktop
 usr/share/kde4/services/kwin/cube.desktop
 usr/share/kde4/services/kwin/cube_config.desktop
-usr/share/kde4/services/kwin/cylinder.desktop
-usr/share/kde4/services/kwin/cylinder_config.desktop
+usr/share/kde4/services/kwin/cubeslide.desktop
 usr/share/kde4/services/kwin/desktopgrid.desktop
 usr/share/kde4/services/kwin/desktopgrid_config.desktop
 usr/share/kde4/services/kwin/dialogparent.desktop
@@ -126,9 +126,11 @@
 usr/share/kde4/services/kwin/dimscreen.desktop
 usr/share/kde4/services/kwin/explosion.desktop
 usr/share/kde4/services/kwin/fade.desktop
+usr/share/kde4/services/kwin/fadedesktop.desktop
 usr/share/kde4/services/kwin/fallapart.desktop
 usr/share/kde4/services/kwin/flipswitch.desktop
 usr/share/kde4/services/kwin/flipswitch_config.desktop
+usr/share/kde4/services/kwin/highlightwindow.desktop
 usr/share/kde4/services/kwin/invert.desktop
 usr/share/kde4/services/kwin/invert_config.desktop
 usr/share/kde4/services/kwin/login.desktop
@@ -136,10 +138,9 @@
 usr/share/kde4/services/kwin/lookingglass.desktop
 usr/share/kde4/services/kwin/lookingglass_config.desktop
 usr/share/kde4/services/kwin/magiclamp.desktop
+usr/share/kde4/services/kwin/magiclamp_config.desktop
 usr/share/kde4/services/kwin/magnifier.desktop
 usr/share/kde4/services/kwin/magnifier_config.desktop
-usr/share/kde4/services/kwin/maketransparent.desktop
-usr/share/kde4/services/kwin/maketransparent_config.desktop
 usr/share/kde4/services/kwin/minimizeanimation.desktop
 usr/share/kde4/services/kwin/mousemark.desktop
 usr/share/kde4/services/kwin/mousemark_config.desktop
@@ -150,19 +151,22 @@
 usr/share/kde4/services/kwin/shadow_config.desktop
 usr/share/kde4/services/kwin/sharpen.desktop
 usr/share/kde4/services/kwin/sharpen_config.desktop
+usr/share/kde4/services/kwin/sheet.desktop
 usr/share/kde4/services/kwin/showfps.desktop
 usr/share/kde4/services/kwin/showfps_config.desktop
 usr/share/kde4/services/kwin/showpaint.desktop
 usr/share/kde4/services/kwin/slide.desktop
+usr/share/kde4/services/kwin/slideback.desktop
+usr/share/kde4/services/kwin/snaphelper.desktop
 usr/share/kde4/services/kwin/snow.desktop
 usr/share/kde4/services/kwin/snow_config.desktop
-usr/share/kde4/services/kwin/sphere.desktop
-usr/share/kde4/services/kwin/sphere_config.desktop
 usr/share/kde4/services/kwin/taskbarthumbnail.desktop
 usr/share/kde4/services/kwin/thumbnailaside.desktop
 usr/share/kde4/services/kwin/thumbnailaside_config.desktop
 usr/share/kde4/services/kwin/trackmouse.desktop
 usr/share/kde4/services/kwin/trackmouse_config.desktop
+usr/share/kde4/services/kwin/translucency.desktop
+usr/share/kde4/services/kwin/translucency_config.desktop
 usr/share/kde4/services/kwin/wobblywindows.desktop
 usr/share/kde4/services/kwin/wobblywindows_config.desktop
 usr/share/kde4/services/kwin/zoom.desktop
@@ -175,5 +179,6 @@
 usr/share/kde4/services/kwinmoving.desktop
 usr/share/kde4/services/kwinoptions.desktop
 usr/share/kde4/services/kwinrules.desktop
+usr/share/kde4/services/kwinscreenedges.desktop
 usr/share/kde4/servicetypes/kwineffect.desktop
 usr/share/sounds/pop.wav

Modified: trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -20,19 +20,21 @@
 usr/bin/ksystraycmd
 usr/bin/kwrited
 usr/bin/kxkb
-usr/bin/plasma
+usr/bin/plasma-desktop
 usr/bin/plasma-overlay
 usr/bin/plasmaengineexplorer
-usr/bin/plasmapkg
+usr/bin/plasmawallpaperviewer
 usr/bin/plasmoidviewer
+usr/bin/polkit-kde-authorization
 usr/bin/safestartkde
+usr/bin/solid-action-desktop-gen
 usr/bin/solid-bluetooth
 usr/bin/solid-network
 usr/bin/solid-powermanagement
 usr/bin/startkde
-usr/lib/kconf_update_bin/khotkeys_update
 usr/lib/kconf_update_bin/krdb_clearlibrarypath
 usr/lib/kconf_update_bin/plasma-add-shortcut-to-menu
+usr/lib/kconf_update_bin/plasma-to-plasma-desktop
 usr/lib/kde4/fontthumbnail.so
 usr/lib/kde4/kcm_access.so
 usr/lib/kde4/kcm_autostart.so
@@ -48,19 +50,21 @@
 usr/lib/kde4/kcm_keyboard.so
 usr/lib/kde4/kcm_keyboard_layout.so
 usr/lib/kde4/kcm_keys.so
-usr/lib/kde4/kcm_krunner_shell.so
 usr/lib/kde4/kcm_ksplashthemes.so
 usr/lib/kde4/kcm_launch.so
+usr/lib/kde4/kcm_pkk_authorization.so
 usr/lib/kde4/kcm_powerdevilconfig.so
 usr/lib/kde4/kcm_randr.so
 usr/lib/kde4/kcm_screensaver.so
 usr/lib/kde4/kcm_smserver.so
 usr/lib/kde4/kcm_solid.so
+usr/lib/kde4/kcm_solid_actions.so
 usr/lib/kde4/kcm_standard_actions.so
 usr/lib/kde4/kcm_xinerama.so
 usr/lib/kde4/kded_kephal.so
 usr/lib/kde4/kded_khotkeys.so
 usr/lib/kde4/kded_networkstatus.so
+usr/lib/kde4/kded_notificationitemwatcher.so
 usr/lib/kde4/kded_powerdevil.so
 usr/lib/kde4/kfontviewpart.so
 usr/lib/kde4/kio_fonts.so
@@ -80,7 +84,8 @@
 usr/lib/kde4/libexec/kcmdatetimehelper
 usr/lib/kde4/libexec/kfontprint
 usr/lib/kde4/libexec/kio_fonts_helper
-usr/lib/kde4/libexec/krunner_lock
+usr/lib/kde4/libexec/kscreenlocker
+usr/lib/kde4/libexec/polkit-kde-manager
 usr/lib/kde4/libexec/test_kcm_xinerama
 usr/lib/kde4/plasma_wallpaper_color.so
 usr/lib/kde4/plasma_wallpaper_image.so
@@ -88,6 +93,7 @@
 usr/lib/kde4/solid_fakenet.so
 usr/lib/kde4/solid_hal_power.so
 usr/lib/kde4/solid_networkmanager07.so
+usr/lib/kde4/solid_wicd.so
 usr/lib/libkdeinit4_kaccess.so
 usr/lib/libkdeinit4_kcminit.so
 usr/lib/libkdeinit4_kcminit_startup.so
@@ -95,16 +101,19 @@
 usr/lib/libkdeinit4_krunner.so
 usr/lib/libkdeinit4_ksmserver.so
 usr/lib/libkdeinit4_kxkb.so
-usr/lib/libkdeinit4_plasma.so
+usr/lib/libkdeinit4_plasma-desktop.so
 usr/lib/libkhotkeysprivate.so.4
-usr/lib/libkhotkeysprivate.so.4.2.0
+usr/lib/libkhotkeysprivate.so.4.3.0
+usr/lib/libpolkitkdeprivate.so.4
+usr/lib/libpolkitkdeprivate.so.4.3.0
 usr/lib/strigi/strigita_font.so
 usr/share/applications/kde4/kfontview.desktop
 usr/share/applications/kde4/kmenuedit.desktop
 usr/share/applications/kde4/krandrtray.desktop
 usr/share/autostart/krunner.desktop
 usr/share/autostart/kwrited-autostart.desktop
-usr/share/autostart/plasma.desktop
+usr/share/autostart/plasma-desktop.desktop
+usr/share/kde4/apps/kcmsolidactions/solid-action-template.desktop
 usr/share/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop
 usr/share/kde4/services/ScreenSavers/kblank.desktop
 usr/share/kde4/services/ScreenSavers/krandom.desktop
@@ -120,13 +129,15 @@
 usr/share/kde4/services/joystick.desktop
 usr/share/kde4/services/kaccess.desktop
 usr/share/kde4/services/kcm_keyboard.desktop
+usr/share/kde4/services/kcm_pkk_authorization.desktop
 usr/share/kde4/services/kcm_solid.desktop
 usr/share/kde4/services/kcmaccess.desktop
 usr/share/kde4/services/kcmlaunch.desktop
 usr/share/kde4/services/kcmsmserver.desktop
-usr/share/kde4/services/kded/kded_kephal.desktop
+usr/share/kde4/services/kded/kephal.desktop
 usr/share/kde4/services/kded/khotkeys.desktop
 usr/share/kde4/services/kded/networkstatus.desktop
+usr/share/kde4/services/kded/notificationitemwatcher.desktop
 usr/share/kde4/services/kded/powerdevil.desktop
 usr/share/kde4/services/keyboard.desktop
 usr/share/kde4/services/keyboard_layout.desktop
@@ -144,7 +155,6 @@
 usr/share/kde4/services/plasma-runner-services.desktop
 usr/share/kde4/services/plasma-runner-sessions.desktop
 usr/share/kde4/services/plasma-runner-shell.desktop
-usr/share/kde4/services/plasma-runner-shell_config.desktop
 usr/share/kde4/services/plasma-runner-webshortcuts.desktop
 usr/share/kde4/services/plasma-wallpaper-color.desktop
 usr/share/kde4/services/plasma-wallpaper-image.desktop
@@ -153,10 +163,12 @@
 usr/share/kde4/services/recentdocuments.desktop
 usr/share/kde4/services/screensaver.desktop
 usr/share/kde4/services/settings-input-actions.desktop
+usr/share/kde4/services/solid-actions.desktop
 usr/share/kde4/services/solidbackends/solid_bluez.desktop
 usr/share/kde4/services/solidbackends/solid_fakenet.desktop
 usr/share/kde4/services/solidbackends/solid_hal_power.desktop
 usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
+usr/share/kde4/services/solidbackends/solid_wicd.desktop
 usr/share/kde4/services/standard_actions.desktop
 usr/share/kde4/services/xinerama.desktop
 usr/share/kde4/servicetypes/screensaver.desktop

Modified: trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,4 +1,21 @@
+usr/share/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+usr/share/dbus-1/services/org.kde.PolicyKit.service
 usr/share/dbus-1/services/org.kde.krunner.service
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authdialog_1.png
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authdialog_2.png
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authdialog_3.png
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authdialog_4.png
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authdialog_5.png
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authdialog_6.png
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authorization.docbook
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authorization_1.png
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authorization_2.png
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/authorizationagent.docbook
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/common
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/howitworks.docbook
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/index.cache.bz2
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/index.docbook
+usr/share/doc/kde4/HTML/en/PolicyKit-kde/introduction.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/common
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/index.docbook
@@ -11,6 +28,9 @@
 usr/share/doc/kde4/HTML/en/kcontrol/colors/common
 usr/share/doc/kde4/HTML/en/kcontrol/colors/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/colors/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/desktopthemedetails/common
+usr/share/doc/kde4/HTML/en/kcontrol/desktopthemedetails/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/desktopthemedetails/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/energy/common
 usr/share/doc/kde4/HTML/en/kcontrol/energy/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/energy/index.docbook
@@ -55,6 +75,12 @@
 usr/share/doc/kde4/HTML/en/kcontrol/screensaver/common
 usr/share/doc/kde4/HTML/en/kcontrol/screensaver/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/screensaver/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/solid-actions/add-action.png
+usr/share/doc/kde4/HTML/en/kcontrol/solid-actions/common
+usr/share/doc/kde4/HTML/en/kcontrol/solid-actions/edit-action.png
+usr/share/doc/kde4/HTML/en/kcontrol/solid-actions/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/solid-actions/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/solid-actions/main.png
 usr/share/doc/kde4/HTML/en/kcontrol/splashscreen/common
 usr/share/doc/kde4/HTML/en/kcontrol/splashscreen/get-new-theme.png
 usr/share/doc/kde4/HTML/en/kcontrol/splashscreen/index.cache.bz2
@@ -136,16 +162,13 @@
 usr/share/kde4/apps/kconf_update/convertShortcuts.pl
 usr/share/kde4/apps/kconf_update/kaccel.upd
 usr/share/kde4/apps/kconf_update/kcmdisplayrc.upd
-usr/share/kde4/apps/kconf_update/khotkeys_32b1_update.upd
-usr/share/kde4/apps/kconf_update/khotkeys_printscreen.upd
-usr/share/kde4/apps/kconf_update/konqueror_gestures_kde321_update.upd
 usr/share/kde4/apps/kconf_update/krdb.upd
 usr/share/kde4/apps/kconf_update/ksmserver.upd
 usr/share/kde4/apps/kconf_update/mouse_cursor_theme.upd
 usr/share/kde4/apps/kconf_update/move_session_config.sh
 usr/share/kde4/apps/kconf_update/plasma-add-shortcut-to-menu.upd
-usr/share/kde4/apps/kcontrol/pics/energybig.png
-usr/share/kde4/apps/kcontrol/pics/lo-energy.png
+usr/share/kde4/apps/kconf_update/plasma-to-plasmadesktop-shortcuts.upd
+usr/share/kde4/apps/kconf_update/plasmarc-to-plasmadesktoprc.upd
 usr/share/kde4/apps/kcontrol/pics/logo.png
 usr/share/kde4/apps/kcontrol/pics/mini-world.png
 usr/share/kde4/apps/kcontrol/pics/monitor.png
@@ -184,6 +207,7 @@
 usr/share/kde4/apps/kfontinst/icons/oxygen/scalable/actions/fontstatus.svgz
 usr/share/kde4/apps/kfontinst/kfontviewpart.rc
 usr/share/kde4/apps/kfontview/kfontviewui.rc
+usr/share/kde4/apps/khotkeys/defaults.khotkeys
 usr/share/kde4/apps/khotkeys/kde32b1.khotkeys
 usr/share/kde4/apps/khotkeys/konqueror_gestures_kde321.khotkeys
 usr/share/kde4/apps/khotkeys/printscreen.khotkeys
@@ -244,6 +268,24 @@
 usr/share/kde4/apps/kwrited/kwrited.notifyrc
 usr/share/kde4/apps/powerdevil/default.powerdevilprofiles
 usr/share/kde4/apps/powerdevil/powerdevil.notifyrc
+usr/share/kde4/apps/solid/devices/solid-device-AcAdapter.desktop
+usr/share/kde4/apps/solid/devices/solid-device-AudioInterface.desktop
+usr/share/kde4/apps/solid/devices/solid-device-Battery.desktop
+usr/share/kde4/apps/solid/devices/solid-device-Block.desktop
+usr/share/kde4/apps/solid/devices/solid-device-Button.desktop
+usr/share/kde4/apps/solid/devices/solid-device-Camera.desktop
+usr/share/kde4/apps/solid/devices/solid-device-DvbInterface.desktop
+usr/share/kde4/apps/solid/devices/solid-device-GenericInterface.desktop
+usr/share/kde4/apps/solid/devices/solid-device-NetworkInterface.desktop
+usr/share/kde4/apps/solid/devices/solid-device-OpticalDisc.desktop
+usr/share/kde4/apps/solid/devices/solid-device-OpticalDrive.desktop
+usr/share/kde4/apps/solid/devices/solid-device-PortableMediaPlayer.desktop
+usr/share/kde4/apps/solid/devices/solid-device-Processor.desktop
+usr/share/kde4/apps/solid/devices/solid-device-SerialInterface.desktop
+usr/share/kde4/apps/solid/devices/solid-device-StorageAccess.desktop
+usr/share/kde4/apps/solid/devices/solid-device-StorageDrive.desktop
+usr/share/kde4/apps/solid/devices/solid-device-StorageVolume.desktop
+usr/share/kde4/apps/solid/devices/solid-device-Video.desktop
 usr/share/kde4/apps/solidfakenetbackend/fakenetworking.xml
 usr/share/kde4/config.kcfg/klaunch.kcfg
 usr/share/kde4/config.kcfg/kscreensaversettings.kcfg

Modified: trunk/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-dev.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-dev.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -35,12 +35,6 @@
 usr/include/kworkspace/kdisplaymanager.h
 usr/include/kworkspace/kwindowlistmenu.h
 usr/include/kworkspace/kworkspace.h
-usr/include/plasmaclock/calendar.h
-usr/include/plasmaclock/calendartable.h
-usr/include/plasmaclock/clockapplet.h
-usr/include/plasmaclock/clocknumber.h
-usr/include/plasmaclock/plasmaclock_export.h
-usr/include/plasmaclock/ui_calendar.h
 usr/include/nepomuk/nepomukquery_export.h
 usr/include/nepomuk/nepomukqueryclient_export.h
 usr/include/nepomuk/query.h
@@ -48,9 +42,15 @@
 usr/include/nepomuk/queryserviceclient.h
 usr/include/nepomuk/result.h
 usr/include/nepomuk/term.h
+usr/include/plasma/geolocation/geolocation_export.h
+usr/include/plasma/geolocation/geolocationprovider.h
 usr/include/plasma/weather/ion.h
 usr/include/plasma/weather/ion_export.h
 usr/include/plasma/weather/weatherutils.h
+usr/include/plasmaclock/calendar.h
+usr/include/plasmaclock/calendartable.h
+usr/include/plasmaclock/clockapplet.h
+usr/include/plasmaclock/plasmaclock_export.h
 usr/include/solid/control/bluetoothinputdevice.h
 usr/include/solid/control/bluetoothinterface.h
 usr/include/solid/control/bluetoothmanager.h
@@ -110,6 +110,7 @@
 usr/lib/liblsofui.so
 usr/lib/libnepomukquery.so
 usr/lib/libnepomukqueryclient.so
+usr/lib/libplasma-geolocation-interface.so
 usr/lib/libplasmaclock.so
 usr/lib/libprocesscore.so
 usr/lib/libprocessui.so
@@ -133,4 +134,3 @@
 usr/share/kde4/apps/cmake/modules/FindQEdje.cmake
 usr/share/kde4/apps/cmake/modules/FindSensors.cmake
 usr/share/kde4/apps/cmake/modules/UnixAuth.cmake
-usr/share/kde4/apps/cmake/modules/create_exe_symlink.cmake

Modified: trunk/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,34 +1,36 @@
 usr/lib/libkephal.so.4
-usr/lib/libkephal.so.4.2.0
+usr/lib/libkephal.so.4.3.0
 usr/lib/libkfontinst.so.4
-usr/lib/libkfontinst.so.4.2.0
+usr/lib/libkfontinst.so.4.3.0
 usr/lib/libkfontinstui.so.4
-usr/lib/libkfontinstui.so.4.2.0
+usr/lib/libkfontinstui.so.4.3.0
 usr/lib/libkscreensaver.so.5
 usr/lib/libkscreensaver.so.5.0.0
 usr/lib/libksgrd.so.4
-usr/lib/libksgrd.so.4.2.0
+usr/lib/libksgrd.so.4.3.0
 usr/lib/libkworkspace.so.4
-usr/lib/libkworkspace.so.4.2.0
+usr/lib/libkworkspace.so.4.3.0
 usr/lib/liblsofui.so.4
-usr/lib/liblsofui.so.4.2.0
+usr/lib/liblsofui.so.4.3.0
 usr/lib/libnepomukquery.so.4
-usr/lib/libnepomukquery.so.4.2.0
+usr/lib/libnepomukquery.so.4.3.0
 usr/lib/libnepomukqueryclient.so.4
-usr/lib/libnepomukqueryclient.so.4.2.0
+usr/lib/libnepomukqueryclient.so.4.3.0
+usr/lib/libplasma-geolocation-interface.so.4
+usr/lib/libplasma-geolocation-interface.so.4.3.0
 usr/lib/libplasma_applet-system-monitor.so.4
-usr/lib/libplasma_applet-system-monitor.so.4.2.0
+usr/lib/libplasma_applet-system-monitor.so.4.3.0
 usr/lib/libplasmaclock.so.4
-usr/lib/libplasmaclock.so.4.2.0
+usr/lib/libplasmaclock.so.4.3.0
 usr/lib/libprocesscore.so.4
-usr/lib/libprocesscore.so.4.2.0
+usr/lib/libprocesscore.so.4.3.0
 usr/lib/libprocessui.so.4
-usr/lib/libprocessui.so.4.2.0
+usr/lib/libprocessui.so.4.3.0
 usr/lib/libsolidcontrol.so.4
-usr/lib/libsolidcontrol.so.4.2.0
+usr/lib/libsolidcontrol.so.4.3.0
 usr/lib/libsolidcontrolifaces.so.4
-usr/lib/libsolidcontrolifaces.so.4.2.0
+usr/lib/libsolidcontrolifaces.so.4.3.0
 usr/lib/libtaskmanager.so.4
-usr/lib/libtaskmanager.so.4.2.0
+usr/lib/libtaskmanager.so.4.3.0
 usr/lib/libweather_ion.so.4
-usr/lib/libweather_ion.so.4.2.0
+usr/lib/libweather_ion.so.4.3.0

Modified: trunk/packages/kdebase-workspace/debian/klipper.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/klipper.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/klipper.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -6,4 +6,4 @@
 usr/share/doc/kde4/HTML/en/klipper/index.cache.bz2
 usr/share/doc/kde4/HTML/en/klipper/index.docbook
 usr/share/doc/kde4/HTML/en/klipper/screenshot.png
-usr/share/kde4/config/klipperrc
+usr/share/kde4/apps/kconf_update/klipper-kconfigxt.upd

Modified: trunk/packages/kdebase-workspace/debian/ksysguard.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/ksysguard.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/ksysguard.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -14,9 +14,8 @@
 usr/share/icons/oxygen/16x16/apps/shell.png
 usr/share/icons/oxygen/16x16/apps/unknownapp.png
 usr/share/icons/oxygen/16x16/apps/waiting.png
-usr/share/kde4/apps/ksysguard/KSysGuardApplet.xml
 usr/share/kde4/apps/ksysguard/ProcessTable.sgrd
-usr/share/kde4/apps/ksysguard/SystemLoad.sgrd
+usr/share/kde4/apps/ksysguard/SystemLoad2.sgrd
 usr/share/kde4/apps/ksysguard/ksysguard.notifyrc
 usr/share/kde4/apps/ksysguard/ksysguardui.rc
 usr/share/kde4/config/ksysguard.knsrc

Modified: trunk/packages/kdebase-workspace/debian/libkdecorations4.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/libkdecorations4.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/libkdecorations4.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,2 +1,2 @@
 usr/lib/libkdecorations.so.4
-usr/lib/libkdecorations.so.4.2.0
+usr/lib/libkdecorations.so.4.3.0

Modified: trunk/packages/kdebase-workspace/debian/not-installed
===================================================================
--- trunk/packages/kdebase-workspace/debian/not-installed	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/not-installed	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,6 +1,8 @@
 
 #no need to ship dev symlink
 ./usr/lib/libkwinnvidiahack.so
+./usr/lib/libtime_solar.so
+./usr/lib/libpolkitkdeprivate.so
 
 # Python *.pyc files
 ./usr/share/kde4/apps/plasma_scriptengine_python/pyappletscript.pyc
@@ -753,3 +755,15 @@
 ./usr/share/icons/Oxygen_Zion_Big/cursors/xterm
 ./usr/share/icons/Oxygen_Zion_Big/index.theme
 
+# headers of non-soversioned kpart
+./usr/include/systemsettingsview/BaseData.h
+./usr/include/systemsettingsview/BaseMode.h
+./usr/include/systemsettingsview/MenuItem.h
+./usr/include/systemsettingsview/MenuModel.h
+./usr/include/systemsettingsview/MenuProxyModel.h
+./usr/include/systemsettingsview/ModuleView.h
+./usr/include/systemsettingsview/systemsettingsview_export.h
+./usr/include/systemsettingsview/ToolTipManager.h
+
+# this is installed for upgrade purposes for people that build from sources
+./usr/share/autostart/plasma.desktop

Modified: trunk/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,6 +1,6 @@
 --- a/kdm/kfrontend/kgreeter.cpp
 +++ b/kdm/kfrontend/kgreeter.cpp
-@@ -416,7 +416,6 @@ void
+@@ -445,7 +445,6 @@
  KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
  {
  	int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,7 +8,7 @@
  	                  !strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
  	for (int i = 0; i < sessionTypes.size(); i++)
  		if (sessionTypes[i].type == type) {
-@@ -445,7 +444,6 @@ KGreeter::insertSessions()
+@@ -474,7 +473,6 @@
  				            dsk.readEntry( "Exec" ).toLatin1() );
  			}
  	putSession( "default", i18nc("@item:inlistbox session type", "Default"), false, "default" );

Modified: trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,6 +1,6 @@
 --- a/kcontrol/fonts/fonts.cpp
 +++ b/kcontrol/fonts/fonts.cpp
-@@ -513,12 +513,12 @@ KFonts::KFonts(QWidget *parent, const QV
+@@ -512,12 +512,12 @@
  
    // NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
  

Modified: trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -16,7 +16,7 @@
  
 --- a/kcontrol/kdm/background.cpp
 +++ b/kcontrol/kdm/background.cpp
-@@ -43,9 +43,9 @@ KBackground::KBackground( QWidget *paren
+@@ -43,9 +43,9 @@
  		" If it is disabled, you have to look after the background yourself."
  		" This is done by running some program (possibly xsetroot) in the script"
  		" specified in the Setup= option in kdmrc (usually Xsetup).") );
@@ -31,7 +31,7 @@
  	connect( m_background, SIGNAL(changed( bool )), SIGNAL(changed()) );
 --- a/kcontrol/kdm/main.cpp
 +++ b/kcontrol/kdm/main.cpp
-@@ -186,8 +186,8 @@ KDModule::KDModule( QWidget *parent, con
+@@ -185,8 +185,8 @@
  	for (tgmapci = tgmap.constBegin(); tgmapci != tgmap.constEnd(); ++tgmapci)
  		kWarning() << "user(s) '" << tgmapci.value().join( "," )
  		<< "' have unknown GID " << tgmapci.key() << endl;
@@ -55,7 +55,7 @@
  #ifdef _AIX
 --- a/kdm/kfrontend/kdmctl.c
 +++ b/kdm/kfrontend/kdmctl.c
-@@ -150,7 +150,7 @@ main( int argc, char **argv )
+@@ -150,7 +150,7 @@
  {
  	char *dpy = getenv( "DISPLAY" );
  	const char *ctl = getenv( "DM_CONTROL" );
@@ -66,7 +66,7 @@
  
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -2768,6 +2768,7 @@ fprintfLineWrap( FILE *f, const char *ms
+@@ -2768,6 +2768,7 @@
  
  
  static const char *oldkdes[] = {
@@ -74,7 +74,7 @@
  	KDE_CONFDIR,
  	"/opt/kde4/share/config",
  	"/usr/local/kde4/share/config",
-@@ -2776,6 +2777,7 @@ static const char *oldkdes[] = {
+@@ -2776,6 +2777,7 @@
  	"/usr/local/kde/share/config",
  	"/usr/local/share/config",
  	"/usr/share/config",
@@ -82,7 +82,7 @@
  
  	"/opt/kde3/share/config",
  	"/usr/local/kde3/share/config",
-@@ -2819,7 +2821,7 @@ int main( int argc, char **argv )
+@@ -2819,7 +2821,7 @@
  "    Note that you possibly need to use --no-old-kde to make this take effect.\n"
  "  --old-kde /path/to/old/kde-config-dir\n"
  "    Where to look for the kdmrc of a previously installed kdm.\n"

Modified: trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,7 +1,7 @@
 We renamed ktrash to ktrash4. See bug #494427.
 --- a/plasma/applets/trash/trash.cpp
 +++ b/plasma/applets/trash/trash.cpp
-@@ -215,7 +215,7 @@ void Trash::slotEmpty()
+@@ -217,7 +217,7 @@
          m_emptyProcess = new KProcess(this);
          connect(m_emptyProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
                  this, SLOT(emptyFinished(int,QProcess::ExitStatus)));

Modified: trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -59,9 +59,9 @@ endif(PYQT4_FOUND AND PYQT4_VERSION STRL
+@@ -60,9 +60,9 @@
  
  macro_optional_find_package(PyKDE4)
  set(PythonSupport_FOUND FALSE)

Modified: trunk/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -4,12 +4,12 @@
  # in the FIND_PATH() and FIND_LIBRARY() calls
  if( NOT WIN32 )
    find_package(PkgConfig)
--  pkg_check_modules(PC_QEdje eet qzion>=0.3.0 qedje>=0.3.0)
-+  pkg_check_modules(PC_QEdje qzion>=0.3.0 qedje>=0.3.0)
+-  pkg_check_modules(PC_QEdje eet qzion>=0.4.0 qedje>=0.4.0)
++  pkg_check_modules(PC_QEdje qzion>=0.4.0 qedje>=0.4.0)
  endif( NOT WIN32 )
  
  # use this just to create a nice message at FindPackageHandleStandardArgs
-@@ -27,10 +27,6 @@ if (PC_QEdje_FOUND)
+@@ -27,10 +27,6 @@
      HINTS
      ${PC_QEdje_INCLUDE_DIRS}
    )
@@ -20,7 +20,7 @@
  
    FIND_LIBRARY(QEDJE_QEdje_LIBRARY NAMES qedje
      PATHS
-@@ -40,20 +36,16 @@ if (PC_QEdje_FOUND)
+@@ -40,20 +36,16 @@
      PATHS
      ${PC_QEdje_LIBRARY_DIRS}
    )
@@ -35,8 +35,8 @@
 +  SET(QEDJE_INCLUDE_DIRS  ${QEDJE_QEdje_INCLUDE_DIR} ${QEDJE_QZion_INCLUDE_DIR} CACHE INTERNAL "All include directories needed for QEdje")
  
  else (PC_QEdje_FOUND)
--  MESSAGE(STATUS "Could not find QZion and/or QEdje and/or eet. Please download them here (http://dev.openbossa.org/trac/qedje).")
-+  MESSAGE(STATUS "Could not find QZion and/or QEdje. Please download them here (http://dev.openbossa.org/trac/qedje).")
+-  MESSAGE(STATUS "Could not find QZion and/or QEdje and/or eet. Please download them here (http://code.openbossa.org/projects/qedje/pages/Home).")
++  MESSAGE(STATUS "Could not find QZion and/or QEdje. Please download them here (http://code.openbossa.org/projects/qedje/pages/Home).")
  endif (PC_QEdje_FOUND)
  
  INCLUDE(FindPackageHandleStandardArgs)

Modified: trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -3,7 +3,7 @@
 which in turn includes much X stuff
 --- a/libs/taskmanager/task.h
 +++ b/libs/taskmanager/task.h
-@@ -34,11 +34,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
+@@ -34,11 +34,12 @@
  // KDE
  #include <KDE/KSharedPtr>
  #include <KDE/KWindowSystem>
@@ -19,7 +19,7 @@
  
 --- a/libs/taskmanager/task.cpp
 +++ b/libs/taskmanager/task.cpp
-@@ -40,6 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
+@@ -40,6 +40,7 @@
  #include <KDebug>
  #include <KIconLoader>
  #include <KLocale>
@@ -29,11 +29,21 @@
  
 --- a/libs/taskmanager/taskmanager.cpp
 +++ b/libs/taskmanager/taskmanager.cpp
-@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
- #include <KDebug>
+@@ -37,6 +37,7 @@
  #include <KGlobal>
  #include <KLocale>
+ #include <KStandardDirs>
 +#include <NETWinInfo>
  
  #ifdef Q_WS_X11
  #include <QX11Info>
+--- a/plasma/applets/tasks/abstracttaskitem.cpp
++++ b/plasma/applets/tasks/abstracttaskitem.cpp
+@@ -46,6 +46,7 @@
+ #include <taskmanager/task.h>
+ #include <taskmanager/taskmanager.h>
+ #include <taskmanager/taskgroup.h>
++#include <NETWinInfo>
+ 
+ #include <Plasma/Containment>
+ #include <Plasma/Corona>

Modified: trunk/packages/kdebase-workspace/debian/patches/26_run_kaboom_when_starting_kde.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/26_run_kaboom_when_starting_kde.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/26_run_kaboom_when_starting_kde.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,6 +1,6 @@
 --- a/startkde.cmake
 +++ b/startkde.cmake
-@@ -7,6 +7,16 @@
+@@ -13,6 +13,16 @@
  # because we still need to do some cleanup.
  trap 'echo GOT SIGHUP' HUP
  

Modified: trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,16 +1,16 @@
 --- a/libs/kworkspace/CMakeLists.txt
 +++ b/libs/kworkspace/CMakeLists.txt
-@@ -18,6 +18,7 @@ qt4_add_dbus_interface( kworkspace_LIB_S
- kde4_add_library(kworkspace SHARED ${kworkspace_LIB_SRCS})
+@@ -27,6 +27,7 @@
+ kde4_add_library(kworkspace ${LIB_MODE} ${kworkspace_LIB_SRCS})
  
- target_link_libraries(kworkspace  ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} )
+ target_link_libraries(kworkspace  ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} )
 +target_link_libraries(kworkspace  LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBRARY} )
  
  set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kworkspace EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 --- a/libs/taskmanager/CMakeLists.txt
 +++ b/libs/taskmanager/CMakeLists.txt
-@@ -37,6 +37,7 @@ endif (X11_Xcomposite_FOUND)
+@@ -38,6 +38,7 @@
  
  target_link_libraries(taskmanager kephal)
  

Modified: trunk/packages/kdebase-workspace/debian/plasma-dataengines-workspace.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/plasma-dataengines-workspace.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/plasma-dataengines-workspace.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,12 +1,17 @@
 usr/lib/kde4/ion_bbcukmet.so
 usr/lib/kde4/ion_envcan.so
 usr/lib/kde4/ion_noaa.so
+usr/lib/kde4/plasma-geolocation-ip.so
+usr/lib/kde4/plasma_engine_akonadi.so
 usr/lib/kde4/plasma_engine_applicationjobs.so
+usr/lib/kde4/plasma_engine_calendar.so
 usr/lib/kde4/plasma_engine_dict.so
 usr/lib/kde4/plasma_engine_executable.so
 usr/lib/kde4/plasma_engine_favicons.so
 usr/lib/kde4/plasma_engine_filebrowser.so
+usr/lib/kde4/plasma_engine_geolocation.so
 usr/lib/kde4/plasma_engine_hotplug.so
+usr/lib/kde4/plasma_engine_metadata.so
 usr/lib/kde4/plasma_engine_mouse.so
 usr/lib/kde4/plasma_engine_network.so
 usr/lib/kde4/plasma_engine_notifications.so
@@ -19,6 +24,8 @@
 usr/lib/kde4/plasma_engine_tasks.so
 usr/lib/kde4/plasma_engine_time.so
 usr/lib/kde4/plasma_engine_weather.so
+usr/lib/libtime_solar.so.4
+usr/lib/libtime_solar.so.4.3.0
 usr/share/kde4/apps/plasma/services/applicationjobs.operations
 usr/share/kde4/apps/plasma/services/notifications.operations
 usr/share/kde4/apps/plasma/services/nowplaying.operations
@@ -27,10 +34,12 @@
 usr/share/kde4/services/ion-envcan.desktop
 usr/share/kde4/services/ion-noaa.desktop
 usr/share/kde4/services/plasma-dataengine-applicationjobs.desktop
+usr/share/kde4/services/plasma-dataengine-calendar.desktop
 usr/share/kde4/services/plasma-dataengine-dict.desktop
 usr/share/kde4/services/plasma-dataengine-executable.desktop
 usr/share/kde4/services/plasma-dataengine-favicons.desktop
 usr/share/kde4/services/plasma-dataengine-filebrowser.desktop
+usr/share/kde4/services/plasma-dataengine-geolocation.desktop
 usr/share/kde4/services/plasma-dataengine-hotplug.desktop
 usr/share/kde4/services/plasma-dataengine-mouse.desktop
 usr/share/kde4/services/plasma-dataengine-network.desktop
@@ -44,4 +53,7 @@
 usr/share/kde4/services/plasma-dataengine-tasks.desktop
 usr/share/kde4/services/plasma-dataengine-time.desktop
 usr/share/kde4/services/plasma-dataengine-weather.desktop
-usr/share/kde4/servicetypes/weather_ion.desktop
+usr/share/kde4/services/plasma-engine-akonadi.desktop
+usr/share/kde4/services/plasma-engine-metadata.desktop
+usr/share/kde4/services/plasma-geolocation-ip.desktop
+usr/share/kde4/servicetypes/plasma-geolocationprovider.desktop

Modified: trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -9,12 +9,14 @@
 usr/lib/kde4/plasma_applet_launcher.so
 usr/lib/kde4/plasma_applet_lockout.so
 usr/lib/kde4/plasma_applet_pager.so
+usr/lib/kde4/plasma_applet_panelspacer_internal.so
 usr/lib/kde4/plasma_applet_quicklaunch.so
 usr/lib/kde4/plasma_applet_simplelauncher.so
 usr/lib/kde4/plasma_applet_sm_cpu.so
 usr/lib/kde4/plasma_applet_sm_hdd.so
 usr/lib/kde4/plasma_applet_sm_hwinfo.so
 usr/lib/kde4/plasma_applet_sm_net.so
+usr/lib/kde4/plasma_applet_sm_ram.so
 usr/lib/kde4/plasma_applet_sm_temperature.so
 usr/lib/kde4/plasma_applet_system-monitor.so
 usr/lib/kde4/plasma_applet_systemtray.so
@@ -22,13 +24,15 @@
 usr/lib/kde4/plasma_applet_trash.so
 usr/lib/kde4/plasma_applet_webbrowser.so
 usr/lib/kde4/plasma_containment_desktop.so
-usr/lib/kde4/plasma_containment_midpanel.so
 usr/lib/kde4/plasma_containment_panel.so
 usr/lib/kde4/plasma_containment_saverdesktop.so
+usr/lib/libkickoff.so
 usr/lib/libplasma_applet-system-monitor.so
 usr/share/kde4/apps/desktoptheme/default/calendar/mini-calendar.svgz
 usr/share/kde4/apps/desktoptheme/default/system-monitor/hdd_panel.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/battery-oxygen.svgz
+#usr/share/kde4/apps/plasma/plasmoids/ggl_photos/config.txt
+#usr/share/kde4/apps/plasma/plasmoids/ggl_rss/config.txt
 usr/share/kde4/apps/solid/actions/test-predicate-openinwindow.desktop
 usr/share/kde4/services/plasma-animator-default.desktop
 usr/share/kde4/services/plasma-applet-activitybar.desktop
@@ -36,15 +40,19 @@
 usr/share/kde4/services/plasma-applet-calendar.desktop
 usr/share/kde4/services/plasma-applet-devicenotifier.desktop
 usr/share/kde4/services/plasma-applet-digitalclock.desktop
+#usr/share/kde4/services/plasma-applet-ggl-photos.desktop
+#usr/share/kde4/services/plasma-applet-ggl-rss.desktop
 usr/share/kde4/services/plasma-applet-icon.desktop
 usr/share/kde4/services/plasma-applet-launcher.desktop
 usr/share/kde4/services/plasma-applet-lockout.desktop
+usr/share/kde4/services/plasma-applet-panelspacer-internal.desktop
 usr/share/kde4/services/plasma-applet-quicklaunch.desktop
 usr/share/kde4/services/plasma-applet-simplelauncher.desktop
 usr/share/kde4/services/plasma-applet-sm_cpu.desktop
 usr/share/kde4/services/plasma-applet-sm_hdd.desktop
 usr/share/kde4/services/plasma-applet-sm_hwinfo.desktop
 usr/share/kde4/services/plasma-applet-sm_net.desktop
+usr/share/kde4/services/plasma-applet-sm_ram.desktop
 usr/share/kde4/services/plasma-applet-sm_temperature.desktop
 usr/share/kde4/services/plasma-applet-system-monitor.desktop
 usr/share/kde4/services/plasma-applet-systemtray.desktop
@@ -52,7 +60,6 @@
 usr/share/kde4/services/plasma-applet-webbrowser.desktop
 usr/share/kde4/services/plasma-battery-default.desktop
 usr/share/kde4/services/plasma-containment-desktop.desktop
-usr/share/kde4/services/plasma-containment-midpanel.desktop
 usr/share/kde4/services/plasma-containment-panel.desktop
 usr/share/kde4/services/plasma-containment-saverdesktop.desktop
 usr/share/kde4/services/plasma-pager-default.desktop

Modified: trunk/packages/kdebase-workspace/debian/systemsettings.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/systemsettings.install	2009-06-06 17:34:31 UTC (rev 14895)
+++ trunk/packages/kdebase-workspace/debian/systemsettings.install	2009-06-06 17:46:55 UTC (rev 14896)
@@ -1,12 +1,17 @@
-etc/systemsettingsrc
 usr/bin/systemsettings
+usr/lib/kde4/classic_mode.so
+usr/lib/kde4/icon_mode.so
 usr/lib/kde4/kcm_colors.so
 usr/lib/kde4/kcm_fonts.so
 usr/lib/kde4/kcm_style.so
+usr/lib/libsystemsettingsview.so
 usr/share/applications/kde4/systemsettings.desktop
 usr/share/doc/kde4/HTML/en/systemsettings/common
 usr/share/doc/kde4/HTML/en/systemsettings/index.cache.bz2
 usr/share/doc/kde4/HTML/en/systemsettings/index.docbook
+usr/share/kde4/apps/systemsettings/classic/main.html
+usr/share/kde4/apps/systemsettings/classic/systemsettings-classic.css
+usr/share/kde4/apps/systemsettings/classic/top-right-systemsettings.png
 usr/share/kde4/apps/systemsettings/systemsettingsui.rc
 usr/share/kde4/services/colors.desktop
 usr/share/kde4/services/fonts.desktop
@@ -16,10 +21,12 @@
 usr/share/kde4/services/settings-advanced.desktop
 usr/share/kde4/services/settings-appearance.desktop
 usr/share/kde4/services/settings-bluetooth.desktop
+usr/share/kde4/services/settings-classic-view.desktop
 usr/share/kde4/services/settings-computer-administration.desktop
 usr/share/kde4/services/settings-desktop.desktop
 usr/share/kde4/services/settings-display.desktop
 usr/share/kde4/services/settings-general.desktop
+usr/share/kde4/services/settings-icon-view.desktop
 usr/share/kde4/services/settings-keyboard-and-mouse.desktop
 usr/share/kde4/services/settings-look-and-feel.desktop
 usr/share/kde4/services/settings-network-and-connectivity.desktop
@@ -32,3 +39,4 @@
 usr/share/kde4/services/settings-window-behaviour.desktop
 usr/share/kde4/services/style.desktop
 usr/share/kde4/servicetypes/systemsettingscategory.desktop
+usr/share/kde4/servicetypes/systemsettingsview.desktop

More information about the pkg-kde-commits mailing list