Update KDE to 4.4.2

For 4.4.0 major new technologies have been introduced, including social
networking and online collaboration features, a new netbook-oriented
interface and infrastructural innovations such as the KAuth authentication
framework. According to KDE's bug-tracking system, 7293 bugs have been
fixed and 1433 new feature requests were implemented.

KDE SC 4.4.1 has a number of improvements:
 A performance problem in KMail when sending emails has been fixed
 Various fixes in Plasma widgets and other addons, such as the analog clock
  and the picture frame
 A number of fixes in Konsole, KDE's powerful terminal application

KDE SC 4.4.2 has a number of improvements:
 Possible crashes in Plasma, Dolphin and Okular have been fixed
 The Microblog applet now shows the correct time in the timeline
 The audioplayer KRunner plugin has been fixed to not freeze the KRunner UI
  anymore

3 files changed, 128 insertions, 401 deletions

diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 4c63cbf8982..911ad913394 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:40 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:03 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -63,7 +63,6 @@ BUILDLINK_DEPMETHOD.qt4-tools=full
 .include "../../security/libassuan/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kdelibs-experimental4/buildlink3.mk"
 .include "../../x11/kdebase-runtime4/buildlink3.mk"
 .include "../../x11/kdebase-workspace4/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index b5a8b3d261d..d205d5c8572 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2009/11/04 11:05:51 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/04/10 02:45:03 markd Exp $
+bin/akonadiconsole
 bin/akregator
 bin/akregatorstorageexporter
-bin/egroupwarewizard
+bin/blogilo
 bin/groupwarewizard
 bin/groupwisewizard
 bin/ical2vcal
 bin/kabc2mutt
 bin/kabcclient
-bin/kabcdistlistupdater
 bin/kaddressbook
 bin/kalarm
 bin/kalarmautostart
@@ -28,106 +28,11 @@ bin/konsolekalendar
 bin/kontact
 bin/korgac
 bin/korganizer
-bin/kpilot
-bin/kpilotDaemon
 bin/ksendemail
 bin/ktimetracker
 bin/kwatchgnupg
-bin/scalixadmin
-bin/scalixwizard
 bin/sloxwizard
-include/akregator/akregator_export.h
-include/akregator/article.h
-include/akregator/command.h
-include/akregator/feedlistmanagementinterface.h
-include/akregator/feedstorage.h
-include/akregator/plugin.h
-include/akregator/storage.h
-include/akregator/storagefactory.h
-include/akregator/storagefactoryregistry.h
-include/akregator/types.h
-include/kaddressbook/kaddressbook_export.h
-include/kleo/adduseridjob.h
-include/kleo/changeexpiryjob.h
-include/kleo/changeownertrustjob.h
-include/kleo/cryptobackend.h
-include/kleo/cryptobackendfactory.h
-include/kleo/cryptoconfig.h
-include/kleo/cryptplug.h
-include/kleo/cryptplugfactory.h
-include/kleo/cryptplugwrapper.h
-include/kleo/cryptplugwrapperlist.h
-include/kleo/decryptjob.h
-include/kleo/decryptverifyjob.h
-include/kleo/deletejob.h
-include/kleo/dn.h
-include/kleo/downloadjob.h
-include/kleo/encryptjob.h
-include/kleo/enum.h
-include/kleo/exportjob.h
-include/kleo/hierarchicalkeylistjob.h
-include/kleo/importjob.h
-include/kleo/job.h
-include/kleo/keyfilter.h
-include/kleo/keyfiltermanager.h
-include/kleo/keygenerationjob.h
-include/kleo/keylistjob.h
-include/kleo/kleo_export.h
-include/kleo/multideletejob.h
-include/kleo/oidmap.h
-include/kleo/refreshkeysjob.h
-include/kleo/signencryptjob.h
-include/kleo/signjob.h
-include/kleo/signkeyjob.h
-include/kleo/specialjob.h
-include/kleo/ui/backendconfigwidget.h
-include/kleo/ui/cryptoconfigdialog.h
-include/kleo/ui/cryptoconfigmodule.h
-include/kleo/ui/directoryserviceswidget.h
-include/kleo/ui/dnattributeorderconfigwidget.h
-include/kleo/ui/kdhorizontalline.h
-include/kleo/ui/keyapprovaldialog.h
-include/kleo/ui/keylistview.h
-include/kleo/ui/keyrequester.h
-include/kleo/ui/keyselectiondialog.h
-include/kleo/ui/messagebox.h
-include/kleo/ui/progressbar.h
-include/kleo/ui/progressdialog.h
-include/kleo/verifydetachedjob.h
-include/kleo/verifyopaquejob.h
-include/kmail/interfaces/bodypart.h
-include/kmail/interfaces/bodypartformatter.h
-include/kmail/interfaces/bodyparturlhandler.h
-include/kmail/interfaces/htmlwriter.h
-include/kmail/interfaces/observable.h
-include/kmail/interfaces/observer.h
-include/kpgp/kpgp.h
-include/kpgp/kpgpbase.h
-include/kpgp/kpgpblock.h
-include/kpgp/kpgpkey.h
-include/kpgp/kpgpui.h
-include/kpgp/libkpgp_export.h
-include/kpilot/kpilot_export.h
-include/kpilot/kpilotdevicelink.h
-include/kpilot/kpilotlink.h
-include/kpilot/kpilotlocallink.h
-include/kpilot/options.h
-include/kpilot/pilot.h
-include/kpilot/pilotDatabase.h
-include/kpilot/pilotLinkVersion.h
-include/kpilot/pilotLocalDatabase.h
-include/kpilot/pilotRecord.h
-include/kpilot/pilotSerialDatabase.h
-include/kpilot/plugin.h
-include/kpilot/pluginfactory.h
-include/kpilot/syncAction.h
-include/ksieve/libksieve_export.h
-include/libkleopatraclient/core/command.h
-include/libkleopatraclient/core/initialization.h
-include/libkleopatraclient/core/selectcertificatecommand.h
-include/libkleopatraclient/core/signencryptfilescommand.h
-include/libkleopatraclient/gui/certificaterequester.h
-include/libkleopatraclient/kleopatraclient_export.h
+lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
 lib/kde4/akregator_config_advanced.so
 lib/kde4/akregator_config_appearance.so
 lib/kde4/akregator_config_archive.so
@@ -138,24 +43,7 @@ lib/kde4/akregatorpart.so
 lib/kde4/kabc_groupdav.so
 lib/kde4/kabc_groupwise.so
 lib/kde4/kabc_kolab.so
-lib/kde4/kabc_scalix.so
 lib/kde4/kabc_slox.so
