rev 12685 - in branches/kde4.2/packages/kdebase-workspace/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Wed Nov 19 13:44:46 UTC 2008 

Author: modax-guest
Date: 2008-11-19 13:44:45 +0000 (Wed, 19 Nov 2008)
New Revision: 12685

Added:
   branches/kde4.2/packages/kdebase-workspace/debian/kde-window-manager.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/kdm.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/klipper.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/ksysguard.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/ksysguardd.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/libkdecorations4.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/libkwineffects1.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/systemsettings.installgen
Removed:
   branches/kde4.2/packages/kdebase-workspace/debian/libplasma-dev.install
   branches/kde4.2/packages/kdebase-workspace/debian/libplasma2.bugscript
   branches/kde4.2/packages/kdebase-workspace/debian/libplasma2.install
   branches/kde4.2/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff
Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/control
   branches/kde4.2/packages/kdebase-workspace/debian/kde-window-manager.install
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.install
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.installgen
   branches/kde4.2/packages/kdebase-workspace/debian/kdm.install
   branches/kde4.2/packages/kdebase-workspace/debian/klipper.install
   branches/kde4.2/packages/kdebase-workspace/debian/ksysguard.install
   branches/kde4.2/packages/kdebase-workspace/debian/ksysguardd.install
   branches/kde4.2/packages/kdebase-workspace/debian/libkdecorations4.install
   branches/kde4.2/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
   branches/kde4.2/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
   branches/kde4.2/packages/kdebase-workspace/debian/patches/series
   branches/kde4.2/packages/kdebase-workspace/debian/rules
   branches/kde4.2/packages/kdebase-workspace/debian/systemsettings.install
Log:
kdebase-workspace trunk packaging. Lots of files moved around

Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,13 +1,29 @@
-kdebase-workspace (4:4.1.3-3) UNRELEASED; urgency=low
+kdebase-workspace (4:4.1.73+svn886439-0r1) UNRELEASED; urgency=low
 
-   +++ Changes by Fathi Boudra:
+  * New upstream development snapshot.
 
-  * Update KDM ConsoleKit support patch using libck-connector.
-    Thanks to Kevin Kofler.
-  * Add libck-connector-dev build-dependency.
+  +++ Changes by Fathi Boudra:
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 09 Nov 2008 11:53:43 +0100
+  * Add libck-connector-dev build-dependency to build ConsoleKit support.
 
+  +++ Changes by Modestas Vainius:
+
+  * Drop libplasma* packages, moved to kdelibs5.
+  * Build depend on libplasma-dev and kdelibs5-dev 4:4.1.73.
+  * Bump shlibs of libkwineffects1 to 4:4.1.73.
+  * Build depend on libxss-dev.
+  * Refresh patches 21 and 22.
+  * Missing Plasma scriptengines:
+    - GoogleGadgets
+    - QEdje
+    - Python
+  * Update install files:
+    - Add new files
+    - Move many files around mostly from kdebase-workspace-data to their
+      real packages. As a result, add many replaces.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 19 Nov 2008 15:09:01 +0200
+
 kdebase-workspace (4:4.1.3-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: branches/kde4.2/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/control	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/control	2008-11-19 13:44:45 UTC (rev 12685)
@@ -3,8 +3,8 @@
 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>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0),
- kdelibs5-dev (>= 4:4.1.3-2),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt,
+ kdelibs5-dev (>= 4:4.1.73), libplasma-dev (>= 4:4.1.73),
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libcaptury-dev, libck-connector-dev, libdbus-1-dev, libnm-util-dev, network-manager-dev,
  libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), libraw1394-dev, libsensors-dev,
@@ -12,7 +12,8 @@
  libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxklavier12-dev,
  libxrandr-dev, libxrender-dev, libxxf86misc-dev, 
  libsmbclient-dev, libxcb1-dev, libxine-dev, libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev,
- libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev
+ libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev,
+ libxss-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-workspace
@@ -41,8 +42,9 @@
 Depends: ${shlibs:Depends}, kdebase-workspace-data (= ${source:Version}),
  x11-utils, x11-xserver-utils
 Suggests: x11-xkb-utils
-Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip
-Conflicts: kcontrol, libplasma1
+Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
+ kde-window-manager (<< 4:4.1.73)
+Conflicts: kcontrol, libplasma1, libplasma2
 Description: core binaries for the KDE 4 base workspace module
  This package contains miscellaneous programs needed for a basic KDE 4 desktop
  installation.
@@ -53,7 +55,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: ksysguard (<= 4:4.0.72-1), kdebase-workspace-bin (<= 4:4.0.72-1)
+Replaces: ksysguard (<= 4:4.0.72-1), kdebase-workspace-bin (<= 4:4.0.72-1), libplasma2
+Conflicts: libplasma2
 Description: libraries provided by the KDE 4 base workspace module
  This package contains miscellaneous libraries needed for a basic KDE 4 desktop
  installation.
@@ -65,9 +68,9 @@
 Architecture: all
 Depends: oxygencursors
 Conflicts: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
- kmenuedit, ktip, libplasma1
+ kmenuedit, ktip, libplasma1, systemsettings (<< 4:4.1.73)
 Replaces: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
- kmenuedit, ktip, kdebase-runtime-data (<< 4:4.1.3)
+ kmenuedit, ktip, kdebase-runtime-data (<< 4:4.1.3), kde-window-manager (<< 4:4.1.73)
 Description: shared data files for the KDE 4 base workspace module
  This package contains architecture-independent shared data files needed for a
  basic KDE 4 desktop installation.
@@ -79,8 +82,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, kdebase-workspace-libs4+5 (= ${binary:Version}),
  libkwineffects1 (= ${binary:Version}), libkdecorations4 (= ${binary:Version}),
- libplasma-dev (= ${binary:Version}),
  ${sameVersionDep:kdelibs5-dev:kdebase-workspace-bin}
+Replaces: kdebase-workspace-data (<< 4:4.1.73), ksysguard (<< 4:4.1.73)
 Description: development files for the KDE 4 base workspace module
  This package contains development files for building software that uses
  libraries from the KDE 4 base workspace module.
@@ -92,7 +95,7 @@
 Recommends: logrotate, xserver-xorg-core | xserver,
  kdebase | x-session-manager | x-window-manager, xterm | x-terminal-emulator
 Suggests: kdepasswd
-Replaces: kdebase-workspace-data (<< 4:4.0.1-1)
+Replaces: kdebase-workspace-data (<< 4:4.1.73), kdebase-workspace-bin (<< 4:4.1.73)
 Conflicts: desktop-base (<< 4.0.4)
 Provides: x-display-manager
 Description: KDE Display Manager for X11
@@ -109,6 +112,7 @@
 Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: kdebase-workspace-data (<< 4:4.1.73)
 Description: clipboard utility for KDE 4
  Klipper is the KDE 4 clipboard utility. It stores a history of the clipboard
  contents and can automatically perform actions when certain items are
@@ -120,6 +124,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: kdebase-workspace-data (<< 4:4.1.73)
 Description: System Guard Daemon for KDE 4
  KDE System Guard Daemon can be installed on a remote system so that the KDE
  System Guard can connect to and monitor it.
@@ -131,6 +136,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: ksysguardd (= ${binary:Version})
+Replaces: kdebase-workspace-data (<< 4:4.1.73)
 Description: System Guard for KDE 4
  KDE System Guard allows you to monitor various statistics about your system.
  .
