jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>diff -u kontact.install  ../../../current/kdepim-3.5.7enterprise20070926/debian/kontact.install
--- kontact.install     2007-11-14 16:47:01.000000000 +0000
+++ ../../../current/kdepim-3.5.7enterprise20070926/debian/kontact.install      2007-11-14 16:14:55.000000000 +0000
@@ -18,6 +18,7 @@
 /usr/lib/libkpinterfaces.so.1
 /usr/lib/libkpinterfaces.so.1.0.0
 /usr/share/applications/kde/Kontact.desktop
+/usr/share/applications/kde/kontactdcop.desktop
 /usr/share/apps/kontact
 /usr/share/apps/kontactsummary/kontactsummary_part.rc
 /usr/share/config.kcfg/kontact.kcfg
@@ -38,7 +39,10 @@
 /usr/share/services/kcmkontactsummary.desktop
 /usr/share/services/kcmkorgsummary.desktop
 /usr/share/services/kcmsdsummary.desktop
-/usr/share/services/kontact
+/usr/share/services/kontact/newstickerplugin.desktop
+/usr/share/services/kontact/specialdatesplugin.desktop
+/usr/share/services/kontact/summaryplugin.desktop
+/usr/share/services/kontact/weatherplugin.desktop
 /usr/share/services/kontactconfig.desktop
 /usr/share/servicetypes/kontactplugin.desktop
 ../icons/kontact.xpm /usr/share/pixmaps
jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>grep kontactdcop.desktop *
jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>grep newstickerplugin.desktop *
jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>cp  ../../../current/kdepim-3.5.7enterprise20070926/debian/kontact.install  .
jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>diff -u kaddressbook.install ../../../current/kdepim-3.5.7enterprise20070926/debian/kaddressbook.install
--- kaddressbook.install        2007-11-14 16:47:01.000000000 +0000
+++ ../../../current/kdepim-3.5.7enterprise20070926/debian/kaddressbook.install 2007-11-14 16:14:55.000000000 +0000
@@ -28,6 +28,7 @@
 /usr/share/services/kabcustomfields.desktop
 /usr/share/services/kabldapconfig.desktop
 /usr/share/services/kaddressbook
+/usr/share/services/kontact/kaddressbookplugin.desktop
 /usr/share/services/kresources/kabc/imap.desktop
 /usr/share/services/ldifvcardthumbnail.desktop
 /usr/share/servicetypes/dcopaddressbook.desktop
jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>cp ../../../current/kdepim-3.5.7enterprise20070926/debian/kaddressbook.install  .
jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>diff -u ../../../current/kdepim-3.5.7enterprise20070926/debian/korganizer.install  korganizer.install
--- ../../../current/kdepim-3.5.7enterprise20070926/debian/korganizer.install   2007-11-14 16:14:55.000000000 +0000
+++ korganizer.install  2007-11-14 16:47:01.000000000 +0000
@@ -29,9 +29,6 @@
 /usr/share/icons/hicolor/32x32/apps/korganizer.png
 /usr/share/icons/hicolor/48x48/apps/korganizer.png
 /usr/share/icons/hicolor/64x64/apps/korganizer.png
-/usr/share/services/kontact/korganizerplugin.desktop
-/usr/share/services/kontact/journalplugin.desktop
-/usr/share/services/kontact/todoplugin.desktop
 /usr/share/services/korganizer_*.desktop
 /usr/share/services/korganizer
 /usr/share/services/webcal.protocol
jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>cp ../../../current/kdepim-3.5.7enterprise20070926/debian/korganizer.install  korganizer.install
jr@lichts:~/src/kdepim/merge/kdepim-3.5.7enterprise20070926/debian>diff -u ../../../current/kdepim-3.5.7enterprise20070926/debian/kmail.install kmail.install
--- ../../../current/kdepim-3.5.7enterprise20070926/debian/kmail.install        2007-11-14 16:14:55.000000000 +0000
+++ kmail.install       2007-11-14 16:47:01.000000000 +0000
@@ -31,10 +31,10 @@
 /usr/share/apps/kconf_update/kmail-3.3b1-misc.pl
 /usr/share/apps/kconf_update/kmail-3.4-misc.pl
 /usr/share/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
-/usr/share/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
 /usr/share/apps/kconf_update/kmail-3.5-filter-icons.pl
 /usr/share/apps/kconf_update/kmail-pgpidentity.pl
 /usr/share/apps/kconf_update/kmail-upd-identities.pl
+/usr/share/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
 /usr/share/apps/kconf_update/kmail.upd
 /usr/share/apps/kconf_update/upgrade-signature.pl
 /usr/share/apps/kconf_update/upgrade-transport.pl
@@ -55,7 +55,6 @@
 /usr/share/icons/hicolor/64x64/apps/kmail.png
 /usr/share/icons/hicolor/scalable/apps/kmail.svgz
 /usr/share/services/kmail_config_*.desktop
-/usr/share/services/kontact/kmailplugin.desktop
 /usr/share/servicetypes/dcopimap.desktop
 /usr/share/servicetypes/dcopmail.desktop
 ../icons/kmail.xpm /usr/share/pixmaps