-lib/kde4/kabc_xmlrpc.so
-lib/kde4/kaddrbk_bookmark_xxport.so
-lib/kde4/kaddrbk_cardview.so
-lib/kde4/kaddrbk_cryptosettings.so
-lib/kde4/kaddrbk_csv_xxport.so
-lib/kde4/kaddrbk_distributionlistng.so
-lib/kde4/kaddrbk_eudora_xxport.so
-lib/kde4/kaddrbk_gmx_xxport.so
-lib/kde4/kaddrbk_iconview.so
-lib/kde4/kaddrbk_kde2_xxport.so
-lib/kde4/kaddrbk_ldif_xxport.so
-lib/kde4/kaddrbk_opera_xxport.so
-lib/kde4/kaddrbk_pab_xxport.so
-lib/kde4/kaddrbk_resourceselection.so
-lib/kde4/kaddrbk_tableview.so
-lib/kde4/kaddrbk_vcard_xxport.so
 lib/kde4/kaddressbookpart.so
 lib/kde4/kalarm_local.so
 lib/kde4/kalarm_localdir.so
@@ -166,13 +54,8 @@ lib/kde4/kcal_groupwise.so
 lib/kde4/kcal_kabc.so
 lib/kde4/kcal_kolab.so
 lib/kde4/kcal_remote.so
-lib/kde4/kcal_scalix.so
 lib/kde4/kcal_slox.so
-lib/kde4/kcal_xmlrpc.so
 lib/kde4/kcm_apptsummary.so
-lib/kde4/kcm_kabconfig.so
-lib/kde4/kcm_kabcustomfields.so
-lib/kde4/kcm_kabldapconfig.so
 lib/kde4/kcm_kjots.so
 lib/kde4/kcm_kleopatra.so
 lib/kde4/kcm_kmail.so
@@ -182,13 +65,12 @@ lib/kde4/kcm_knote.so
 lib/kde4/kcm_kontact.so
 lib/kde4/kcm_kontactsummary.so
 lib/kde4/kcm_korganizer.so
-lib/kde4/kcm_kpilot.so
 lib/kde4/kcm_ktimetracker.so
+lib/kde4/kcm_ldap.so
 lib/kde4/kcm_planner.so
 lib/kde4/kcm_sdsummary.so
 lib/kde4/kcm_todosummary.so
 lib/kde4/kio_groupwise.so
-lib/kde4/kio_scalix.so
 lib/kde4/kjotspart.so
 lib/kde4/kmail_bodypartformatter_application_octetstream.so
 lib/kde4/kmail_bodypartformatter_text_calendar.so
@@ -198,8 +80,6 @@ lib/kde4/kmailpart.so
 lib/kde4/knodepart.so
 lib/kde4/knotes_kolab.so
 lib/kde4/knotes_local.so
-lib/kde4/knotes_scalix.so
-lib/kde4/knotes_xmlrpc.so
 lib/kde4/kontact_akregatorplugin.so
 lib/kde4/kontact_journalplugin.so
 lib/kde4/kontact_kaddressbookplugin.so
@@ -221,88 +101,73 @@ lib/kde4/korg_thisdayinhistory.so
 lib/kde4/korg_yearprint.so
 lib/kde4/korganizerpart.so
 lib/kde4/kpartsdesignerplugin.so
-lib/kde4/kpilot_conduit_calendar.so
-lib/kde4/kpilot_conduit_contacts.so
-lib/kde4/kpilot_conduit_memofile.so
-lib/kde4/kpilot_conduit_time.so
-lib/kde4/kpilot_conduit_todo.so
 lib/kde4/ktexteditorkabcbridge.so
 lib/kde4/ktimetrackerpart.so
-lib/kde4/ldifvcardthumbnail.so
 lib/kde4/plugins/designer/kdepimwidgets.so
+lib/libakonadi-kcal_next.so
+lib/libakonadi-kcal_next.so.4
+lib/libakonadi-kcal_next.so.4.4.0
+lib/libakonadi_next.so
+lib/libakonadi_next.so.4
+lib/libakonadi_next.so.4.4.0
 lib/libakregatorinterfaces.so
 lib/libakregatorinterfaces.so.4
-lib/libakregatorinterfaces.so.4.3.0
+lib/libakregatorinterfaces.so.4.4.0
 lib/libakregatorprivate.so.4
-lib/libakregatorprivate.so.4.3.0
+lib/libakregatorprivate.so.4.4.0
 lib/libgwsoap.so
 lib/libgwsoap.so.4
-lib/libgwsoap.so.4.3.0
+lib/libgwsoap.so.4.4.0
 lib/libkabc_groupdav.so
 lib/libkabc_groupdav.so.4
-lib/libkabc_groupdav.so.4.3.0
+lib/libkabc_groupdav.so.4.4.0
 lib/libkabc_slox.so
 lib/libkabc_slox.so.4
-lib/libkabc_slox.so.4.3.0
-lib/libkabc_xmlrpc.so
-lib/libkabc_xmlrpc.so.4
-lib/libkabc_xmlrpc.so.4.3.0
+lib/libkabc_slox.so.4.4.0
 lib/libkabcgroupwise.so
 lib/libkabcgroupwise.so.4
-lib/libkabcgroupwise.so.4.3.0
+lib/libkabcgroupwise.so.4.4.0
 lib/libkabckolab.so
 lib/libkabckolab.so.4
-lib/libkabckolab.so.4.3.0
-lib/libkabcommon.so
-lib/libkabcommon.so.4
-lib/libkabcommon.so.4.3.0
-lib/libkabcscalix.so
-lib/libkabcscalix.so.4
-lib/libkabcscalix.so.4.3.0
-lib/libkabinterfaces.so
-lib/libkabinterfaces.so.4
-lib/libkabinterfaces.so.4.3.0
+lib/libkabckolab.so.4.4.0
 lib/libkaddressbookprivate.so.4
-lib/libkaddressbookprivate.so.4.3.0
+lib/libkaddressbookprivate.so.4.4.0
+lib/libkalarm_calendar.so
+lib/libkalarm_calendar.so.4
+lib/libkalarm_calendar.so.4.4.0
 lib/libkalarm_resources.so
 lib/libkalarm_resources.so.4
-lib/libkalarm_resources.so.4.3.0
+lib/libkalarm_resources.so.4.4.0
 lib/libkcal_groupdav.so
 lib/libkcal_groupdav.so.4
-lib/libkcal_groupdav.so.4.3.0
+lib/libkcal_groupdav.so.4.4.0
 lib/libkcal_resourceblog.so
 lib/libkcal_resourceblog.so.4
-lib/libkcal_resourceblog.so.4.3.0
+lib/libkcal_resourceblog.so.4.4.0
 lib/libkcal_resourceremote.so
 lib/libkcal_resourceremote.so.4
-lib/libkcal_resourceremote.so.4.3.0
+lib/libkcal_resourceremote.so.4.4.0
 lib/libkcal_slox.so
 lib/libkcal_slox.so.4
