Merge remote branch 'origin/master'

16 files changed, 30 insertions, 78 deletions

diff --git a/debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install b/debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install
index 2b145ae71..5a92a6472 100644
--- a/debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install
+++ b/debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install
@@ -7,16 +7,12 @@ opt/trinity/lib/trinity/kcm_userconfig.a opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.so.0.0.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.a opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.so.0.0.0 opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.la opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.a opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.so.0.0.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.a opt/trinity/lib/
 opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/displayconfig.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
 opt/trinity/share/doc/kde/HTML/en/guidance/index.cache.bz2
 opt/trinity/share/doc/kde/HTML/en/guidance/index.html
@@ -34,7 +30,6 @@ opt/trinity/share/doc/kde/HTML/en/guidance/configuration.html
 opt/trinity/share/applications/kde/serviceconfig.desktop
 opt/trinity/share/applications/kde/userconfig.desktop
 opt/trinity/share/applications/kde/mountconfig.desktop
-opt/trinity/share/applications/kde/displayconfig.desktop
 opt/trinity/share/applications/kde/wineconfig.desktop
 opt/trinity/share/apps/guidance/pics/laserwarn.png
 opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png
@@ -73,33 +68,8 @@ opt/trinity/share/apps/guidance/pics/hi32-gfxcard.png
 opt/trinity/share/apps/guidance/pics/hi32-display.png
 opt/trinity/share/apps/guidance/pics/32-wine.png
 opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-opt/trinity/share/apps/guidance/pics/displayconfig
-opt/trinity/share/apps/guidance/pics/displayconfig/dualhead
-opt/trinity/share/apps/guidance/pics/displayconfig/dualhead/monitor_1.png
-opt/trinity/share/apps/guidance/pics/displayconfig/dualhead/monitor_2.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_r90.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide_r90.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_r90.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide_r90.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_4th.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_left_4th.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_right_4th.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam14.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam16.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam18.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam20.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam22.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam24.png
 opt/trinity/share/python-support/kde-guidance-trinity/SMBShareSelectDialog.py
 opt/trinity/share/python-support/kde-guidance-trinity/SimpleCommandRunner.py
-opt/trinity/share/python-support/kde-guidance-trinity/displayconfig.py
-opt/trinity/share/python-support/kde-guidance-trinity/displayconfigwidgets.py
 opt/trinity/share/python-support/kde-guidance-trinity/fuser.py
 opt/trinity/share/python-support/kde-guidance-trinity/fuser_ui.py
 #opt/trinity/share/python-support/kde-guidance-trinity/grubconfig.py
@@ -117,9 +87,6 @@ opt/trinity/lib/trinity/kcm_userconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.so.0 opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.so opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/
 usr/share/lintian/overrides/kde-guidance-trinity
-etc/X11/Xsession.d/40guidance-displayconfig_restore
diff --git a/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-trinity.install
index 4f1a1d3e8..901f852e1 100644
--- a/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-trinity.install
+++ b/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-trinity.install
@@ -1,6 +1,5 @@
 debian/tmp/opt/trinity/bin/xscreensaver-getimage-file
 debian/tmp/opt/trinity/bin/xscreensaver-getimage
-debian/tmp/opt/trinity/bin/krootbacking
 debian/tmp/opt/trinity/bin/kxsconfig
 debian/tmp/opt/trinity/bin/kxsrun
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/antinspect.desktop
diff --git a/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
index b8a55ad56..6e443209c 100644
--- a/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
+++ b/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
@@ -1,10 +1,11 @@
 diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
---- kscreensaver/krootbacking/Makefile.am	2011-08-19 19:27:09.000000000 -0500
-+++ kscreensaver/krootbacking/Makefile.am	2011-08-19 20:06:36.000000000 -0500
-@@ -9,5 +9,5 @@
- 
- noinst_HEADERS = krootbacking.h
+--- kscreensaver/krootbacking/Makefile.am
++++ kscreensaver/krootbacking/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = $(all_includes)
  
 -hackdir = /usr/local/bin/
 +hackdir = /opt/trinity/bin/
  hack_DATA = xscreensaver-getimage xscreensaver-getimage-file