@@ -144,7 +150,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Provides: x-window-manager
-Replaces: kdebase-workspace-data (<< 4:4.0.1-1), kwin, kdebase-runtime-data (<< 4:4.0.81)
+Replaces: kdebase-workspace-data (<< 4:4.1.73), kwin, kdebase-runtime-data (<< 4:4.0.81)
 Conflicts: kwin
 Description: the KDE 4 window manager (KWin)
  This package contains KWin, the KDE 4 window manager, featuring 
@@ -179,7 +185,7 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdebase-workspace-bin (<= 4:4.0.98-1)
+Replaces: kdebase-workspace-bin (<= 4:4.0.98-1), kdebase-workspace-data (<< 4:4.1.73)
 Description: KDE 4 System Settings
  System Settings is an improved user interface for configuring the desktop
  and other aspects of the system.
@@ -197,40 +203,3 @@
 Description: debugging symbols for the KDE 4 base workspace module
  This package contains debugging files used to investigate problems with
  binaries included in the KDE 4 base workspace module.
-
-Package: libplasma2
-Section: libs
-Architecture: any
-Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-workspace-data (= ${source:Version})
-Provides: ${plasma:abi-provides}
-Replaces: libplasma1
-Conflicts: libplasma1
-Description: library for the KDE 4 Plasma desktop
- Plasma is one of the key technologies of KDE 4 (also known as the "Pillars
- of KDE"), and one of the most visible to users. It is the component that
- is "in charge" of the desktop interface; the desktop, panel (often referred
- simply as the task bar), and related elements. Plasma aims to change the
- traditional concepts of the "Desktop", incorporating semantic application
- elements, and bringing cooperating technologies to the user's fingertips in
- a way that is visually appealing while easing work flow.
- .
- This package contains the KDE 4 Plasma library and plugins. It is part of the
- KDE 4 base workspace module.
-
-Package: libplasma-dev
-Section: libdevel
-Architecture: any
-Priority: optional
-Depends: libplasma2 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:libplasma2}
-Description: development files for the KDE 4 Plasma desktop
- Plasma is one of the key technologies of KDE 4 (also known as the "Pillars
- of KDE"), and one of the most visible to users. It is the component that
- is "in charge" of the desktop interface; the desktop, panel (often referred
- simply as the task bar), and related elements. Plasma aims to change the
- traditional concepts of the "Desktop", incorporating semantic application
- elements, and bringing cooperating technologies to the user's fingertips in
- a way that is visually appealing while easing work flow.
- .
- This package contains headers and other development files needed to build
- software that uses the KDE 4 Plasma library.

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kde-window-manager.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kde-window-manager.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kde-window-manager.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -3,7 +3,6 @@
 usr/bin/kwin_rules_dialog
 usr/lib/kconf_update_bin/kwin_update_default_rules
 usr/lib/kconf_update_bin/kwin_update_window_settings
-usr/lib/kconf_update_bin/plasma-add-shortcut-to-menu
 usr/lib/kde4/kcm_kwin4_effect_builtins.so
 usr/lib/kde4/kcm_kwin4_effect_videorecord.so
 usr/lib/kde4/kcm_kwincompositing.so
@@ -28,22 +27,32 @@
 usr/lib/kde4/kwin_kde2_config.so
 usr/lib/kde4/kwin_keramik_config.so
 usr/lib/kde4/kwin_modernsys_config.so
+usr/lib/kde4/kwin_oxygen_config.so
 usr/lib/kde4/kwin_ozone_config.so
 usr/lib/kde4/kwin_plastik_config.so
 usr/lib/kde4/kwin_quartz_config.so
 usr/lib/libkdeinit4_kwin.so
 usr/lib/libkdeinit4_kwin_rules_dialog.so
 usr/lib/libkwinnvidiahack.so.4
-usr/lib/libkwinnvidiahack.so.4.1.0
-usr/share/dbus-1/interfaces/org.kde.KWin.xml
+usr/lib/libkwinnvidiahack.so.4.2.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
 usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/buttons.png
 usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/common
 usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/main.png
+usr/share/icons/oxygen/128x128/apps/kcmkwm.png
+usr/share/icons/oxygen/16x16/apps/kcmkwm.png
 usr/share/icons/oxygen/16x16/apps/kwin.png
+usr/share/icons/oxygen/22x22/apps/kcmkwm.png
+usr/share/icons/oxygen/32x32/apps/kcmkwm.png
 usr/share/icons/oxygen/32x32/apps/kwin.png
+usr/share/icons/oxygen/48x48/apps/kcmkwm.png
 usr/share/icons/oxygen/48x48/apps/kwin.png
+usr/share/icons/oxygen/64x64/apps/kcmkwm.png
+usr/share/icons/oxygen/scalable/apps/kcmkwm.svgz
 usr/share/icons/oxygen/scalable/apps/kwin.svgz
 usr/share/kde4/apps/kconf_update/kwin.upd
 usr/share/kde4/apps/kconf_update/kwin3_plugin.pl
@@ -54,10 +63,12 @@
 usr/share/kde4/apps/kconf_update/kwin_focus2.upd
 usr/share/kde4/apps/kconf_update/kwin_fsp_workarounds_1.upd
 usr/share/kde4/apps/kconf_update/kwin_on_off.upd
+usr/share/kde4/apps/kconf_update/kwin_window_shortcuts.sh
+usr/share/kde4/apps/kconf_update/kwin_window_shortcuts.upd
 usr/share/kde4/apps/kconf_update/kwiniconify.upd
 usr/share/kde4/apps/kconf_update/kwinsticky.upd
 usr/share/kde4/apps/kconf_update/kwinupdatewindowsettings.upd
-usr/share/kde4/apps/kconf_update/plasma-add-shortcut-to-menu.upd
+usr/share/kde4/apps/kconf_update/on-off_to_true-false.sh
 usr/share/kde4/apps/kconf_update/pluginlibFix.pl
 usr/share/kde4/apps/kwin/b2.desktop
 usr/share/kde4/apps/kwin/blur-render.frag
@@ -66,6 +77,9 @@
 usr/share/kde4/apps/kwin/blur.vert
 usr/share/kde4/apps/kwin/circle-edgy.png
 usr/share/kde4/apps/kwin/circle.png
+usr/share/kde4/apps/kwin/cubecap.png
+usr/share/kde4/apps/kwin/cylinder.frag
+usr/share/kde4/apps/kwin/cylinder.vert
 usr/share/kde4/apps/kwin/default_rules/fsp_workarounds_1.kwinrules
 usr/share/kde4/apps/kwin/default_rules/plasma_desktop_containment.kwinrules
 usr/share/kde4/apps/kwin/explosion-end.png
@@ -89,14 +103,23 @@
 usr/share/kde4/apps/kwin/shadow-texture.png
 usr/share/kde4/apps/kwin/sharpen.frag
 usr/share/kde4/apps/kwin/sharpen.vert
+usr/share/kde4/apps/kwin/snow.frag
+usr/share/kde4/apps/kwin/snow.vert
 usr/share/kde4/apps/kwin/snowflake.png
+usr/share/kde4/apps/kwin/sphere.vert
 usr/share/kde4/apps/kwin/trackmouse.png
 usr/share/kde4/apps/kwin/web.desktop
 usr/share/kde4/config.kcfg/kwin.kcfg
+usr/share/kde4/services/desktop.desktop
 usr/share/kde4/services/kwin/blur.desktop
 usr/share/kde4/services/kwin/boxswitch.desktop
+usr/share/kde4/services/kwin/boxswitch_config.desktop
 usr/share/kde4/services/kwin/coverswitch.desktop
 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/desktopgrid.desktop
 usr/share/kde4/services/kwin/desktopgrid_config.desktop
 usr/share/kde4/services/kwin/dialogparent.desktop
@@ -114,6 +137,7 @@
 usr/share/kde4/services/kwin/logout.desktop
 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/magnifier.desktop
 usr/share/kde4/services/kwin/magnifier_config.desktop
 usr/share/kde4/services/kwin/maketransparent.desktop
@@ -131,8 +155,12 @@
 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/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

Added: branches/kde4.2/packages/kdebase-workspace/debian/kde-window-manager.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kde-window-manager.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kde-window-manager.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,2 @@
+from:kwin
+dst:kwin

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -7,7 +7,6 @@
 usr/bin/kdostartupconfig4
 usr/bin/kfontinst
 usr/bin/kfontview
-usr/bin/khotkeys
 usr/bin/kmenuedit
 usr/bin/krandom.kss
 usr/bin/krandrtray
@@ -19,9 +18,13 @@
 usr/bin/ksplashx_scale
 usr/bin/kstartupconfig4
 usr/bin/ksystraycmd
+usr/bin/kwrited
 usr/bin/kxkb
 usr/bin/plasma
+usr/bin/plasma-mid
+usr/bin/plasma-overlay
 usr/bin/plasmaengineexplorer
+usr/bin/plasmapkg
 usr/bin/plasmoidviewer
 usr/bin/safestartkde
 usr/bin/solid-bluetooth
@@ -29,6 +32,8 @@
 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/kde4/fontthumbnail.so
 usr/lib/kde4/ion_bbcukmet.so
 usr/lib/kde4/ion_envcan.so
@@ -37,55 +42,115 @@
 usr/lib/kde4/kcm_autostart.so
 usr/lib/kde4/kcm_bell.so
 usr/lib/kde4/kcm_clock.so
+usr/lib/kde4/kcm_desktopthemedetails.so
 usr/lib/kde4/kcm_display.so
 usr/lib/kde4/kcm_energy.so
 usr/lib/kde4/kcm_fontinst.so
+usr/lib/kde4/kcm_hotkeys.so
 usr/lib/kde4/kcm_input.so
 usr/lib/kde4/kcm_joystick.so
-usr/lib/kde4/kcm_kdm.so
 usr/lib/kde4/kcm_keyboard.so
 usr/lib/kde4/kcm_keyboard_layout.so
 usr/lib/kde4/kcm_keys.so
-usr/lib/kde4/kcm_khotkeys.so
+usr/lib/kde4/kcm_krunner_shell.so
 usr/lib/kde4/kcm_ksplashthemes.so
 usr/lib/kde4/kcm_launch.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_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_powerdevil.so
 usr/lib/kde4/kfontviewpart.so
-usr/lib/kde4/kgreet_generic.so
 usr/lib/kde4/kio_fonts.so
 usr/lib/kde4/krunner_bookmarksrunner.so
 usr/lib/kde4/krunner_calculatorrunner.so
 usr/lib/kde4/krunner_locations.so
+usr/lib/kde4/krunner_nepomuksearchrunner.so
+usr/lib/kde4/krunner_placesrunner.so
+usr/lib/kde4/krunner_powerdevil.so
+usr/lib/kde4/krunner_recentdocuments.so
 usr/lib/kde4/krunner_services.so
 usr/lib/kde4/krunner_sessions.so
 usr/lib/kde4/krunner_shell.so
 usr/lib/kde4/krunner_webshortcuts.so
 usr/lib/kde4/kstyle_keramik_config.so
-usr/lib/kde4/kwin_oxygen_config.so
 usr/lib/kde4/libexec/kcheckpass
 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/test_kcm_xinerama
+usr/lib/kde4/plasma_animator_default.so
+usr/lib/kde4/plasma_applet_activitybar.so
+usr/lib/kde4/plasma_applet_battery.so
+usr/lib/kde4/plasma_applet_calendar.so
+usr/lib/kde4/plasma_applet_clock.so
+usr/lib/kde4/plasma_applet_devicenotifier.so
+usr/lib/kde4/plasma_applet_dig_clock.so
+usr/lib/kde4/plasma_applet_icon.so
+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_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_temperature.so
+usr/lib/kde4/plasma_applet_system-monitor.so
+usr/lib/kde4/plasma_applet_systemtray.so
+usr/lib/kde4/plasma_applet_tasks.so
+usr/lib/kde4/plasma_applet_trash.so
+usr/lib/kde4/plasma_applet_webbrowser.so
+usr/lib/kde4/plasma_appletscriptengine_dashboard.so
+usr/lib/kde4/plasma_appletscriptengine_webapplet.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/kde4/plasma_engine_applicationjobs.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_hotplug.so
+usr/lib/kde4/plasma_engine_mouse.so
+usr/lib/kde4/plasma_engine_network.so
+usr/lib/kde4/plasma_engine_notifications.so
+usr/lib/kde4/plasma_engine_nowplaying.so
+usr/lib/kde4/plasma_engine_places.so
+usr/lib/kde4/plasma_engine_powermanagement.so
+usr/lib/kde4/plasma_engine_soliddevice.so
+usr/lib/kde4/plasma_engine_systemmonitor.so
+usr/lib/kde4/plasma_engine_tasks.so
+usr/lib/kde4/plasma_engine_time.so
+usr/lib/kde4/plasma_engine_weather.so
+usr/lib/kde4/plasma_packagestructure_dashboard.so
+usr/lib/kde4/plasma_packagestructure_web.so
+usr/lib/kde4/plasma_runner_scriptengine_qscript.so
+usr/lib/kde4/plasma_scriptengine_qscript.so
+usr/lib/kde4/plasma_wallpaper_color.so
+usr/lib/kde4/plasma_wallpaper_image.so
 usr/lib/kde4/solid_bluez.so
-usr/lib/kde4/solid_fakebluetooth.so
 usr/lib/kde4/solid_fakenet.so
 usr/lib/kde4/solid_hal_power.so
 usr/lib/kde4/solid_networkmanager.so
 usr/lib/libkdeinit4_kaccess.so
 usr/lib/libkdeinit4_kcminit.so
 usr/lib/libkdeinit4_kcminit_startup.so
-usr/lib/libkdeinit4_khotkeys.so
 usr/lib/libkdeinit4_kmenuedit.so
 usr/lib/libkdeinit4_krunner.so
 usr/lib/libkdeinit4_ksmserver.so
 usr/lib/libkdeinit4_kxkb.so
+usr/lib/libkdeinit4_plasma-mid.so
 usr/lib/libkdeinit4_plasma.so
+usr/lib/libkephal.so
+usr/lib/libplasma_applet-system-monitor.so
 usr/lib/strigi/strigita_font.so

Added: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,5 @@
+depends last
+
+dst:usr/bin
+mime:application/x-executable
+mime:application/x-sharedlib

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,15 +1,10 @@
 usr/share/applications/kde4/kfontview.desktop
 usr/share/applications/kde4/kmenuedit.desktop
 usr/share/applications/kde4/krandrtray.desktop
-usr/share/autostart/khotkeys.desktop
 usr/share/autostart/krunner.desktop
+usr/share/autostart/kwrited-autostart.desktop
 usr/share/autostart/plasma.desktop
-usr/share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
-usr/share/dbus-1/interfaces/org.kde.KSMServerInterface.xml
-usr/share/dbus-1/interfaces/org.kde.khotkeys.xml
-usr/share/dbus-1/interfaces/org.kde.krunner.App.xml
-usr/share/dbus-1/interfaces/org.kde.krunner.Interface.xml
-usr/share/dbus-1/interfaces/org.kde.screensaver.xml
+usr/share/dbus-1/services/org.kde.krunner.service
 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
@@ -42,7 +37,7 @@
 usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/kcmdisplay/common  
+usr/share/doc/kde4/HTML/en/kcontrol/kcmdisplay/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmdisplay/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmdisplay/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/kcmsmserver/common
@@ -60,7 +55,10 @@
 usr/share/doc/kde4/HTML/en/kcontrol/mouse/common
 usr/share/doc/kde4/HTML/en/kcontrol/mouse/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/mouse/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/screensaver/common 
+usr/share/doc/kde4/HTML/en/kcontrol/powerdevilconfig/common
+usr/share/doc/kde4/HTML/en/kcontrol/powerdevilconfig/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/powerdevilconfig/index.docbook
+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/splashscreen/common
@@ -74,9 +72,6 @@
 usr/share/doc/kde4/HTML/en/kcontrol/windowspecific/common
 usr/share/doc/kde4/HTML/en/kcontrol/windowspecific/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/windowspecific/index.docbook
-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/doc/kde4/HTML/en/kmenuedit/common
 usr/share/doc/kde4/HTML/en/kmenuedit/done.png
 usr/share/doc/kde4/HTML/en/kmenuedit/index.cache.bz2
@@ -84,27 +79,21 @@
 usr/share/doc/kde4/HTML/en/kmenuedit/itemname.png
 usr/share/doc/kde4/HTML/en/kmenuedit/kmenueditmain.png
 usr/share/doc/kde4/HTML/en/kmenuedit/new.png
+usr/share/doc/kde4/HTML/en/kmenuedit/reset.png
 usr/share/doc/kde4/HTML/en/kmenuedit/selecticon.png
 usr/share/doc/kde4/HTML/en/kmenuedit/selectinternet.png
-usr/share/doc/kde4/HTML/en/ksysguard/index.cache.bz2
-usr/share/doc/kde4/HTML/en/ksysguard/index.docbook
 usr/share/doc/kde4/HTML/en/kxkb/common
 usr/share/doc/kde4/HTML/en/kxkb/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kxkb/index.docbook
 usr/share/doc/kde4/HTML/en/plasma/common
 usr/share/doc/kde4/HTML/en/plasma/index.cache.bz2
 usr/share/doc/kde4/HTML/en/plasma/index.docbook
-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/icons/hicolor/128x128/apps/ksplash.png
-usr/share/icons/hicolor/16x16/apps/khotkeys.png
 usr/share/icons/hicolor/16x16/apps/kmenuedit.png
 usr/share/icons/hicolor/16x16/apps/ksplash.png
 usr/share/icons/hicolor/16x16/apps/kxkb.png
 usr/share/icons/hicolor/22x22/apps/kmenuedit.png
 usr/share/icons/hicolor/22x22/apps/ksplash.png
-usr/share/icons/hicolor/32x32/apps/khotkeys.png
 usr/share/icons/hicolor/32x32/apps/kmenuedit.png
 usr/share/icons/hicolor/32x32/apps/ksplash.png
 usr/share/icons/hicolor/32x32/apps/kxkb.png
@@ -112,36 +101,20 @@
 usr/share/icons/hicolor/48x48/apps/ksplash.png
 usr/share/icons/hicolor/48x48/apps/kxkb.png
 usr/share/icons/hicolor/64x64/apps/ksplash.png
-usr/share/icons/oxygen/128x128/apps/kcmkwm.png
 usr/share/icons/oxygen/128x128/mimetypes/fonts-package.png
-usr/share/icons/oxygen/16x16/apps/computer.png
-usr/share/icons/oxygen/16x16/apps/daemon.png
-usr/share/icons/oxygen/16x16/apps/kcmkwm.png
-usr/share/icons/oxygen/16x16/apps/kdeapp.png
-usr/share/icons/oxygen/16x16/apps/kernel.png
 usr/share/icons/oxygen/16x16/apps/kfontview.png
-usr/share/icons/oxygen/16x16/apps/ksysguardd.png
-usr/share/icons/oxygen/16x16/apps/running.png
-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/icons/oxygen/16x16/mimetypes/fonts-package.png
-usr/share/icons/oxygen/22x22/apps/kcmkwm.png
 usr/share/icons/oxygen/22x22/apps/kfontview.png
 usr/share/icons/oxygen/22x22/apps/networkmanager.png
 usr/share/icons/oxygen/22x22/mimetypes/fonts-package.png
-usr/share/icons/oxygen/32x32/apps/kcmkwm.png
 usr/share/icons/oxygen/32x32/apps/kfontview.png
 usr/share/icons/oxygen/32x32/apps/networkmanager.png
 usr/share/icons/oxygen/32x32/mimetypes/fonts-package.png
-usr/share/icons/oxygen/48x48/apps/kcmkwm.png
 usr/share/icons/oxygen/48x48/apps/kfontview.png
 usr/share/icons/oxygen/48x48/mimetypes/fonts-package.png
-usr/share/icons/oxygen/64x64/apps/kcmkwm.png
 usr/share/icons/oxygen/64x64/apps/kfontview.png
 usr/share/icons/oxygen/64x64/apps/networkmanager.png
 usr/share/icons/oxygen/64x64/mimetypes/fonts-package.png
-usr/share/icons/oxygen/scalable/apps/kcmkwm.svgz
 usr/share/icons/oxygen/scalable/apps/kfontview.svgz
 usr/share/icons/oxygen/scalable/apps/preferences-desktop-font-installer.svgz
 usr/share/icons/oxygen/scalable/mimetypes/fonts-package.svgz
@@ -152,34 +125,49 @@
 usr/share/kde4/apps/color-schemes/Steel.colors
 usr/share/kde4/apps/color-schemes/WontonSoup.colors
 usr/share/kde4/apps/desktoptheme/default/colors
-usr/share/kde4/apps/desktoptheme/default/dialogs/background.svg
-usr/share/kde4/apps/desktoptheme/default/dialogs/krunner.svg
-usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.source.svg
-usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.svg
+usr/share/kde4/apps/desktoptheme/default/dialogs/background.svgz
+usr/share/kde4/apps/desktoptheme/default/dialogs/kickoff.svgz
+usr/share/kde4/apps/desktoptheme/default/dialogs/krunner.svgz
+usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.source.svgz
+usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.svgz
 usr/share/kde4/apps/desktoptheme/default/metadata.desktop
-usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/background.svg
-usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/krunner.svg
-usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svg
-usr/share/kde4/apps/desktoptheme/default/opaque/widgets/panel-background.svg
-usr/share/kde4/apps/desktoptheme/default/opaque/widgets/tooltip.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/analog_meter.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/background.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/bar_meter_horizontal.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/bar_meter_vertical.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/battery-oxygen.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/battery.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/branding.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/clock.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/connection-established.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/containment-controls.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/pager.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/panel-background.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/plot-background.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/systemtray.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/tasks.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/toolbox-button.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/tooltip.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/translucentbackground.svg
+usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/background.svgz
+usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/krunner.svgz
+usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svgz
+usr/share/kde4/apps/desktoptheme/default/opaque/widgets/extender-background.svgz
+usr/share/kde4/apps/desktoptheme/default/opaque/widgets/panel-background.svgz
+usr/share/kde4/apps/desktoptheme/default/opaque/widgets/tooltip.svgz
+usr/share/kde4/apps/desktoptheme/default/system-monitor/hdd_panel.svgz
+usr/share/kde4/apps/desktoptheme/default/systemtray/bar_meter_horizontal.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/analog_meter.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/arrows.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/background.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/bar_meter_horizontal.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/bar_meter_vertical.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/battery-oxygen.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/branding.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/busywidget.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/button.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/calendar.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/clock.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/configuration-icons.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/connection-established.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/containment-controls.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/dragger.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/extender-background.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/extender-dragger.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/frame.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/glowbar.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/monitor.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/pager.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/panel-background.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/plot-background.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/scrollbar.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/systemtray.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/tasks.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/tooltip.svgz
+usr/share/kde4/apps/desktoptheme/default/widgets/translucentbackground.svgz
+usr/share/kde4/apps/desktopthemedetails/themeitems
 usr/share/kde4/apps/kaccess/kaccess.notifyrc
 usr/share/kde4/apps/kcminput/cursor_large_black.pcf.gz
 usr/share/kde4/apps/kcminput/cursor_large_white.pcf.gz
@@ -199,16 +187,15 @@
 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/on-off_to_true-false.sh
-usr/share/kde4/apps/kcontrol/pics/anchor.png
+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/kcontrol/pics/logo.png
 usr/share/kde4/apps/kcontrol/pics/mini-world.png
-usr/share/kde4/apps/kcontrol/pics/monitor.png
 usr/share/kde4/apps/kdisplay/app-defaults/AAAAAAGeneral.ad
 usr/share/kde4/apps/kdisplay/app-defaults/AAAMotif.ad
 usr/share/kde4/apps/kdisplay/app-defaults/AAATk.ad
@@ -229,7 +216,6 @@
 usr/share/kde4/apps/kdisplay/app-defaults/Xawtv.ad
 usr/share/kde4/apps/kdisplay/app-defaults/Xdvi.ad
 usr/share/kde4/apps/kdisplay/app-defaults/Xpdf.ad
-usr/share/kde4/apps/kdm/sessions/kde.desktop
 usr/share/kde4/apps/kdm/sessions/kde.desktop usr/share/xsessions
 usr/share/kde4/apps/kfontinst/icons/oxygen/16x16/actions/addfont.png
 usr/share/kde4/apps/kfontinst/icons/oxygen/16x16/actions/disablefont.png
@@ -254,10 +240,6 @@
 usr/share/kde4/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new_sep.png
 usr/share/kde4/apps/kmenuedit/kmenueditui.rc
 usr/share/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-usr/share/kde4/apps/ksmserver/windowmanagers/compiz-custom.desktop
-usr/share/kde4/apps/ksmserver/windowmanagers/compiz.desktop
-usr/share/kde4/apps/ksmserver/windowmanagers/metacity.desktop
-usr/share/kde4/apps/ksmserver/windowmanagers/openbox.desktop
 usr/share/kde4/apps/ksplash/Themes/Default/1024x768/background.png
 usr/share/kde4/apps/ksplash/Themes/Default/1280x1024/background.png
 usr/share/kde4/apps/ksplash/Themes/Default/1600x1200/background.png
@@ -307,14 +289,30 @@
 usr/share/kde4/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
 usr/share/kde4/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
 usr/share/kde4/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
+usr/share/kde4/apps/kwrited/kwrited.notifyrc
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleButton.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleInfoButton.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
+usr/share/kde4/apps/plasma/dashboard/AppleClasses/AppleSlider.js
+usr/share/kde4/apps/plasma/dashboard/button/genericButton.js
+usr/share/kde4/apps/plasma/services/applicationjobs.operations
+usr/share/kde4/apps/plasma/services/notifications.operations
+usr/share/kde4/apps/plasma/services/nowplaying.operations
+usr/share/kde4/apps/plasma_scriptengine_ruby/applet.rb
+usr/share/kde4/apps/plasma_scriptengine_ruby/data_engine.rb
+usr/share/kde4/apps/plasma_scriptengine_ruby/package_ruboid.rb
+usr/share/kde4/apps/powerdevil/default.powerdevilprofiles
+usr/share/kde4/apps/powerdevil/powerdevil.notifyrc
 usr/share/kde4/apps/solid/actions/test-predicate-openinwindow.desktop
-usr/share/kde4/apps/solidfakebluetoothbackend/fakebluetooth.xml
 usr/share/kde4/apps/solidfakenetbackend/fakenetworking.xml
 usr/share/kde4/config.kcfg/klaunch.kcfg
 usr/share/kde4/config.kcfg/kscreensaversettings.kcfg
-usr/share/kde4/config/background.knsrc
+usr/share/kde4/config.kcfg/plasma-shell-desktop.kcfg
 usr/share/kde4/config/colorschemes.knsrc
 usr/share/kde4/config/ksplash.knsrc
+usr/share/kde4/config/plasma-overlayrc
 usr/share/kde4/config/plasma-themes.knsrc
 usr/share/kde4/config/wallpaper.knsrc
 usr/share/kde4/services/ScreenSavers/kblank.desktop
@@ -324,21 +322,26 @@
 usr/share/kde4/services/bell.desktop
 usr/share/kde4/services/clock.desktop
 usr/share/kde4/services/colors.desktop
-usr/share/kde4/services/desktop.desktop
+usr/share/kde4/services/desktopthemedetails.desktop
 usr/share/kde4/services/display.desktop
 usr/share/kde4/services/energy.desktop
 usr/share/kde4/services/fontinst.desktop
 usr/share/kde4/services/fonts.desktop
 usr/share/kde4/services/fonts.protocol
 usr/share/kde4/services/fontthumbnail.desktop
+usr/share/kde4/services/ion-bbcukmet.desktop
+usr/share/kde4/services/ion-envcan.desktop
+usr/share/kde4/services/ion-noaa.desktop
 usr/share/kde4/services/joystick.desktop
 usr/share/kde4/services/kaccess.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/khotkeys.desktop
 usr/share/kde4/services/kded/networkstatus.desktop
+usr/share/kde4/services/kded/powerdevil.desktop
 usr/share/kde4/services/keyboard.desktop
 usr/share/kde4/services/keyboard_layout.desktop
 usr/share/kde4/services/keys.desktop
@@ -347,60 +350,83 @@
 usr/share/kde4/services/ksplashthememgr.desktop
 usr/share/kde4/services/mouse.desktop
 usr/share/kde4/services/plasma-animator-default.desktop
+usr/share/kde4/services/plasma-applet-activitybar.desktop
 usr/share/kde4/services/plasma-applet-analogclock.desktop
+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-icon.desktop
 usr/share/kde4/services/plasma-applet-launcher.desktop
 usr/share/kde4/services/plasma-applet-lockout.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_temperature.desktop
+usr/share/kde4/services/plasma-applet-system-monitor.desktop
 usr/share/kde4/services/plasma-applet-systemtray.desktop
 usr/share/kde4/services/plasma-applet-trash.desktop
+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-dataengine-applicationjobs.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-hotplug.desktop
 usr/share/kde4/services/plasma-dataengine-mouse.desktop
+usr/share/kde4/services/plasma-dataengine-network.desktop
+usr/share/kde4/services/plasma-dataengine-notifications.desktop
 usr/share/kde4/services/plasma-dataengine-nowplaying.desktop
 usr/share/kde4/services/plasma-dataengine-places.desktop
 usr/share/kde4/services/plasma-dataengine-powermanagement.desktop
 usr/share/kde4/services/plasma-dataengine-soliddevice.desktop
+usr/share/kde4/services/plasma-dataengine-systemmonitor.desktop
 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/services/plasma-packagestructure-dashboard.desktop
+usr/share/kde4/services/plasma-packagestructure-web.desktop
 usr/share/kde4/services/plasma-pager-default.desktop
 usr/share/kde4/services/plasma-runner-bookmarks.desktop
 usr/share/kde4/services/plasma-runner-calculator.desktop
 usr/share/kde4/services/plasma-runner-locations.desktop
+usr/share/kde4/services/plasma-runner-nepomuksearch.desktop
+usr/share/kde4/services/plasma-runner-places.desktop
+usr/share/kde4/services/plasma-runner-powerdevil.desktop
 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-runner-xesam.desktop
 usr/share/kde4/services/plasma-scriptengine-applet-dashboard.desktop
 usr/share/kde4/services/plasma-scriptengine-applet-web.desktop
 usr/share/kde4/services/plasma-scriptengine-qscript.desktop
 usr/share/kde4/services/plasma-scriptengine-qscriptrunner.desktop
+usr/share/kde4/services/plasma-scriptengine-ruby-applet.desktop
+usr/share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
+usr/share/kde4/services/plasma-scriptengine-ruby-package.desktop
 usr/share/kde4/services/plasma-tasks-default.desktop
+usr/share/kde4/services/plasma-wallpaper-color.desktop
+usr/share/kde4/services/plasma-wallpaper-image.desktop
+usr/share/kde4/services/powerdevilconfig.desktop
 usr/share/kde4/services/randr.desktop
+usr/share/kde4/services/recentdocuments.desktop
 usr/share/kde4/services/screensaver.desktop
+usr/share/kde4/services/settings-input-actions.desktop
 usr/share/kde4/services/solidbackends/solid_bluez.desktop
-usr/share/kde4/services/solidbackends/solid_fakebluetooth.desktop
 usr/share/kde4/services/solidbackends/solid_fakenet.desktop
 usr/share/kde4/services/solidbackends/solid_hal_power.desktop
 usr/share/kde4/services/solidbackends/solid_networkmanager.desktop
+usr/share/kde4/services/standard_actions.desktop
 usr/share/kde4/services/style.desktop
 usr/share/kde4/services/xinerama.desktop
-usr/share/kde4/servicetypes/plasma-animator.desktop
-usr/share/kde4/servicetypes/plasma-applet.desktop
-usr/share/kde4/servicetypes/plasma-containment.desktop
-usr/share/kde4/servicetypes/plasma-dataengine.desktop
-usr/share/kde4/servicetypes/plasma-packagestructure.desktop
-usr/share/kde4/servicetypes/plasma-runner.desktop
-usr/share/kde4/servicetypes/plasma-scriptengine.desktop
 usr/share/kde4/servicetypes/screensaver.desktop
 usr/share/kde4/servicetypes/solidbluetoothmanager.desktop
 usr/share/kde4/servicetypes/solidnetworkmanager.desktop
@@ -550,5 +576,3 @@
 usr/share/wallpapers/Vector_Sunset/contents/images/1920x1200.jpg
 usr/share/wallpapers/Vector_Sunset/contents/screenshot.png
 usr/share/wallpapers/Vector_Sunset/metadata.desktop
-usr/share/wallpapers/default_blue.jpg
-usr/share/wallpapers/default_blue.jpg.desktop

Added: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,8 @@
+depends last
+
+skip dst:usr/bin
+missing dst:icons/Oxygen_
+
+dst:usr/share
+mime:text/.*
+mime:image/.*

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,8 +1,14 @@
-usr/include/clocknumber.h
+usr/include/KDE/Plasma/Weather/Ion
+usr/include/KDE/Plasma/Weather/WeatherUtils
 usr/include/kcommondecoration.h
 usr/include/kdecoration.h
 usr/include/kdecorationbridge.h
 usr/include/kdecorationfactory.h
+usr/include/kephal/configurations.h
+usr/include/kephal/kephal.h
+usr/include/kephal/kephal_export.h
+usr/include/kephal/outputs.h
+usr/include/kephal/screens.h
 usr/include/kgreeterplugin.h
 usr/include/kscreensaver.h
 usr/include/kscreensaver_vroot.h
@@ -16,6 +22,7 @@
 usr/include/ksysguard/ProcessFilter.h
 usr/include/ksysguard/ProcessModel.h
 usr/include/ksysguard/ksysguardprocesslist.h
+usr/include/ksysguard/lsof.h
 usr/include/ksysguard/process.h
 usr/include/ksysguard/processes.h
 usr/include/kwinconfig.h
@@ -28,6 +35,22 @@
 usr/include/kworkspace/kdisplaymanager.h
 usr/include/kworkspace/kwindowlistmenu.h
 usr/include/kworkspace/kworkspace.h
+usr/include/libplasmaclock/calendar.h
+usr/include/libplasmaclock/calendartable.h
+usr/include/libplasmaclock/clockapplet.h
+usr/include/libplasmaclock/clocknumber.h
+usr/include/libplasmaclock/plasmaclock_export.h
+usr/include/libplasmaclock/ui_calendar.h
+usr/include/nepomuk/nepomukquery_export.h
+usr/include/nepomuk/nepomukqueryclient_export.h
+usr/include/nepomuk/query.h
+usr/include/nepomuk/queryparser.h
+usr/include/nepomuk/queryserviceclient.h
+usr/include/nepomuk/result.h
+usr/include/nepomuk/term.h
+usr/include/plasma/weather/ion.h
+usr/include/plasma/weather/ion_export.h
+usr/include/plasma/weather/weatherutils.h
 usr/include/solid/control/bluetoothinputdevice.h
 usr/include/solid/control/bluetoothinterface.h
 usr/include/solid/control/bluetoothmanager.h
@@ -59,10 +82,19 @@
 usr/include/solid/control/wirednetworkinterface.h
 usr/include/solid/control/wirelessaccesspoint.h
 usr/include/solid/control/wirelessnetworkinterface.h
+usr/include/taskmanager/abstractgroupableitem.h
+usr/include/taskmanager/abstractgroupingstrategy.h
+usr/include/taskmanager/abstractsortingstrategy.h
+usr/include/taskmanager/groupmanager.h
 usr/include/taskmanager/startup.h
 usr/include/taskmanager/task.h
+usr/include/taskmanager/taskactions.h
+usr/include/taskmanager/taskgroup.h
+usr/include/taskmanager/taskitem.h
 usr/include/taskmanager/taskmanager.h
-usr/include/ui_calendar.h
+usr/include/taskmanager/taskmanager_export.h
+usr/lib/kde4/plugins/designer/ksysguardlsofwidgets.so
+usr/lib/kde4/plugins/designer/ksysguardwidgets.so
 usr/lib/libkdecorations.so
 usr/lib/libkfontinst.so
 usr/lib/libkfontinstui.so
@@ -71,14 +103,30 @@
 usr/lib/libksgrd.so
 usr/lib/libkwineffects.so
 usr/lib/libkworkspace.so
+usr/lib/liblsofui.so
+usr/lib/libnepomukquery.so
+usr/lib/libnepomukqueryclient.so
+usr/lib/libplasmaclock.so
 usr/lib/libprocesscore.so
 usr/lib/libprocessui.so
 usr/lib/libsolidcontrol.so
 usr/lib/libsolidcontrolifaces.so
 usr/lib/libtaskmanager.so
 usr/lib/libweather_ion.so
+usr/share/apps/cmake/modules/FindKephal.cmake
+usr/share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
+usr/share/dbus-1/interfaces/org.kde.KSMServerInterface.xml
+usr/share/dbus-1/interfaces/org.kde.KWin.xml
+usr/share/dbus-1/interfaces/org.kde.PowerDevil.xml
+usr/share/dbus-1/interfaces/org.kde.khotkeys.xml
+usr/share/dbus-1/interfaces/org.kde.krunner.App.xml
+usr/share/dbus-1/interfaces/org.kde.screensaver.xml
+usr/share/kde4/apps/cmake/modules/FindCkConnector.cmake
 usr/share/kde4/apps/cmake/modules/FindDBus.cmake
+usr/share/kde4/apps/cmake/modules/FindGooglegadgets.cmake
 usr/share/kde4/apps/cmake/modules/FindLibXKlavier.cmake
 usr/share/kde4/apps/cmake/modules/FindPAM.cmake
+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

Added: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,10 @@
+depends first
+
+# missing on purpose
+missing dst:usr/lib/libkwinnvidiahack.so$
+
+dst:usr/include
+dst:usr/lib/.*\.so$ link:usr/lib/.*\.so[.\d]+$
+dst:apps/cmake
+dst:dbus-\d+/interfaces
+dst:plugins/designer

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,24 +1,32 @@
 usr/lib/libkfontinst.so.4
-usr/lib/libkfontinst.so.4.1.0
+usr/lib/libkfontinst.so.4.2.0
 usr/lib/libkfontinstui.so.4
-usr/lib/libkfontinstui.so.4.1.0
+usr/lib/libkfontinstui.so.4.2.0
 usr/lib/libkhotkeysprivate.so.4
-usr/lib/libkhotkeysprivate.so.4.1.0
+usr/lib/libkhotkeysprivate.so.4.2.0
 usr/lib/libkscreensaver.so.5
 usr/lib/libkscreensaver.so.5.0.0
 usr/lib/libksgrd.so.4
-usr/lib/libksgrd.so.4.1.0
+usr/lib/libksgrd.so.4.2.0
 usr/lib/libkworkspace.so.4
-usr/lib/libkworkspace.so.4.1.0
+usr/lib/libkworkspace.so.4.2.0
+usr/lib/liblsofui.so.4
+usr/lib/liblsofui.so.4.2.0
+usr/lib/libnepomukquery.so.4
+usr/lib/libnepomukquery.so.4.2.0
+usr/lib/libnepomukqueryclient.so.4
+usr/lib/libnepomukqueryclient.so.4.2.0
+usr/lib/libplasmaclock.so.4
+usr/lib/libplasmaclock.so.4.2.0
 usr/lib/libprocesscore.so.4
-usr/lib/libprocesscore.so.4.1.0
+usr/lib/libprocesscore.so.4.2.0
 usr/lib/libprocessui.so.4
-usr/lib/libprocessui.so.4.1.0
+usr/lib/libprocessui.so.4.2.0
 usr/lib/libsolidcontrol.so.4
-usr/lib/libsolidcontrol.so.4.1.0
+usr/lib/libsolidcontrol.so.4.2.0
 usr/lib/libsolidcontrolifaces.so.4
-usr/lib/libsolidcontrolifaces.so.4.1.0
+usr/lib/libsolidcontrolifaces.so.4.2.0
 usr/lib/libtaskmanager.so.4
-usr/lib/libtaskmanager.so.4.1.0
+usr/lib/libtaskmanager.so.4.2.0
 usr/lib/libweather_ion.so.4
-usr/lib/libweather_ion.so.4.1.0
+usr/lib/libweather_ion.so.4.2.0

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.installgen	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-libs4+5.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,2 +1,4 @@
-# nvidia hack is missing on purpose
-missing dst:usr/lib/libkwinnvidiahack.so
+depends last
+
+skip dst:usr/lib/libkdeinit4_
+dst:usr/lib/lib[^/]+\.so\.

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdm.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdm.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdm.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -11,7 +11,9 @@
 usr/bin/genkdmconf
 usr/bin/kdm
 usr/bin/kdmctl
+usr/lib/kde4/kcm_kdm.so
 usr/lib/kde4/kgreet_classic.so
+usr/lib/kde4/kgreet_generic.so
 usr/lib/kde4/kgreet_winbind.so
 usr/lib/kde4/libexec/kdm_config
 usr/lib/kde4/libexec/kdm_greet
@@ -23,6 +25,8 @@
 usr/share/doc/kde4/HTML/en/kdm/theme-ref.docbook
 usr/share/kde4/apps/doc/kdm/README
 usr/share/kde4/apps/doc/kdm/greeter.dtd
+usr/share/kde4/apps/kcontrol/pics/anchor.png
+usr/share/kde4/apps/kcontrol/pics/monitor.png
 usr/share/kde4/apps/kdm/patterns/fish.desktop
 usr/share/kde4/apps/kdm/patterns/fish.png
 usr/share/kde4/apps/kdm/patterns/flowers.desktop
@@ -69,6 +73,7 @@
 usr/share/kde4/apps/kdm/sessions/icewm.desktop
 usr/share/kde4/apps/kdm/sessions/ion.desktop
 usr/share/kde4/apps/kdm/sessions/kde-safe.desktop
+usr/share/kde4/apps/kdm/sessions/kde.desktop
 usr/share/kde4/apps/kdm/sessions/larswm.desktop
 usr/share/kde4/apps/kdm/sessions/lwm.desktop
 usr/share/kde4/apps/kdm/sessions/matchbox.desktop
@@ -109,5 +114,8 @@
 usr/share/kde4/apps/kdm/themes/oxygen/screenshot.png
 usr/share/kde4/apps/kdm/themes/oxygen/session.png
 usr/share/kde4/apps/kdm/themes/oxygen/system.png
+usr/share/kde4/config/background.knsrc
 usr/share/kde4/config/kdm.knsrc
 usr/share/kde4/services/kdm.desktop
+usr/share/wallpapers/default_blue.jpg
+usr/share/wallpapers/default_blue.jpg.desktop

Added: branches/kde4.2/packages/kdebase-workspace/debian/kdm.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdm.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdm.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,2 @@
+from:kdm
+dst:kdm

Modified: branches/kde4.2/packages/kdebase-workspace/debian/klipper.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/klipper.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/klipper.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -3,4 +3,7 @@
 usr/share/applications/kde4/klipper.desktop
 usr/share/autostart/klipper.desktop
 usr/share/doc/kde4/HTML/en/klipper/common
+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

Added: branches/kde4.2/packages/kdebase-workspace/debian/klipper.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/klipper.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/klipper.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,2 @@
+from:klipper
+dst:klipper

Modified: branches/kde4.2/packages/kdebase-workspace/debian/ksysguard.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/ksysguard.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/ksysguard.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,11 +1,21 @@
 usr/bin/ksysguard
-usr/lib/kde4/plugins/designer/ksysguardwidgets.so
+usr/bin/setscheduler
 usr/lib/libkdeinit4_ksysguard.so
 usr/share/applications/kde4/ksysguard.desktop
 usr/share/doc/kde4/HTML/en/ksysguard/common
-usr/share/kde4/apps/kicker/applets/ksysguardapplet.desktop
+usr/share/doc/kde4/HTML/en/ksysguard/index.cache.bz2
+usr/share/doc/kde4/HTML/en/ksysguard/index.docbook
+usr/share/icons/oxygen/16x16/apps/computer.png
+usr/share/icons/oxygen/16x16/apps/daemon.png
+usr/share/icons/oxygen/16x16/apps/kdeapp.png
+usr/share/icons/oxygen/16x16/apps/kernel.png
+usr/share/icons/oxygen/16x16/apps/running.png
+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/ksysguard.notifyrc
 usr/share/kde4/apps/ksysguard/ksysguardui.rc
+usr/share/kde4/config/ksysguard.knsrc

Added: branches/kde4.2/packages/kdebase-workspace/debian/ksysguard.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/ksysguard.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/ksysguard.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,5 @@
+depends ksysguardd
+
+# Do not install ksysguard libraries here
+skip dst:usr/lib/lib.*\.so\.
+from:ksysguard

Modified: branches/kde4.2/packages/kdebase-workspace/debian/ksysguardd.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/ksysguardd.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/ksysguardd.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,2 +1,3 @@
 etc/ksysguarddrc
 usr/bin/ksysguardd
+usr/share/icons/oxygen/16x16/apps/ksysguardd.png

Added: branches/kde4.2/packages/kdebase-workspace/debian/ksysguardd.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/ksysguardd.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/ksysguardd.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,3 @@
+skip:icons/.*/ksysguardd\.
+from:ksysguardd
+dst:ksysguardd

Modified: branches/kde4.2/packages/kdebase-workspace/debian/libkdecorations4.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/libkdecorations4.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/libkdecorations4.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,2 +1,2 @@
 usr/lib/libkdecorations.so.4
-usr/lib/libkdecorations.so.4.1.0
+usr/lib/libkdecorations.so.4.2.0

Added: branches/kde4.2/packages/kdebase-workspace/debian/libkdecorations4.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/libkdecorations4.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/libkdecorations4.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,2 @@
+depends first
+dst:usr/lib/libkdecorations\.so\.

Added: branches/kde4.2/packages/kdebase-workspace/debian/libkwineffects1.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/libkwineffects1.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/libkwineffects1.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,2 @@
+depends first
+dst:usr/lib/libkwineffects\.so\.

Deleted: branches/kde4.2/packages/kdebase-workspace/debian/libplasma-dev.install

Deleted: branches/kde4.2/packages/kdebase-workspace/debian/libplasma2.bugscript

Deleted: branches/kde4.2/packages/kdebase-workspace/debian/libplasma2.install

Deleted: branches/kde4.2/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-11-19 13:44:45 UTC (rev 12685)
@@ -32,7 +32,7 @@
 --- a/kcontrol/kdm/main.cpp
 +++ b/kcontrol/kdm/main.cpp
 @@ -187,8 +187,8 @@
- 	for (tgmapci = tgmap.begin(); tgmapci != tgmap.end(); ++tgmapci)
+ 	for (tgmapci = tgmap.constBegin(); tgmapci != tgmap.constEnd(); ++tgmapci)
  		kWarning() << "user(s) '" << tgmapci.value().join( "," )
  		<< "' have unknown GID " << tgmapci.key() << endl;
 -

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2008-11-19 13:44:45 UTC (rev 12685)
@@ -1,7 +1,7 @@
 We renamed ktrash to ktrash4. See bug #494427.
 --- a/plasma/applets/trash/trash.cpp
 +++ b/plasma/applets/trash/trash.cpp
-@@ -192,7 +192,7 @@
+@@ -201,7 +201,7 @@
          // we can simply call ktrash.
          //KonqOperations::emptyTrash(&m_menu);
          KProcess process;

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2008-11-19 13:44:45 UTC (rev 12685)
@@ -5,7 +5,6 @@
 11_kdm_X_path.diff
 12_be_better_at_honouring_user_kdm_theming.diff
 13_kdm_override_docs.diff
-16_kdm_consolekit.diff
 20_use_dejavu_as_default_font.diff
 21_kdm_doesnt_use_kstandarddirs.diff
 22_execute_ktrash4.diff

Modified: branches/kde4.2/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/rules	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/rules	2008-11-19 13:44:45 UTC (rev 12685)
@@ -5,17 +5,10 @@
 #DEB_CMAKE_EXTRA_FLAGS += \
 #	-DINSTALL_PRINTER_APPLET=TRUE
 
-PLASMA_ABI=plasma-abi-4.1-1
-
 DEB_CMAKE_EXTRA_FLAGS += -DKDE4_KDM_PAM_SERVICE=kdm
-DEB_DH_MAKESHLIBS_ARGS_libplasma2 := -V'libplasma2 (>= 4:4.1.2), $(PLASMA_ABI)'
-DEB_DH_MAKESHLIBS_ARGS_libkwineffects1 := -V'libkwineffects1 (>= 4:4.1.2)'
+DEB_DH_MAKESHLIBS_ARGS_libkwineffects1 := -V'libkwineffects1 (>= 4:4.1.73)'
 
 DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-bin := -- -xksysguard
-DEB_DH_SHLIBDEPS_ARGS_libplasma2 := -- -xkdebase-runtime
 
 binary-install/kdm::
 	install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np
-
-binary-predeb/libplasma2::
-	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma2.substvars

Modified: branches/kde4.2/packages/kdebase-workspace/debian/systemsettings.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/systemsettings.install	2008-11-19 10:54:32 UTC (rev 12684)
+++ branches/kde4.2/packages/kdebase-workspace/debian/systemsettings.install	2008-11-19 13:44:45 UTC (rev 12685)
@@ -4,10 +4,10 @@
 usr/lib/kde4/kcm_fonts.so
 usr/lib/kde4/kcm_style.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/systemsettingsui.rc
-usr/share/kde4/services/ion-bbcukmet.desktop
-usr/share/kde4/services/ion-envcan.desktop
-usr/share/kde4/services/ion-noaa.desktop
 usr/share/kde4/services/settings-about-me.desktop
 usr/share/kde4/services/settings-accessibility.desktop
 usr/share/kde4/services/settings-advanced-user-settings.desktop

Added: branches/kde4.2/packages/kdebase-workspace/debian/systemsettings.installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/systemsettings.installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/systemsettings.installgen	2008-11-19 13:44:45 UTC (rev 12685)
@@ -0,0 +1,2 @@
+dst:usr/lib/kde4/kcm_(colors|fonts|style)\.so$
+from:systemsettings

More information about the pkg-kde-commits mailing list