-lib/libkcal_slox.so.4.3.0
-lib/libkcal_xmlrpc.so
-lib/libkcal_xmlrpc.so.4
-lib/libkcal_xmlrpc.so.4.3.0
+lib/libkcal_slox.so.4.4.0
 lib/libkcalgroupwise.so
 lib/libkcalgroupwise.so.4
-lib/libkcalgroupwise.so.4.3.0
+lib/libkcalgroupwise.so.4.4.0
 lib/libkcalkolab.so
 lib/libkcalkolab.so.4
-lib/libkcalkolab.so.4.3.0
-lib/libkcalscalix.so
-lib/libkcalscalix.so.4
-lib/libkcalscalix.so.4.3.0
+lib/libkcalkolab.so.4.4.0
 lib/libkdepim.so
 lib/libkdepim.so.4
-lib/libkdepim.so.4.3.0
+lib/libkdepim.so.4.4.0
 lib/libkgroupwarebase.so
 lib/libkgroupwarebase.so.4
-lib/libkgroupwarebase.so.4.3.0
+lib/libkgroupwarebase.so.4.4.0
 lib/libkgroupwaredav.so
 lib/libkgroupwaredav.so.4
-lib/libkgroupwaredav.so.4.3.0
+lib/libkgroupwaredav.so.4.4.0
 lib/libkleo.so
 lib/libkleo.so.4
-lib/libkleo.so.4.3.0
+lib/libkleo.so.4.4.0
 lib/libkleopatraclientcore.so
 lib/libkleopatraclientcore.so.0
 lib/libkleopatraclientcore.so.0.2.1
@@ -310,78 +175,75 @@ lib/libkleopatraclientgui.so
 lib/libkleopatraclientgui.so.0
 lib/libkleopatraclientgui.so.0.2.1
 lib/libkmailprivate.so.4
-lib/libkmailprivate.so.4.3.0
+lib/libkmailprivate.so.4.4.0
 lib/libknodecommon.so
 lib/libknodecommon.so.4
-lib/libknodecommon.so.4.3.0
-lib/libknotes_xmlrpc.so
-lib/libknotes_xmlrpc.so.4
-lib/libknotes_xmlrpc.so.4.3.0
+lib/libknodecommon.so.4.4.0
 lib/libknoteskolab.so
 lib/libknoteskolab.so.4
-lib/libknoteskolab.so.4.3.0
-lib/libknotesscalix.so
-lib/libknotesscalix.so.4
-lib/libknotesscalix.so.4.3.0
-lib/libkontactinterfaces.so
-lib/libkontactinterfaces.so.4
-lib/libkontactinterfaces.so.4.3.0
+lib/libknoteskolab.so.4.4.0
 lib/libkontactprivate.so.4
-lib/libkontactprivate.so.4.3.0
+lib/libkontactprivate.so.4.4.0
 lib/libkorg_stdprinting.so
 lib/libkorg_stdprinting.so.4
-lib/libkorg_stdprinting.so.4.3.0
+lib/libkorg_stdprinting.so.4.4.0
 lib/libkorganizer_calendar.so
 lib/libkorganizer_calendar.so.4
-lib/libkorganizer_calendar.so.4.3.0
+lib/libkorganizer_calendar.so.4.4.0
 lib/libkorganizer_core.so
 lib/libkorganizer_core.so.4
-lib/libkorganizer_core.so.4.3.0
+lib/libkorganizer_core.so.4.4.0
 lib/libkorganizer_eventviewer.so
 lib/libkorganizer_eventviewer.so.4
-lib/libkorganizer_eventviewer.so.4.3.0
+lib/libkorganizer_eventviewer.so.4.4.0
 lib/libkorganizer_interfaces.so
 lib/libkorganizer_interfaces.so.4
-lib/libkorganizer_interfaces.so.4.3.0
+lib/libkorganizer_interfaces.so.4.4.0
 lib/libkorganizerprivate.so.4
-lib/libkorganizerprivate.so.4.3.0
+lib/libkorganizerprivate.so.4.4.0
 lib/libkpgp.so
 lib/libkpgp.so.4
-lib/libkpgp.so.4.3.0
-lib/libkpilot.so
-lib/libkpilot.so.4
-lib/libkpilot.so.4.3.0
-lib/libkpilot_akonadibase.so
-lib/libkpilot_conduit_base.so
+lib/libkpgp.so.4.4.0
 lib/libksieve.so
 lib/libksieve.so.4
-lib/libksieve.so.4.3.0
+lib/libksieve.so.4.4.0
 lib/libkslox.so
 lib/libkslox.so.4
-lib/libkslox.so.4.3.0
+lib/libkslox.so.4.4.0
+lib/libmessagecore.so
+lib/libmessagecore.so.4
+lib/libmessagecore.so.4.4.0
+lib/libmessagelist.so
+lib/libmessagelist.so.4
+lib/libmessagelist.so.4.4.0
+lib/libmessageviewer.so
+lib/libmessageviewer.so.0
+lib/libmessageviewer.so.0.1.0
 lib/libmimelib.so
 lib/libmimelib.so.4
-lib/libmimelib.so.4.3.0
+lib/libmimelib.so.4.4.0
 lib/strigi/strigiea_ics.so
 lib/strigi/strigiea_vcf.so
+man/man1/kabcclient.1
 share/applications/kde4/KMail.desktop
 share/applications/kde4/KNode.desktop
 share/applications/kde4/Kjots.desktop
 share/applications/kde4/Kontact.desktop
+share/applications/kde4/akonadiconsole.desktop
 share/applications/kde4/akregator.desktop
+share/applications/kde4/blogilo.desktop
 share/applications/kde4/groupwarewizard.desktop
 share/applications/kde4/kaddressbook.desktop
 share/applications/kde4/kalarm.desktop
+share/applications/kde4/kleopatra.desktop
 share/applications/kde4/kleopatra_import.desktop
 share/applications/kde4/kmail_view.desktop
 share/applications/kde4/knotes.desktop
 share/applications/kde4/konsolekalendar.desktop
+share/applications/kde4/kontact-admin.desktop
 share/applications/kde4/korganizer-import.desktop
 share/applications/kde4/korganizer.desktop
-share/applications/kde4/kpilot.desktop
-share/applications/kde4/kpilotdaemon.desktop
 share/applications/kde4/ktimetracker.desktop
-share/dbus-1/interfaces/org.kde.KAddressbook.Core.xml
 share/dbus-1/interfaces/org.kde.KNotes.xml
 share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml
 share/dbus-1/interfaces/org.kde.addressbook.service.xml