+ 
+ install-data-hook:
diff --git a/debian/lenny/kdebase/debian/kdebase-trinity-bin.install b/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
index 0f209cc40..b0eceaa85 100644
--- a/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
+++ b/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
@@ -1,3 +1,4 @@
+debian/tmp/opt/trinity/bin/krootbacking
 debian/tmp/opt/trinity/bin/kdebugdialog
 debian/tmp/opt/trinity/bin/kreadconfig
 debian/tmp/opt/trinity/bin/kwriteconfig
diff --git a/debian/lenny/kdebase/debian/kdm-trinity.postinst b/debian/lenny/kdebase/debian/kdm-trinity.postinst
index 8c879be02..c787b37a3 100644
--- a/debian/lenny/kdebase/debian/kdm-trinity.postinst
+++ b/debian/lenny/kdebase/debian/kdm-trinity.postinst
@@ -9,6 +9,10 @@ set -e
 # does not exist
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+  cp -Rp "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
+fi
+
 if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
   DEFAULT_DISPLAY_MANAGER=kdm-trinity
   if db_get shared/default-x-display-manager; then
diff --git a/debian/lenny/kdebase/debian/kwin-trinity.install b/debian/lenny/kdebase/debian/kwin-trinity.install
index b92c0c4a2..6ebdc3c30 100644
--- a/debian/lenny/kdebase/debian/kwin-trinity.install
+++ b/debian/lenny/kdebase/debian/kwin-trinity.install
@@ -98,3 +98,4 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kwin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kwin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kwin.png
+debian/tmp/opt/trinity/share/apps/kwin/default_rules/*
diff --git a/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install b/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install
index 8df1da81f..b9f021ddf 100644
--- a/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install
+++ b/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install
@@ -1698,6 +1698,7 @@ debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
 debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
 debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
 debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vtab.png
+debian/tmp/opt/trinity/share/apps/kstyle/themes/asteroid.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/b3.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/default.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/highcolor.themerc
diff --git a/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install b/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
index 25c781723..d945126bf 100644
--- a/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
@@ -197,6 +197,8 @@ debian/tmp/opt/trinity/lib/trinity/libshellscript.la
 debian/tmp/opt/trinity/lib/trinity/libshellscript.so
 debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.la
 debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/asteroid.la
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/asteroid.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcolor.la
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcolor.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcontrast.la
diff --git a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install b/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install
index 2b145ae71..5a92a6472 100644
--- a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install
+++ b/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install
@@ -7,16 +7,12 @@ opt/trinity/lib/trinity/kcm_userconfig.a opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.so.0.0.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.a opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.so.0.0.0 opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.la opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.a opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.so.0.0.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.a opt/trinity/lib/
 opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/displayconfig.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
 opt/trinity/share/doc/kde/HTML/en/guidance/index.cache.bz2
 opt/trinity/share/doc/kde/HTML/en/guidance/index.html
@@ -34,7 +30,6 @@ opt/trinity/share/doc/kde/HTML/en/guidance/configuration.html
 opt/trinity/share/applications/kde/serviceconfig.desktop
 opt/trinity/share/applications/kde/userconfig.desktop
 opt/trinity/share/applications/kde/mountconfig.desktop
-opt/trinity/share/applications/kde/displayconfig.desktop
 opt/trinity/share/applications/kde/wineconfig.desktop
 opt/trinity/share/apps/guidance/pics/laserwarn.png
 opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png
@@ -73,33 +68,8 @@ opt/trinity/share/apps/guidance/pics/hi32-gfxcard.png
 opt/trinity/share/apps/guidance/pics/hi32-display.png
 opt/trinity/share/apps/guidance/pics/32-wine.png
 opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-opt/trinity/share/apps/guidance/pics/displayconfig
-opt/trinity/share/apps/guidance/pics/displayconfig/dualhead
-opt/trinity/share/apps/guidance/pics/displayconfig/dualhead/monitor_1.png
-opt/trinity/share/apps/guidance/pics/displayconfig/dualhead/monitor_2.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_r90.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide_r90.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_r90.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide_r90.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_4th.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_left_4th.png
-opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_right_4th.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam14.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam16.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam18.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam20.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam22.png
-opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam24.png
 opt/trinity/share/python-support/kde-guidance-trinity/SMBShareSelectDialog.py
 opt/trinity/share/python-support/kde-guidance-trinity/SimpleCommandRunner.py
-opt/trinity/share/python-support/kde-guidance-trinity/displayconfig.py
-opt/trinity/share/python-support/kde-guidance-trinity/displayconfigwidgets.py
 opt/trinity/share/python-support/kde-guidance-trinity/fuser.py
 opt/trinity/share/python-support/kde-guidance-trinity/fuser_ui.py
 #opt/trinity/share/python-support/kde-guidance-trinity/grubconfig.py
@@ -117,9 +87,6 @@ opt/trinity/lib/trinity/kcm_userconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.so.0 opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_displayconfig.so opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/
 usr/share/lintian/overrides/kde-guidance-trinity
-etc/X11/Xsession.d/40guidance-displayconfig_restore
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install
index 4f1a1d3e8..901f852e1 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install
+++ b/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install
@@ -1,6 +1,5 @@
 debian/tmp/opt/trinity/bin/xscreensaver-getimage-file
 debian/tmp/opt/trinity/bin/xscreensaver-getimage
-debian/tmp/opt/trinity/bin/krootbacking
 debian/tmp/opt/trinity/bin/kxsconfig
 debian/tmp/opt/trinity/bin/kxsrun
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/antinspect.desktop
diff --git a/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
index b8a55ad56..6e443209c 100644
--- a/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
+++ b/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
@@ -1,10 +1,11 @@
 diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
---- kscreensaver/krootbacking/Makefile.am	2011-08-19 19:27:09.000000000 -0500
-+++ kscreensaver/krootbacking/Makefile.am	2011-08-19 20:06:36.000000000 -0500
-@@ -9,5 +9,5 @@
- 
- noinst_HEADERS = krootbacking.h
+--- kscreensaver/krootbacking/Makefile.am
++++ kscreensaver/krootbacking/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = $(all_includes)
  
 -hackdir = /usr/local/bin/
 +hackdir = /opt/trinity/bin/
  hack_DATA = xscreensaver-getimage xscreensaver-getimage-file
+ 
+ install-data-hook:
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install b/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install
index 0f209cc40..b0eceaa85 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install
+++ b/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install
@@ -1,3 +1,4 @@
+debian/tmp/opt/trinity/bin/krootbacking
 debian/tmp/opt/trinity/bin/kdebugdialog
 debian/tmp/opt/trinity/bin/kreadconfig
 debian/tmp/opt/trinity/bin/kwriteconfig
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.postinst b/debian/squeeze/kdebase/debian/kdm-trinity.postinst
index 8c879be02..c787b37a3 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.postinst
+++ b/debian/squeeze/kdebase/debian/kdm-trinity.postinst
@@ -9,6 +9,10 @@ set -e
 # does not exist
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+  cp -Rp "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
+fi
+
 if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
   DEFAULT_DISPLAY_MANAGER=kdm-trinity
   if db_get shared/default-x-display-manager; then
diff --git a/debian/squeeze/kdebase/debian/kwin-trinity.install b/debian/squeeze/kdebase/debian/kwin-trinity.install
index b92c0c4a2..6ebdc3c30 100644
--- a/debian/squeeze/kdebase/debian/kwin-trinity.install
+++ b/debian/squeeze/kdebase/debian/kwin-trinity.install
@@ -98,3 +98,4 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kwin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kwin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kwin.png
+debian/tmp/opt/trinity/share/apps/kwin/default_rules/*
diff --git a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install b/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install
index 8df1da81f..b9f021ddf 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install
+++ b/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install
@@ -1698,6 +1698,7 @@ debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
 debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
 debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
 debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vtab.png
+debian/tmp/opt/trinity/share/apps/kstyle/themes/asteroid.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/b3.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/default.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/highcolor.themerc
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install b/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install
index 25c781723..d945126bf 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install
@@ -197,6 +197,8 @@ debian/tmp/opt/trinity/lib/trinity/libshellscript.la
 debian/tmp/opt/trinity/lib/trinity/libshellscript.so
 debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.la
 debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/asteroid.la
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/asteroid.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcolor.la
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcolor.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcontrast.la