@@ -417,28 +279,33 @@ share/doc/kde/HTML/en/akregator/main-window4.png
 share/doc/kde/HTML/en/akregator/quick-filter.png
 share/doc/kde/HTML/en/akregator/rss.png
 share/doc/kde/HTML/en/akregator/rss3.png
-share/doc/kde/HTML/en/kaddressbook/addhost.png
-share/doc/kde/HTML/en/kaddressbook/common
-share/doc/kde/HTML/en/kaddressbook/conf.png
-share/doc/kde/HTML/en/kaddressbook/contactdlg.png
-share/doc/kde/HTML/en/kaddressbook/edit_instant_messenging.png
-share/doc/kde/HTML/en/kaddressbook/exportdlg.png
-share/doc/kde/HTML/en/kaddressbook/extension.png
-share/doc/kde/HTML/en/kaddressbook/filtereditdlg.png
-share/doc/kde/HTML/en/kaddressbook/index.cache.bz2
-share/doc/kde/HTML/en/kaddressbook/index.docbook
-share/doc/kde/HTML/en/kaddressbook/mainwin.png
-share/doc/kde/HTML/en/kaddressbook/resourcedlg.png
-share/doc/kde/HTML/en/kaddressbook/resourcesdlg.png
-share/doc/kde/HTML/en/kaddressbook/vieweditdlg.png
+share/doc/kde/HTML/en/blogilo/add-blog-1.png
+share/doc/kde/HTML/en/blogilo/add-blog-2.png
+share/doc/kde/HTML/en/blogilo/common
+share/doc/kde/HTML/en/blogilo/index.cache.bz2
+share/doc/kde/HTML/en/blogilo/index.docbook
+share/doc/kde/HTML/en/blogilo/mainwindow.png
+share/doc/kde/HTML/en/blogilo/media-upload.png
+share/doc/kde/HTML/en/blogilo/toolbox-1.png
+share/doc/kde/HTML/en/blogilo/toolbox-2.png
+share/doc/kde/HTML/en/blogilo/toolbox-3.png
+share/doc/kde/HTML/en/blogilo/toolbox-4.png
+share/doc/kde/HTML/en/kabcclient/common
+share/doc/kde/HTML/en/kabcclient/index.cache.bz2
+share/doc/kde/HTML/en/kabcclient/index.docbook
+share/doc/kde/HTML/en/kabcclient/man-kabcclient.1.docbook
 share/doc/kde/HTML/en/kalarm/alarmmessage.png
 share/doc/kde/HTML/en/kalarm/common
 share/doc/kde/HTML/en/kalarm/editwindow-simple.png
 share/doc/kde/HTML/en/kalarm/editwindow.png
 share/doc/kde/HTML/en/kalarm/index.cache.bz2
 share/doc/kde/HTML/en/kalarm/index.docbook
+share/doc/kde/HTML/en/kalarm/mainwindow-calendars.png
 share/doc/kde/HTML/en/kalarm/mainwindow.png
 share/doc/kde/HTML/en/kalarm/spinbox.png
+share/doc/kde/HTML/en/kioslave/news/common
+share/doc/kde/HTML/en/kioslave/news/index.cache.bz2
+share/doc/kde/HTML/en/kioslave/news/index.docbook
 share/doc/kde/HTML/en/kjots/common
 share/doc/kde/HTML/en/kjots/index.cache.bz2
 share/doc/kde/HTML/en/kjots/index.docbook
@@ -502,6 +369,12 @@ share/doc/kde/HTML/en/knode/using-subscribing.docbook
 share/doc/kde/HTML/en/knotes/common
 share/doc/kde/HTML/en/knotes/index.cache.bz2
 share/doc/kde/HTML/en/knotes/index.docbook
+share/doc/kde/HTML/en/konsolekalendar/common
+share/doc/kde/HTML/en/konsolekalendar/index.cache.bz2
+share/doc/kde/HTML/en/konsolekalendar/index.docbook
+share/doc/kde/HTML/en/kontact-admin/common
+share/doc/kde/HTML/en/kontact-admin/index.cache.bz2
+share/doc/kde/HTML/en/kontact-admin/index.docbook
 share/doc/kde/HTML/en/kontact/calendar-sidebar-icon.png
 share/doc/kde/HTML/en/kontact/common
 share/doc/kde/HTML/en/kontact/configuration-components.png
@@ -583,45 +456,19 @@ share/doc/kde/HTML/en/korganizer/outlook-to-vcalendar.docbook
 share/doc/kde/HTML/en/korganizer/plugins-chapter.docbook
 share/doc/kde/HTML/en/korganizer/remotefile-resource.png
 share/doc/kde/HTML/en/korganizer/todo-general.png
-share/doc/kde/HTML/en/kpilot/common
-share/doc/kde/HTML/en/kpilot/conduit-memofile.png
-share/doc/kde/HTML/en/kpilot/conduit-todo.png
-share/doc/kde/HTML/en/kpilot/conduit-vcal.png
-share/doc/kde/HTML/en/kpilot/configuration.docbook
-share/doc/kde/HTML/en/kpilot/daemon-menu-configure.png
-share/doc/kde/HTML/en/kpilot/daemon-menu.png
-share/doc/kde/HTML/en/kpilot/faq.docbook
-share/doc/kde/HTML/en/kpilot/file-app.png
-share/doc/kde/HTML/en/kpilot/index.cache.bz2
-share/doc/kde/HTML/en/kpilot/index.docbook
-share/doc/kde/HTML/en/kpilot/kpilot.png
-share/doc/kde/HTML/en/kpilot/main-app.png
-share/doc/kde/HTML/en/kpilot/setup-address.png
-share/doc/kde/HTML/en/kpilot/setup-conduit.png
-share/doc/kde/HTML/en/kpilot/setup-dbspecial.png
-share/doc/kde/HTML/en/kpilot/setup-general.png
-share/doc/kde/HTML/en/kpilot/setup-hotsync.png
-share/doc/kde/HTML/en/kpilot/setup-items.png
-share/doc/kde/HTML/en/kpilot/setup-startup-exit.png
-share/doc/kde/HTML/en/kpilot/setup-tabs.png
-share/doc/kde/HTML/en/kpilot/sidebar.png
-share/doc/kde/HTML/en/kpilot/sync.docbook
-share/doc/kde/HTML/en/kpilot/todo-app.png
-share/doc/kde/HTML/en/kpilot/toolbar_backup.png
-share/doc/kde/HTML/en/kpilot/toolbar_hotsync.png
-share/doc/kde/HTML/en/kpilot/usage.docbook
-share/doc/kde/HTML/en/ktimetracker/clipboard-history.png
 share/doc/kde/HTML/en/ktimetracker/common
-share/doc/kde/HTML/en/ktimetracker/copy-this-task.png
 share/doc/kde/HTML/en/ktimetracker/csvexport.png
-share/doc/kde/HTML/en/ktimetracker/daterange.png
 share/doc/kde/HTML/en/ktimetracker/idle-detect.png
 share/doc/kde/HTML/en/ktimetracker/index.cache.bz2
 share/doc/kde/HTML/en/ktimetracker/index.docbook
-share/doc/kde/HTML/en/ktimetracker/karm.png
+share/doc/kde/HTML/en/ktimetracker/ktimetracker.png
 share/doc/kde/HTML/en/ktimetracker/systray.png
+share/doc/kde/HTML/en/kwatchgnupg/common
+share/doc/kde/HTML/en/kwatchgnupg/index.cache.bz2
+share/doc/kde/HTML/en/kwatchgnupg/index.docbook
+share/icons/hicolor/128x128/actions/upload-media.png
 share/icons/hicolor/128x128/apps/akregator.png
-share/icons/hicolor/128x128/apps/kaddressbook.png
+share/icons/hicolor/128x128/apps/blogilo.png
 share/icons/hicolor/128x128/apps/kjots.png
 share/icons/hicolor/128x128/apps/kmail.png
 share/icons/hicolor/128x128/apps/knode.png
@@ -630,16 +477,14 @@ share/icons/hicolor/128x128/apps/knotes.png
 share/icons/hicolor/128x128/apps/kontact.png
 share/icons/hicolor/128x128/apps/korganizer.png
 share/icons/hicolor/128x128/apps/ktimetracker.png
-share/icons/hicolor/16x16/actions/kpilot_backup.png
-share/icons/hicolor/16x16/actions/kpilot_busysync.png
-share/icons/hicolor/16x16/actions/kpilot_fullsync.png
-share/icons/hicolor/16x16/actions/kpilot_hhtopc.png
-share/icons/hicolor/16x16/actions/kpilot_hotsync.png
-share/icons/hicolor/16x16/actions/kpilot_nosync.png
-share/icons/hicolor/16x16/actions/kpilot_reset.png
-share/icons/hicolor/16x16/actions/kpilot_restore.png
+share/icons/hicolor/16x16/actions/format-text-blockquote.png
+share/icons/hicolor/16x16/actions/format-text-code.png
+share/icons/hicolor/16x16/actions/insert-more-mark.png
+share/icons/hicolor/16x16/actions/remove-link.png
+share/icons/hicolor/16x16/actions/upload-media.png
 share/icons/hicolor/16x16/apps/akregator.png
 share/icons/hicolor/16x16/apps/akregator_empty.png
+share/icons/hicolor/16x16/apps/blogilo.png
 share/icons/hicolor/16x16/apps/kaddressbook.png
 share/icons/hicolor/16x16/apps/kalarm.png
 share/icons/hicolor/16x16/apps/kjots.png
@@ -649,32 +494,24 @@ share/icons/hicolor/16x16/apps/knode2.png
 share/icons/hicolor/16x16/apps/knotes.png
 share/icons/hicolor/16x16/apps/kontact.png
 share/icons/hicolor/16x16/apps/korganizer.png
-share/icons/hicolor/16x16/apps/kpilot.png
-share/icons/hicolor/16x16/apps/kpilotdaemon.png
 share/icons/hicolor/16x16/apps/ktimetracker.png
-share/icons/hicolor/22x22/actions/kpilot_backup.png
-share/icons/hicolor/22x22/actions/kpilot_busysync.png
-share/icons/hicolor/22x22/actions/kpilot_fullsync.png
-share/icons/hicolor/22x22/actions/kpilot_hhtopc.png
-share/icons/hicolor/22x22/actions/kpilot_hotsync.png
-share/icons/hicolor/22x22/actions/kpilot_nosync.png
-share/icons/hicolor/22x22/actions/kpilot_reset.png
-share/icons/hicolor/22x22/actions/kpilot_restore.png
+share/icons/hicolor/22x22/actions/format-text-blockquote.png
+share/icons/hicolor/22x22/actions/format-text-code.png
+share/icons/hicolor/22x22/actions/insert-more-mark.png
+share/icons/hicolor/22x22/actions/remove-link.png
+share/icons/hicolor/22x22/actions/upload-media.png
 share/icons/hicolor/22x22/apps/akregator.png
+share/icons/hicolor/22x22/apps/blogilo.png
 share/icons/hicolor/22x22/apps/kaddressbook.png
 share/icons/hicolor/22x22/apps/kjots.png
 share/icons/hicolor/22x22/apps/kmail.png
 share/icons/hicolor/22x22/apps/knotes.png
 share/icons/hicolor/22x22/apps/kontact.png
 share/icons/hicolor/22x22/apps/korganizer.png
-share/icons/hicolor/22x22/apps/kpilot.png
-share/icons/hicolor/22x22/apps/kpilotdaemon.png
 share/icons/hicolor/22x22/apps/ktimetracker.png
-share/icons/hicolor/32x32/actions/kpilot_fullsync.png
-share/icons/hicolor/32x32/actions/kpilot_hhtopc.png
-share/icons/hicolor/32x32/actions/kpilot_hotsync.png
-share/icons/hicolor/32x32/actions/kpilot_reset.png
+share/icons/hicolor/32x32/actions/upload-media.png
 share/icons/hicolor/32x32/apps/akregator.png
+share/icons/hicolor/32x32/apps/blogilo.png
 share/icons/hicolor/32x32/apps/kaddressbook.png
 share/icons/hicolor/32x32/apps/kalarm.png
 share/icons/hicolor/32x32/apps/kjots.png
@@ -684,14 +521,10 @@ share/icons/hicolor/32x32/apps/knode2.png
 share/icons/hicolor/32x32/apps/knotes.png
 share/icons/hicolor/32x32/apps/kontact.png
 share/icons/hicolor/32x32/apps/korganizer.png
-share/icons/hicolor/32x32/apps/kpilot.png
-share/icons/hicolor/32x32/apps/kpilotdaemon.png
 share/icons/hicolor/32x32/apps/ktimetracker.png
-share/icons/hicolor/48x48/actions/kpilot_fullsync.png
-share/icons/hicolor/48x48/actions/kpilot_hhtopc.png
-share/icons/hicolor/48x48/actions/kpilot_hotsync.png
-share/icons/hicolor/48x48/actions/kpilot_reset.png
+share/icons/hicolor/48x48/actions/upload-media.png
 share/icons/hicolor/48x48/apps/akregator.png
+share/icons/hicolor/48x48/apps/blogilo.png
 share/icons/hicolor/48x48/apps/kaddressbook.png
 share/icons/hicolor/48x48/apps/kalarm.png
 share/icons/hicolor/48x48/apps/kjots.png
@@ -701,18 +534,10 @@ share/icons/hicolor/48x48/apps/knode2.png
 share/icons/hicolor/48x48/apps/knotes.png
 share/icons/hicolor/48x48/apps/kontact.png
 share/icons/hicolor/48x48/apps/korganizer.png
-share/icons/hicolor/48x48/apps/kpilot.png
-share/icons/hicolor/48x48/apps/kpilotdaemon.png
 share/icons/hicolor/48x48/apps/ktimetracker.png
-share/icons/hicolor/64x64/actions/kpilot_address.png
-share/icons/hicolor/64x64/actions/kpilot_bhotsync.png
-share/icons/hicolor/64x64/actions/kpilot_calendar.png
-share/icons/hicolor/64x64/actions/kpilot_db.png
-share/icons/hicolor/64x64/actions/kpilot_fileinstaller.png
-share/icons/hicolor/64x64/actions/kpilot_knotes.png
-share/icons/hicolor/64x64/actions/kpilot_todo.png
+share/icons/hicolor/64x64/actions/upload-media.png
 share/icons/hicolor/64x64/apps/akregator.png
-share/icons/hicolor/64x64/apps/kaddressbook.png
+share/icons/hicolor/64x64/apps/blogilo.png
 share/icons/hicolor/64x64/apps/kjots.png
 share/icons/hicolor/64x64/apps/kmail.png
 share/icons/hicolor/64x64/apps/knode.png
@@ -722,14 +547,12 @@ share/icons/hicolor/64x64/apps/kontact.png
 share/icons/hicolor/64x64/apps/korganizer.png
 share/icons/hicolor/64x64/apps/ktimetracker.png
 share/icons/hicolor/scalable/apps/akregator.svgz
-share/icons/hicolor/scalable/apps/kaddressbook.svgz
 share/icons/hicolor/scalable/apps/kjots.svgz
 share/icons/hicolor/scalable/apps/kmail.svgz
 share/icons/hicolor/scalable/apps/korganizer.svgz
 share/icons/oxygen/128x128/apps/kalarm.png
 share/icons/oxygen/128x128/apps/kleopatra.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
-share/icons/oxygen/16x16/actions/ldap_lookup.png
 share/icons/oxygen/16x16/actions/smallclock.png
 share/icons/oxygen/16x16/actions/upindicator.png
 share/icons/oxygen/16x16/apps/kalarm.png
@@ -759,6 +582,7 @@ share/icons/oxygen/scalable/actions/edit-delete-page.svgz
 share/icons/oxygen/scalable/apps/kalarm.svgz
 share/icons/oxygen/scalable/apps/kleopatra.svgz
 share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
+share/kde/apps/akonadiconsole/akonadiconsoleui.rc
 share/kde/apps/akregator/about/akregator.css
 share/kde/apps/akregator/about/main.html
 share/kde/apps/akregator/about/top-left-akregator.png
@@ -769,42 +593,20 @@ share/kde/apps/akregator/articleviewer.rc
 share/kde/apps/akregator/pageviewer.rc
 share/kde/apps/akregator/pics/kmmsgnew.png
 share/kde/apps/akregator/pics/kmmsgunseen.png
-share/kde/apps/kaddressbook/bookmark_xxportui.rc
-share/kde/apps/kaddressbook/csv-templates/kaddressbook.desktop
-share/kde/apps/kaddressbook/csv-templates/outlook2000.desktop
-share/kde/apps/kaddressbook/csv-templates/yahoo.desktop
-share/kde/apps/kaddressbook/csv_xxportui.rc
-share/kde/apps/kaddressbook/eudora_xxportui.rc
-share/kde/apps/kaddressbook/gmx_xxportui.rc
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/aim_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/gadu_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/groupwise_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/icq_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/irc_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/jabber_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/meanwhile_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/msn_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/skype_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/sms_protocol.png
-share/kde/apps/kaddressbook/icons/oxygen/16x16/apps/yahoo_protocol.png
-share/kde/apps/kaddressbook/kaddressbook_part.rc
+share/kde/apps/blogilo/blogiloui.rc
 share/kde/apps/kaddressbook/kaddressbookui.rc
-share/kde/apps/kaddressbook/kde2_xxportui.rc
-share/kde/apps/kaddressbook/ldif_xxportui.rc
-share/kde/apps/kaddressbook/opera_xxportui.rc
-share/kde/apps/kaddressbook/pab_xxportui.rc
-share/kde/apps/kaddressbook/pics/world.jpg
 share/kde/apps/kaddressbook/printing/detailed-style.png
 share/kde/apps/kaddressbook/printing/mike-style.png
 share/kde/apps/kaddressbook/printing/ringbinder-style.png
-share/kde/apps/kaddressbook/vcard_xxportui.rc
-share/kde/apps/kaddressbook/zone.tab
-share/kde/apps/kalarm/kalarmui.rc
 share/kde/apps/kalarm/icons/oxygen/16x16/actions/document-new-from-template.png
+share/kde/apps/kalarm/icons/oxygen/16x16/actions/new-audio-alarm.png
 share/kde/apps/kalarm/icons/oxygen/16x16/actions/new-command-alarm.png
 share/kde/apps/kalarm/icons/oxygen/22x22/actions/document-new-from-template.png
 share/kde/apps/kalarm/icons/oxygen/22x22/actions/kalarm.png
+share/kde/apps/kalarm/icons/oxygen/22x22/actions/new-audio-alarm.png
 share/kde/apps/kalarm/icons/oxygen/22x22/actions/new-command-alarm.png
+share/kde/apps/kalarm/icons/oxygen/22x22/emblems/partdisabled.png
+share/kde/apps/kalarm/kalarmui.rc
 share/kde/apps/kconf_update/kalarm-1.2.1-general.pl
 share/kde/apps/kconf_update/kalarm-1.9.5-defaults.pl
 share/kde/apps/kconf_update/kalarm-2.0.2-general.pl
@@ -833,7 +635,6 @@ share/kde/apps/kconf_update/kolab-resource.upd
 share/kde/apps/kconf_update/korganizer.upd
 share/kde/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/kde/apps/kconf_update/kpgp.upd
-share/kde/apps/kconf_update/kpilot.upd
 share/kde/apps/kconf_update/upgrade-resourcetype.pl
 share/kde/apps/kconf_update/upgrade-signature.pl
 share/kde/apps/kconf_update/upgrade-transport.pl
@@ -858,8 +659,6 @@ share/kde/apps/kmail/kmail_part.rc
 share/kde/apps/kmail/kmcomposerui.rc
 share/kde/apps/kmail/kmmainwin.rc
 share/kde/apps/kmail/kmreadermainwin.rc
-share/kde/apps/kmail/pics/attachmentQuicklistClosed.png
-share/kde/apps/kmail/pics/attachmentQuicklistOpened.png
 share/kde/apps/kmail/pics/enterprise_bottom.png
 share/kde/apps/kmail/pics/enterprise_bottom_left.png
 share/kde/apps/kmail/pics/enterprise_bottom_right.png
@@ -881,25 +680,22 @@ share/kde/apps/kmail/pics/key_ok.png
 share/kde/apps/kmail/pics/key_unknown.png
 share/kde/apps/kmail/pics/kmwizard.png
 share/kde/apps/kmail/pics/mail-deleted.png
-share/kde/apps/kmail/pics/mail-download-later.png
-share/kde/apps/kmail/pics/mail-download-now.png
 share/kde/apps/kmail/pics/mail-encrypted-full.png
 share/kde/apps/kmail/pics/mail-encrypted-part.png
 share/kde/apps/kmail/pics/mail-encrypted.png
+share/kde/apps/kmail/pics/mail-horizontal-space.png
 share/kde/apps/kmail/pics/mail-thread-ignored.png
 share/kde/apps/kmail/pics/mail-thread-watch.png
+share/kde/apps/kmail/pics/mail-vertical-separator-line.png
 share/kde/apps/kmail/pics/pgp-keys.png
+share/kde/apps/kmail/pics/quicklistClosed.png
+share/kde/apps/kmail/pics/quicklistOpened.png
 share/kde/apps/kmail/pics/quotecollapse.png
 share/kde/apps/kmail/pics/quoteexpand.png
 share/kde/apps/kmail/plugins/bodypartformatter/application_octetstream.desktop
 share/kde/apps/kmail/plugins/bodypartformatter/text_calendar.desktop
 share/kde/apps/kmail/plugins/bodypartformatter/text_vcard.desktop
 share/kde/apps/kmail/plugins/bodypartformatter/text_xdiff.desktop
-share/kde/apps/kmail/profile-default-rc
-share/kde/apps/kmail/profile-high-contrast-rc
-share/kde/apps/kmail/profile-html-rc
-share/kde/apps/kmail/profile-purist-rc
-share/kde/apps/kmail/profile-secure-rc
 share/kde/apps/kmail/tips
 share/kde/apps/kmailcvt/pics/step1.png
 share/kde/apps/knode/filters/1.fltr
@@ -916,12 +712,10 @@ share/kde/apps/knode/kncomposerui.rc
 share/kde/apps/knode/knodeui.rc
 share/kde/apps/knode/knreaderui.rc
 share/kde/apps/knode/pics/article.png
-share/kde/apps/knode/pics/ctlart.png
 share/kde/apps/knode/pics/eyes.png
 share/kde/apps/knode/pics/greyball.png
 share/kde/apps/knode/pics/greyballchk.png
 share/kde/apps/knode/pics/group.png
-share/kde/apps/knode/pics/group_big.png
 share/kde/apps/knode/pics/ignore.png
 share/kde/apps/knode/pics/key.png
 share/kde/apps/knode/pics/key_bad.png
@@ -929,13 +723,8 @@ share/kde/apps/knode/pics/key_ok.png
 share/kde/apps/knode/pics/key_unknown.png
 share/kde/apps/knode/pics/mail.png
 share/kde/apps/knode/pics/newsubs.png
-share/kde/apps/knode/pics/pgp-keys.png
 share/kde/apps/knode/pics/posting.png
 share/kde/apps/knode/pics/snderr.png
-share/kde/apps/knode/pics/stat_cncl.png
-share/kde/apps/knode/pics/stat_edit.png
-share/kde/apps/knode/pics/stat_saved.png
-share/kde/apps/knode/pics/stat_sent.png
 share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_alarm.png
 share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_close.png
 share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_date.png
@@ -973,7 +762,6 @@ share/kde/apps/korganizer/sounds/lightmag.wav
 share/kde/apps/korganizer/sounds/onscreen.wav
 share/kde/apps/korganizer/sounds/spinout.wav
 share/kde/apps/korganizer/tips
-share/kde/apps/kpilot/kpilotui.rc
 share/kde/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
 share/kde/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
 share/kde/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png
@@ -1041,15 +829,13 @@ share/kde/apps/libkleopatra/pics/key.png
 share/kde/apps/libkleopatra/pics/key_bad.png
 share/kde/apps/libkleopatra/pics/key_ok.png
 share/kde/apps/libkleopatra/pics/key_unknown.png
-share/kde/autostart/kabcdistlistupdater.desktop
+share/kde/apps/libkleopatra/pics/smartcard.xpm
 share/kde/autostart/kalarm.autostart.desktop
 share/kde/autostart/korgac.desktop
 share/kde/config.kcfg/akregator.kcfg
-share/kde/config.kcfg/calendarsettings.kcfg
-share/kde/config.kcfg/contactssettings.kcfg
+share/kde/config.kcfg/blogilo.kcfg
 share/kde/config.kcfg/custommimeheader.kcfg
 share/kde/config.kcfg/customtemplates_kfg.kcfg
-share/kde/config.kcfg/egroupware.kcfg
 share/kde/config.kcfg/groupwise.kcfg
 share/kde/config.kcfg/kalarmconfig.kcfg
 share/kde/config.kcfg/kjots.kcfg
@@ -1059,15 +845,8 @@ share/kde/config.kcfg/knotesglobalconfig.kcfg
 share/kde/config.kcfg/kolab.kcfg
 share/kde/config.kcfg/kontact.kcfg
 share/kde/config.kcfg/korganizer.kcfg
-share/kde/config.kcfg/kpilot.kcfg
-share/kde/config.kcfg/kpilotlib.kcfg
-share/kde/config.kcfg/memofileconduit.kcfg
-share/kde/config.kcfg/replyphrases.kcfg
-share/kde/config.kcfg/scalix.kcfg
 share/kde/config.kcfg/slox.kcfg
 share/kde/config.kcfg/templatesconfiguration_kfg.kcfg
-share/kde/config.kcfg/timeconduit.kcfg
-share/kde/config.kcfg/todosettings.kcfg
 share/kde/config/kmail.antispamrc
 share/kde/config/kmail.antivirusrc
 share/kde/config/korganizer.knsrc
@@ -1082,39 +861,11 @@ share/kde4/services/akregator_part.desktop
 share/kde4/services/feed.protocol
 share/kde4/services/groupwise.protocol
 share/kde4/services/groupwises.protocol
-share/kde4/services/kabconfig.desktop
-share/kde4/services/kabcustomfields.desktop
-share/kde4/services/kabldapconfig.desktop
-share/kde4/services/kaddressbook/aimprotocol.desktop
-share/kde4/services/kaddressbook/bookmark_xxport.desktop
-share/kde4/services/kaddressbook/cardview.desktop
-share/kde4/services/kaddressbook/cryptosettings.desktop
-share/kde4/services/kaddressbook/csv_xxport.desktop
-share/kde4/services/kaddressbook/distributionlistng.desktop
-share/kde4/services/kaddressbook/eudora_xxport.desktop
-share/kde4/services/kaddressbook/gaduprotocol.desktop
-share/kde4/services/kaddressbook/gmx_xxport.desktop
-share/kde4/services/kaddressbook/groupwiseprotocol.desktop
-share/kde4/services/kaddressbook/iconview.desktop
-share/kde4/services/kaddressbook/icqprotocol.desktop
-share/kde4/services/kaddressbook/ircprotocol.desktop
-share/kde4/services/kaddressbook/jabberprotocol.desktop
-share/kde4/services/kaddressbook/kde2_xxport.desktop
-share/kde4/services/kaddressbook/ldif_xxport.desktop
-share/kde4/services/kaddressbook/meanwhileprotocol.desktop
-share/kde4/services/kaddressbook/msnprotocol.desktop
-share/kde4/services/kaddressbook/opera_xxport.desktop
-share/kde4/services/kaddressbook/pab_xxport.desktop
-share/kde4/services/kaddressbook/resourceselection.desktop
-share/kde4/services/kaddressbook/skypeprotocol.desktop
-share/kde4/services/kaddressbook/smsprotocol.desktop
-share/kde4/services/kaddressbook/tableview.desktop
-share/kde4/services/kaddressbook/vcard_xxport.desktop
-share/kde4/services/kaddressbook/yahooprotocol.desktop
 share/kde4/services/kaddressbookpart.desktop
 share/kde4/services/kcmapptsummary.desktop
 share/kde4/services/kcmkmailsummary.desktop
 share/kde4/services/kcmkontactsummary.desktop
+share/kde4/services/kcmldap.desktop
 share/kde4/services/kcmplanner.desktop
 share/kde4/services/kcmsdsummary.desktop
 share/kde4/services/kcmtodosummary.desktop
@@ -1177,10 +928,6 @@ share/kde4/services/korganizer_configplugins.desktop
 share/kde4/services/korganizer_configtime.desktop
 share/kde4/services/korganizer_configviews.desktop
 share/kde4/services/korganizer_part.desktop
-share/kde4/services/kpilot-conduit-calendar.desktop
-share/kde4/services/kpilot-conduit-contacts.desktop
-share/kde4/services/kpilot-conduit-todo.desktop
-share/kde4/services/kpilot_config.desktop
 share/kde4/services/kresources/alarms/local.desktop
 share/kde4/services/kresources/alarms/localdir.desktop
 share/kde4/services/kresources/alarms/remote.desktop
@@ -1189,9 +936,7 @@ share/kde4/services/kresources/kabc/kabc_groupwise.desktop
 share/kde4/services/kresources/kabc/kabc_opengroupware.desktop
 share/kde4/services/kresources/kabc/kabc_ox.desktop
 share/kde4/services/kresources/kabc/kabc_slox.desktop
-share/kde4/services/kresources/kabc/kabc_xmlrpc.desktop
 share/kde4/services/kresources/kabc/kolab.desktop
-share/kde4/services/kresources/kabc/scalix.desktop
 share/kde4/services/kresources/kalarm_manager.desktop
 share/kde4/services/kresources/kcal/blog.desktop
 share/kde4/services/kresources/kcal/kabc.desktop
@@ -1200,38 +945,21 @@ share/kde4/services/kresources/kcal/kcal_groupwise.desktop
 share/kde4/services/kresources/kcal/kcal_opengroupware.desktop
 share/kde4/services/kresources/kcal/kcal_ox.desktop
 share/kde4/services/kresources/kcal/kcal_slox.desktop
-share/kde4/services/kresources/kcal/kcal_xmlrpc.desktop
 share/kde4/services/kresources/kcal/kolab.desktop
 share/kde4/services/kresources/kcal/remote.desktop
-share/kde4/services/kresources/kcal/scalix.desktop
-share/kde4/services/kresources/knotes/knotes_xmlrpc.desktop
 share/kde4/services/kresources/knotes/kolabresource.desktop
 share/kde4/services/kresources/knotes/local.desktop
-share/kde4/services/kresources/knotes/scalix.desktop
 share/kde4/services/kresources/knotes_manager.desktop
 share/kde4/services/ktimetracker_config_behavior.desktop
 share/kde4/services/ktimetracker_config_display.desktop
 share/kde4/services/ktimetracker_config_storage.desktop
 share/kde4/services/ktimetrackerpart.desktop
-share/kde4/services/ldifvcardthumbnail.desktop
-share/kde4/services/memofile-conduit.desktop
-share/kde4/services/scalix.protocol
-share/kde4/services/scalixs.protocol
-share/kde4/services/time_conduit.desktop
 share/kde4/services/webcal.protocol
 share/kde4/servicetypes/akregator_plugin.desktop
 share/kde4/servicetypes/calendardecoration.desktop
 share/kde4/servicetypes/calendarplugin.desktop
-share/kde4/servicetypes/dbusaddressbook.desktop
 share/kde4/servicetypes/dbuscalendar.desktop
 share/kde4/servicetypes/dbusimap.desktop
 share/kde4/servicetypes/dbusmail.desktop
-share/kde4/servicetypes/kaddressbook_contacteditorwidget.desktop
-share/kde4/servicetypes/kaddressbook_extension.desktop
-share/kde4/servicetypes/kaddressbook_view.desktop
-share/kde4/servicetypes/kaddressbook_xxport.desktop
-share/kde4/servicetypes/kaddressbookimprotocol.desktop
-share/kde4/servicetypes/kontactplugin.desktop
 share/kde4/servicetypes/korganizerpart.desktop
 share/kde4/servicetypes/korgprintplugin.desktop
-share/kde4/servicetypes/kpilotconduit.desktop
diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo
index 5abaa090dc5..da21c545ea7 100644
--- a/misc/kdepim4/distinfo
+++ b/misc/kdepim4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2010/01/27 10:38:40 markd Exp $
+$NetBSD: distinfo,v 1.6 2010/04/10 02:45:03 markd Exp $
 
-SHA1 (kdepim-4.3.5.tar.bz2) = 0c319929af1828f0ee15c47a957f0a3c95556742
-RMD160 (kdepim-4.3.5.tar.bz2) = 4a35783ff949dda1e68af92a83482b92bd831110
-Size (kdepim-4.3.5.tar.bz2) = 11254015 bytes
+SHA1 (kdepim-4.4.2.tar.bz2) = 80dfb58824e9b46f7ca1e203a3599dcc13098bc3
+RMD160 (kdepim-4.4.2.tar.bz2) = c0f6f851c7bece45a884fadfca703f917f325f8a
+Size (kdepim-4.4.2.tar.bz2) = 9356719 bytes
 SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494
 SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18
 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f