3 files changed, 648 insertions, 103 deletions

diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 7e147c85a6ca..1dedf349f750 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,16 +7,20 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
-CATEGORIES=	deskutils mail news kde
+CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Personal Information Management tools for KDE
 
-CONFLICTS=	kdenetwork-3.1.*
+BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
+		gpgsm:${PORTSDIR}/security/gnupg-devel
+LIB_DEPENDS=	mal:${PORTSDIR}/palm/libmal \
+		pisock:${PORTSDIR}/palm/pilot-link
+
+CONFLICTS=	kdenetwork-3.1.* kdeaddons-kontact-plugins-[0-9]* kdepim-kpilot-3.2.3
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
@@ -29,10 +33,8 @@ USE_REINPLACE=	yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
-DO_NOT_COMPILE+=kpilot
 
-OPTIONS=	KPILOT "Build KPilot, hotsync software for KDE" off \
-		GNOKII "KAdressbook import/export for Nokia phones" off
+OPTIONS=	GNOKII "KAdressbook import/export for Nokia phones" off
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
@@ -48,10 +50,6 @@ WITH_GNOKII=	yes
 LIB_DEPENDS+=	gnokii:${PORTSDIR}/comms/gnokii
 .endif # defined ($(WITH_GNOKII))
 
-.if defined(WITH_KPILOT)
-RUN_DEPENDS+=	kpilot:${PORTSDIR}/palm/kpilot
-.endif
-
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
@@ -69,6 +67,5 @@ pre-everything::
 pre-configure:
 	${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-lgnokii|-lgnokii -liconv -lintl|' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e '/^SUBDIRS/s/kpilot//g' ${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index 81c5588eeb22..d84ca52b8bd5 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdepim-3.2.3.tar.bz2) = 06d3e5d1ee0cd7f2a55bd26d05ee4987
-SIZE (KDE/kdepim-3.2.3.tar.bz2) = 7711686
+MD5 (KDE/kdepim-3.3.0.tar.bz2) = 94520aeae0db2fac5da7d1ece7b575a5
+SIZE (KDE/kdepim-3.3.0.tar.bz2) = 9951726
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index 7938345058e0..fa9d993a3aa8 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -1,4 +1,5 @@
-bin/ghns
+bin/egroupwarewizard
+bin/groupwarewizard
 bin/ical2vcal
 bin/kabc2mutt
 bin/kaddressbook
@@ -7,32 +8,55 @@ bin/kalarmd
 bin/kandy
 bin/kandy_client
 bin/karm
-bin/kgpgcertmanager
-bin/khotnewstuff
+bin/kitchensync
+bin/kleopatra
 bin/kmail
+bin/kmail_antivir.sh
+bin/kmail_clamav.sh
+bin/kmail_fprot.sh
+bin/kmail_sav.sh
 bin/kmailcvt
 bin/knode
 bin/knotes
+bin/kolabwizard
 bin/konsolekalendar
 bin/kontact
 bin/korgac
 bin/korganizer
 bin/korganizerIn
 bin/korn
+bin/kpalmdoc
+bin/kpilot
+bin/kpilotDaemon
 bin/ksync
 bin/ktnef
-include/KDGanttView.h
-include/KDGanttViewEventItem.h
-include/KDGanttViewItem.h
-include/KDGanttViewSummaryItem.h
-include/KDGanttViewTaskItem.h
-include/KDGanttViewTaskLink.h
-include/KDGanttViewTaskLinkGroup.h
-include/KDXMLTools.h
+bin/kwatchgnupg
+bin/sloxwizard
 include/KNotesIface.h
 include/calendar/calendardecoration.h
 include/calendar/plugin.h
+include/gpgme++/context.h
+include/gpgme++/data.h
+include/gpgme++/decryptionresult.h
+include/gpgme++/encryptionresult.h
+include/gpgme++/engineinfo.h
+include/gpgme++/eventloopinteractor.h
+include/gpgme++/gpgmefw.h
+include/gpgme++/importresult.h
+include/gpgme++/interfaces/editinteractor.h
+include/gpgme++/interfaces/passphraseprovider.h
+include/gpgme++/interfaces/progressprovider.h
+include/gpgme++/key.h
+include/gpgme++/keygenerationresult.h
+include/gpgme++/keylistresult.h
+include/gpgme++/result.h
+include/gpgme++/signingresult.h
+include/gpgme++/trustitem.h
+include/gpgme++/verificationresult.h
+include/kabc/kabc_resourcexmlrpc.h
+include/kabc/kcal_resourcexmlrpc.h
 include/kaddressbook/configurewidget.h
+include/kaddressbook/contacteditorwidget.h
 include/kaddressbook/core.h
 include/kaddressbook/extensionwidget.h
 include/kaddressbook/xxport.h
@@ -46,19 +70,54 @@ include/kgantt/xQGanttBarView.h
 include/kgantt/xQGanttBarViewPort.h
 include/kgantt/xQGanttListView.h
 include/kgantt/xQGanttListViewPort.h
+include/kitchensync/actionpart.h
+include/kitchensync/konnectorview.h
+include/kitchensync/mainwindow.h
+include/kitchensync/partbar.h
+include/kitchensync/profile.h
+include/kitchensync/systemtray.h
+include/kleo/backendconfigwidget.h
+include/kleo/cryptobackend.h
+include/kleo/cryptobackendfactory.h
+include/kleo/cryptoconfig.h
+include/kleo/decryptjob.h
+include/kleo/decryptverifyjob.h
+include/kleo/deletejob.h
+include/kleo/dn.h
+include/kleo/dnattributeorderconfigwidget.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/keyapprovaldialog.h
+include/kleo/keyfilter.h
+include/kleo/keyfiltermanager.h
+include/kleo/keygenerationjob.h
+include/kleo/keylistjob.h
+include/kleo/keylistview.h
+include/kleo/keyrequester.h
+include/kleo/keyselectiondialog.h
+include/kleo/multideletejob.h
+include/kleo/passphrasedialog.h
+include/kleo/progressbar.h
+include/kleo/progressdialog.h
+include/kleo/refreshkeysjob.h
+include/kleo/signencryptjob.h
+include/kleo/signjob.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/kmailIface.h
 include/kmailicalIface.h
 include/kmailpartIface.h
-include/knewstuff/downloaddialog.h
-include/knewstuff/engine.h
-include/knewstuff/entry.h
-include/knewstuff/ghns.h
-include/knewstuff/knewstuff.h
-include/knewstuff/knewstuffgeneric.h
-include/knewstuff/provider.h
-include/knewstuff/providerdialog.h
-include/knewstuff/testnewstuff.h
-include/knewstuff/uploaddialog.h
 include/kontact/core.h
 include/kontact/plugin.h
 include/kontact/summary.h
@@ -66,6 +125,15 @@ include/korganizer/baseview.h
 include/korganizer/calendarviewbase.h
 include/korganizer/mainwindow.h
 include/korganizer/part.h
+include/kpilot/kpilotlink.h
+include/kpilot/pilotDatabase.h
+include/kpilot/pilotLocalDatabase.h
+include/kpilot/pilotRecord.h
+include/kpilot/pilotSerialDatabase.h
+include/kpilot/plugin.h
+include/kpilot/syncAction.h
+include/kpilot/uiDialog.h
+include/ksharedfile.h
 include/ksieve/error.h
 include/ksieve/lexer.h
 include/ksieve/parser.h
@@ -101,6 +169,7 @@ include/libkcal/icalformat.h
 include/libkcal/incidence.h
 include/libkcal/incidencebase.h
 include/libkcal/journal.h
+include/libkcal/kcalversion.h
 include/libkcal/listbase.h
 include/libkcal/period.h
 include/libkcal/person.h
@@ -152,8 +221,32 @@ include/mimelib/text.h
 include/mimelib/token.h
 include/mimelib/utility.h
 include/mimelib/uuencode.h
+include/qgpgme/dataprovider.h
+include/qgpgme/eventloopinteractor.h
+lib/kde3/conduit_address.la
+lib/kde3/conduit_address.so
+lib/kde3/conduit_doc.la
+lib/kde3/conduit_doc.so
+lib/kde3/conduit_knotes.la
+lib/kde3/conduit_knotes.so
+lib/kde3/conduit_mal.la
+lib/kde3/conduit_mal.so
+lib/kde3/conduit_popmail.la
+lib/kde3/conduit_popmail.so
+lib/kde3/conduit_sysinfo.la
+lib/kde3/conduit_sysinfo.so
+lib/kde3/conduit_time.la
+lib/kde3/conduit_time.so
+lib/kde3/conduit_todo.la
+lib/kde3/conduit_todo.so
+lib/kde3/conduit_vcal.la
+lib/kde3/conduit_vcal.so
 lib/kde3/kabc_imap.la
 lib/kde3/kabc_imap.so
+lib/kde3/kabc_slox.la
+lib/kde3/kabc_slox.so
+lib/kde3/kabc_xmlrpc.la
+lib/kde3/kabc_xmlrpc.so
 lib/kde3/kcal_imap.la
 lib/kde3/kcal_imap.so
 lib/kde3/kcal_kabc.la
@@ -164,58 +257,108 @@ lib/kde3/kcal_localdir.la
 lib/kde3/kcal_localdir.so
 lib/kde3/kcal_remote.la
 lib/kde3/kcal_remote.so
+lib/kde3/kcal_slox.la
+lib/kde3/kcal_slox.so
+lib/kde3/kcal_xmlrpc.la
+lib/kde3/kcal_xmlrpc.so
 lib/kde3/kcm_kabconfig.la
 lib/kde3/kcm_kabconfig.so
+lib/kde3/kcm_kabcustomfields.la
+lib/kde3/kcm_kabcustomfields.so
 lib/kde3/kcm_kabldapconfig.la
 lib/kde3/kcm_kabldapconfig.so
+lib/kde3/kcm_kabsummary.la
+lib/kde3/kcm_kabsummary.so
+lib/kde3/kcm_kleopatra.la
+lib/kde3/kcm_kleopatra.so
+lib/kde3/kcm_kmail.la
+lib/kde3/kcm_kmail.so
+lib/kde3/kcm_kmailsummary.la
+lib/kde3/kcm_kmailsummary.so
+lib/kde3/kcm_knode.la
+lib/kde3/kcm_knode.so
 lib/kde3/kcm_kontact.la
 lib/kde3/kcm_kontact.so
+lib/kde3/kcm_kontactknt.la
+lib/kde3/kcm_kontactknt.so
+lib/kde3/kcm_kontactsummary.la
+lib/kde3/kcm_kontactsummary.so
 lib/kde3/kcm_korganizer.la
 lib/kde3/kcm_korganizer.so
+lib/kde3/kcm_korgsummary.la
+lib/kde3/kcm_korgsummary.so
+lib/kde3/kcm_kpilot.la
+lib/kde3/kcm_kpilot.so
+lib/kde3/kfile_palm.la
+lib/kde3/kfile_palm.so
 lib/kde3/kfile_vcf.la
 lib/kde3/kfile_vcf.so
+lib/kde3/kio_newimap4.la
+lib/kde3/kio_newimap4.so
 lib/kde3/kio_sieve.la
 lib/kde3/kio_sieve.so
+lib/kde3/knotes_imap.la
+lib/kde3/knotes_imap.so
+lib/kde3/knotes_local.la
+lib/kde3/knotes_local.so
+lib/kde3/knotes_xmlrpc.la
+lib/kde3/knotes_xmlrpc.so
 lib/kde3/ldifvcardthumbnail.la
 lib/kde3/ldifvcardthumbnail.so
+lib/kde3/libegroupwarewizard.la
+lib/kde3/libegroupwarewizard.so
+lib/kde3/libegroupwarewizard.so.0
 lib/kde3/libkaddrbk_bookmark_xxport.la
 lib/kde3/libkaddrbk_bookmark_xxport.so
 lib/kde3/libkaddrbk_cardview.la
 lib/kde3/libkaddrbk_cardview.so
+lib/kde3/libkaddrbk_cryptosettings.la
+lib/kde3/libkaddrbk_cryptosettings.so
 lib/kde3/libkaddrbk_csv_xxport.la
 lib/kde3/libkaddrbk_csv_xxport.so
 lib/kde3/libkaddrbk_distributionlist.la
 lib/kde3/libkaddrbk_distributionlist.so
 lib/kde3/libkaddrbk_eudora_xxport.la
 lib/kde3/libkaddrbk_eudora_xxport.so
-lib/kde3/libkaddrbk_gnokii_xxport.la
-lib/kde3/libkaddrbk_gnokii_xxport.so
 lib/kde3/libkaddrbk_iconview.la
 lib/kde3/libkaddrbk_iconview.so
+lib/kde3/libkaddrbk_instantmessaging.la
+lib/kde3/libkaddrbk_instantmessaging.so
 lib/kde3/libkaddrbk_kde2_xxport.la
 lib/kde3/libkaddrbk_kde2_xxport.so
 lib/kde3/libkaddrbk_ldif_xxport.la
 lib/kde3/libkaddrbk_ldif_xxport.so
-lib/kde3/libkaddrbk_location.la
-lib/kde3/libkaddrbk_location.so
-lib/kde3/libkaddrbk_merge.la
-lib/kde3/libkaddrbk_merge.so
 lib/kde3/libkaddrbk_opera_xxport.la
 lib/kde3/libkaddrbk_opera_xxport.so
 lib/kde3/libkaddrbk_pab_xxport.la
 lib/kde3/libkaddrbk_pab_xxport.so
+lib/kde3/libkaddrbk_resourceselection.la
+lib/kde3/libkaddrbk_resourceselection.so
 lib/kde3/libkaddrbk_tableview.la
 lib/kde3/libkaddrbk_tableview.so
 lib/kde3/libkaddrbk_vcard_xxport.la
 lib/kde3/libkaddrbk_vcard_xxport.so
 lib/kde3/libkaddressbookpart.la
 lib/kde3/libkaddressbookpart.so
+lib/kde3/libkded_ksharedfile.la
+lib/kde3/libkded_ksharedfile.so
+lib/kde3/libkitchensyncpart.la
+lib/kde3/libkitchensyncpart.so
+lib/kde3/libkmail_bodypartformatter_application_octetstream.la
+lib/kde3/libkmail_bodypartformatter_application_octetstream.so
+lib/kde3/libkmail_bodypartformatter_text_calendar.la
+lib/kde3/libkmail_bodypartformatter_text_calendar.so
+lib/kde3/libkmail_bodypartformatter_text_vcard.la
+lib/kde3/libkmail_bodypartformatter_text_vcard.so
 lib/kde3/libkmailpart.la
 lib/kde3/libkmailpart.so
 lib/kde3/libkmailpart.so.1
 lib/kde3/libknodepart.la
 lib/kde3/libknodepart.so
 lib/kde3/libknodepart.so.1
+lib/kde3/libkolabwizard.la
+lib/kde3/libkolabwizard.so
+lib/kde3/libkolabwizard.so.0
 lib/kde3/libkontact_kaddressbookplugin.la
 lib/kde3/libkontact_kaddressbookplugin.so
 lib/kde3/libkontact_kmailplugin.la
@@ -226,14 +369,16 @@ lib/kde3/libkontact_knotesplugin.la
 lib/kde3/libkontact_knotesplugin.so
 lib/kde3/libkontact_korganizerplugin.la
 lib/kde3/libkontact_korganizerplugin.so
+lib/kde3/libkontact_kpilotplugin.la
+lib/kde3/libkontact_kpilotplugin.so
+lib/kde3/libkontact_newstickerplugin.la
+lib/kde3/libkontact_newstickerplugin.so
 lib/kde3/libkontact_summaryplugin.la
 lib/kde3/libkontact_summaryplugin.so
 lib/kde3/libkontact_todoplugin.la
 lib/kde3/libkontact_todoplugin.so
 lib/kde3/libkontact_weatherplugin.la
 lib/kde3/libkontact_weatherplugin.so
-lib/kde3/libkorg_birthdays.la
-lib/kde3/libkorg_birthdays.so
 lib/kde3/libkorg_datenums.la
 lib/kde3/libkorg_datenums.so
 lib/kde3/libkorg_exchange.la
@@ -248,6 +393,39 @@ lib/kde3/libkorg_webexport.la
 lib/kde3/libkorg_webexport.so
 lib/kde3/libkorganizerpart.la
 lib/kde3/libkorganizerpart.so
+lib/kde3/libksync_backup.la
+lib/kde3/libksync_backup.so
+lib/kde3/libksync_debugger.la
+lib/kde3/libksync_debugger.so
+lib/kde3/libksync_restore.la
+lib/kde3/libksync_restore.so
+lib/kde3/libksync_syncerpart.la
+lib/kde3/libksync_syncerpart.so
+lib/kde3/libksync_viewer.la
+lib/kde3/libksync_viewer.so
+lib/kde3/liboverviewpart.la
+lib/kde3/liboverviewpart.so
+lib/kde3/libsloxwizard.la
+lib/kde3/libsloxwizard.so
+lib/kde3/libsloxwizard.so.0
+lib/kde3/resourcecalendarexchange.la
+lib/kde3/resourcecalendarexchange.so
+lib/libdummykonnector.la
+lib/libdummykonnector.so
+lib/libgpgme++.la
+lib/libgpgme++.so
+lib/libgpgme++.so.0
+lib/libkabc_imap.la
+lib/libkabc_imap.so
+lib/libkabc_imap.so.0
+lib/libkabc_slox.la
+lib/libkabc_slox.so
+lib/libkabc_slox.so.0
+lib/libkabc_xmlrpc.la
+lib/libkabc_xmlrpc.so
+lib/libkabc_xmlrpc.so.1
+lib/libkabckonnector.la
+lib/libkabckonnector.so
 lib/libkabinterfaces.la
 lib/libkabinterfaces.so
 lib/libkabinterfaces.so.1
@@ -260,51 +438,104 @@ lib/libkalarmd.so.0
 lib/libkcal.la
 lib/libkcal.so
 lib/libkcal.so.2
+lib/libkcal_imap.la
+lib/libkcal_imap.so
+lib/libkcal_imap.so.1
+lib/libkcal_resourceremote.la
+lib/libkcal_resourceremote.so
+lib/libkcal_resourceremote.so.1
+lib/libkcal_slox.la
+lib/libkcal_slox.so
+lib/libkcal_slox.so.0
+lib/libkcal_xmlrpc.la
+lib/libkcal_xmlrpc.so
+lib/libkcal_xmlrpc.so.1
+lib/libkcalkonnector.la
+lib/libkcalkonnector.so
 lib/libkdenetwork.la
 lib/libkdenetwork.so
 lib/libkdenetwork.so.4
 lib/libkdepim.la
 lib/libkdepim.so
 lib/libkdepim.so.1
-lib/libkdgantt.la
-lib/libkdgantt.so
-lib/libkdgantt.so.0
 lib/libkgantt.la
 lib/libkgantt.so
 lib/libkgantt.so.0
+lib/libkitchensyncui.la
+lib/libkitchensyncui.so
+lib/libkitchensyncui.so.0
+lib/libkleopatra.la
+lib/libkleopatra.so
+lib/libkleopatra.so.0
 lib/libkmailprivate.la
 lib/libkmailprivate.so
 lib/libkmailprivate.so.0
-lib/libknewstuff.la
-lib/libknewstuff.so
-lib/libknewstuff.so.1
+lib/libknodecommon.la
+lib/libknodecommon.so
+lib/libknodecommon.so.0
+lib/libknotes_imap.la
+lib/libknotes_imap.so
+lib/libknotes_imap.so.0
+lib/libknotes_xmlrpc.la
+lib/libknotes_xmlrpc.so
+lib/libknotes_xmlrpc.so.1
+lib/libkonnector.la
+lib/libkonnector.so
+lib/libkonnector.so.0
 lib/libkontact.la
 lib/libkontact.so
 lib/libkontact.so.1
 lib/libkorganizer.la
 lib/libkorganizer.so
 lib/libkorganizer.so.1
+lib/libkorganizer_calendar.la
+lib/libkorganizer_calendar.so
+lib/libkorganizer_calendar.so.1
 lib/libkorganizer_eventviewer.la
 lib/libkorganizer_eventviewer.so
 lib/libkorganizer_eventviewer.so.1
+lib/libkpilot.la
+lib/libkpilot.so
+lib/libkpilot.so.0
 lib/libkpimexchange.la
 lib/libkpimexchange.so
 lib/libkpimexchange.so.1
+lib/libkpimidentities.la
+lib/libkpimidentities.so
+lib/libkpimidentities.so.1
 lib/libkpinterfaces.la
 lib/libkpinterfaces.so
 lib/libkpinterfaces.so.1
+lib/libksharedfile.la
+lib/libksharedfile.so
+lib/libksharedfile.so.0
 lib/libksieve.la
 lib/libksieve.so
 lib/libksieve.so.0
+lib/libkslox.la
+lib/libkslox.so
+lib/libkslox.so.0
 lib/libksync.la
 lib/libksync.so
 lib/libksync.so.1
+lib/libksync2.la
+lib/libksync2.so
+lib/libksync2.so.0
 lib/libktnef.la
 lib/libktnef.so
 lib/libktnef.so.1
+lib/liblocalkonnector.la
+lib/liblocalkonnector.so
 lib/libmimelib.la
 lib/libmimelib.so
 lib/libmimelib.so.1
+lib/libqgpgme.la
+lib/libqgpgme.so
+lib/libqgpgme.so.0
+lib/libqtopiakonnector.la
+lib/libqtopiakonnector.so
+lib/libremotekonnector.la
+lib/libremotekonnector.so
 share/applications/kde/KMail.desktop
 share/applications/kde/KNode.desktop
 share/applications/kde/KOrn.desktop
@@ -313,9 +544,14 @@ share/applications/kde/kaddressbook.desktop
 share/applications/kde/kalarm.desktop
 share/applications/kde/kandy.desktop
 share/applications/kde/karm.desktop
+share/applications/kde/kleopatra_import.desktop
+share/applications/kde/kmail_view.desktop
 share/applications/kde/knotes.desktop
 share/applications/kde/konsolekalendar.desktop
 share/applications/kde/korganizer.desktop
+share/applications/kde/kpalmdoc.desktop
+share/applications/kde/kpilot.desktop
+share/applications/kde/kpilotdaemon.desktop
 share/applications/kde/ktnef.desktop
 share/applnk/.hidden/kalarmd.desktop
 share/applnk/Applications/kalarm.desktop
@@ -323,14 +559,22 @@ share/applnk/Utilities/kandy.desktop
 share/applnk/Utilities/karm.desktop
 share/applnk/Utilities/kmailcvt.desktop
 share/apps/kaddressbook/bookmark_xxportui.rc
+share/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
 share/apps/kaddressbook/csv-templates/kaddressbook.desktop
 share/apps/kaddressbook/csv-templates/outlook2000.desktop
 share/apps/kaddressbook/csv-templates/yahoo.desktop
 share/apps/kaddressbook/csv_xxportui.rc
 share/apps/kaddressbook/eudora_xxportui.rc
-share/apps/kaddressbook/gnokii_xxportui.rc
 share/apps/kaddressbook/icons/crystalsvg/16x16/actions/ldap_lookup.png
 share/apps/kaddressbook/icons/crystalsvg/16x16/actions/smallcal.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/apps/aim_protocol.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/apps/gadu_protocol.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/apps/icq_protocol.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/apps/irc_protocol.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/apps/jabber_protocol.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/apps/msn_protocol.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/apps/sms_protocol.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/apps/yahoo_protocol.png
 share/apps/kaddressbook/icons/crystalsvg/32x32/actions/gohome.png
 share/apps/kaddressbook/icons/crystalsvg/32x32/actions/homepage.png
 share/apps/kaddressbook/icons/locolor/16x16/actions/contact.png
@@ -356,6 +600,7 @@ share/apps/kalarm/icons/crystalsvg/16x16/actions/message.png
 share/apps/kalarm/icons/crystalsvg/16x16/actions/playsound.png
 share/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm.png
 share/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm_disabled.png
+share/apps/kalarm/kalarmui.rc
 share/apps/kandy/default.kandy
 share/apps/kandy/kandymobileui.rc
 share/apps/kandy/kandyui.rc
@@ -385,11 +630,19 @@ share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
 share/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
 share/apps/kconf_update/kmail-3.2-misc.sh
 share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
+share/apps/kconf_update/kmail-3.3-aegypten.pl
+share/apps/kconf_update/kmail-3.3-misc.pl
+share/apps/kconf_update/kmail-3.3-move-identities.pl
+share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
+share/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
+share/apps/kconf_update/kmail-3.3b1-misc.pl
 share/apps/kconf_update/kmail-pgpidentity.pl
 share/apps/kconf_update/kmail-upd-identities.pl
 share/apps/kconf_update/kmail.upd
+share/apps/kconf_update/kpalmdoc.upd
 share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/apps/kconf_update/kpgp.upd
+share/apps/kconf_update/kpilot.upd
 share/apps/kconf_update/upgrade-signature.pl
 share/apps/kconf_update/upgrade-transport.pl
 share/apps/kgantt/icons/crystalsvg/16x16/actions/ganttSelect.png
@@ -401,7 +654,9 @@ share/apps/kgantt/icons/crystalsvg/22x22/actions/ganttUnselecttask.png
 share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelect.png
 share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelecttask.png
 share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttUnselecttask.png
-share/apps/kgpgcertmanager/kgpgcertmanagerui.rc
+share/apps/kitchensync/ksyncgui.rc
+share/apps/kitchensync/pics/opie.png
+share/apps/kleopatra/kleopatraui.rc
 share/apps/kmail/about/background.png
 share/apps/kmail/about/bgtable.png
 share/apps/kmail/about/kdelogo2.png
@@ -423,32 +678,16 @@ share/apps/kmail/icons/crystalsvg/48x48/actions/mark_as_spam.png
 share/apps/kmail/kmcomposerui.rc
 share/apps/kmail/kmmainwin.rc
 share/apps/kmail/kmreadermainwin.rc
-share/apps/kmail/pics/kdelogo.png
 share/apps/kmail/pics/key.png
 share/apps/kmail/pics/key_bad.png
 share/apps/kmail/pics/key_ok.png
 share/apps/kmail/pics/key_unknown.png
-share/apps/kmail/pics/kmailwindowlayout1.png
-share/apps/kmail/pics/kmailwindowlayout1_no_mime.png
-share/apps/kmail/pics/kmailwindowlayout1_smart_mime.png
-share/apps/kmail/pics/kmailwindowlayout2.png
-share/apps/kmail/pics/kmailwindowlayout2_no_mime.png
-share/apps/kmail/pics/kmailwindowlayout2_smart_mime.png
-share/apps/kmail/pics/kmailwindowlayout3.png
-share/apps/kmail/pics/kmailwindowlayout3_no_mime.png
-share/apps/kmail/pics/kmailwindowlayout3_smart_mime.png
-share/apps/kmail/pics/kmailwindowlayout4.png
-share/apps/kmail/pics/kmailwindowlayout4_no_mime.png
-share/apps/kmail/pics/kmailwindowlayout4_smart_mime.png
-share/apps/kmail/pics/kmailwindowlayout5.png
-share/apps/kmail/pics/kmailwindowlayout5_no_mime.png
-share/apps/kmail/pics/kmailwindowlayout5_smart_mime.png
 share/apps/kmail/pics/kmgroupware_folder_calendar.png
 share/apps/kmail/pics/kmgroupware_folder_contacts.png
 share/apps/kmail/pics/kmgroupware_folder_notes.png
 share/apps/kmail/pics/kmgroupware_folder_tasks.png
+share/apps/kmail/pics/kmmsgattachment.png
 share/apps/kmail/pics/kmmsgdel.png
-share/apps/kmail/pics/kmmsgfiller.png
 share/apps/kmail/pics/kmmsgflag.png
 share/apps/kmail/pics/kmmsgforwarded.png
 share/apps/kmail/pics/kmmsgfullyencrypted.png
@@ -468,9 +707,9 @@ share/apps/kmail/pics/kmmsgundefinedsigned.png
 share/apps/kmail/pics/kmmsgunseen.png
 share/apps/kmail/pics/kmmsgwatched.png
 share/apps/kmail/pics/pgp-keys.png
-share/apps/kmail/pics/pub_key_red.png
-share/apps/kmail/pics/stopwatch.xbm
-share/apps/kmail/pics/stopwatchMask.xbm
+share/apps/kmail/plugins/bodypartformatter/application_octetstream.desktop
+share/apps/kmail/plugins/bodypartformatter/text_calendar.desktop
+share/apps/kmail/plugins/bodypartformatter/text_vcard.desktop
 share/apps/kmail/profile-default-rc
 share/apps/kmail/profile-high-contrast-rc
 share/apps/kmail/profile-html-rc
@@ -479,7 +718,6 @@ share/apps/kmail/profile-secure-rc
 share/apps/kmail/tips
 share/apps/kmailcvt/pics/step1.png
 share/apps/kmailcvt/pics/step2.png
-share/apps/knewstuff/types
 share/apps/knode/filters/1.fltr
 share/apps/knode/filters/2.fltr
 share/apps/knode/filters/3.fltr
@@ -648,9 +886,7 @@ share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
 share/apps/korganizer/korganizer_part.rc
-share/apps/korganizer/korganizergsui.rc
 share/apps/korganizer/korganizerui.rc
-share/apps/korganizer/plugins/birthdaysui.rc
 share/apps/korganizer/plugins/exchangeui.rc
 share/apps/korganizer/plugins/projectviewui.rc
 share/apps/korganizer/plugins/webexportui.rc
@@ -660,20 +896,72 @@ share/apps/korganizer/sounds/lightmag.wav
 share/apps/korganizer/sounds/onscreen.wav
 share/apps/korganizer/sounds/spinout.wav
 share/apps/korganizer/tips
+share/apps/kpilot/icons/crystalsvg/16x16/actions/backup.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/busysync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/fastsync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/hotsync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/nosync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/restore.png
+share/apps/kpilot/icons/crystalsvg/16x16/apps/kpalmdoc.png
+share/apps/kpilot/icons/crystalsvg/22x22/actions/backup.png
+share/apps/kpilot/icons/crystalsvg/22x22/actions/busysync.png
+share/apps/kpilot/icons/crystalsvg/22x22/actions/fastsync.png
+share/apps/kpilot/icons/crystalsvg/22x22/actions/hotsync.png
+share/apps/kpilot/icons/crystalsvg/22x22/actions/nosync.png
+share/apps/kpilot/icons/crystalsvg/22x22/actions/restore.png
+share/apps/kpilot/icons/crystalsvg/22x22/apps/kpalmdoc.png
+share/apps/kpilot/icons/crystalsvg/32x32/apps/kpalmdoc.png
+share/apps/kpilot/icons/crystalsvg/48x48/apps/kpalmdoc.png
+share/apps/kpilot/kpilot-address.png
+share/apps/kpilot/kpilot-bhotsync.png
+share/apps/kpilot/kpilot-calendar.png
+share/apps/kpilot/kpilot-db.png
+share/apps/kpilot/kpilot-fileinstaller.png
+share/apps/kpilot/kpilot-knotes.png
+share/apps/kpilot/kpilot-splash.png
+share/apps/kpilot/kpilot-todo.png
+share/apps/kpilot/kpilotui.rc
+share/apps/kpilot/sysinfoconduit/Template.html
+share/apps/kpilot/sysinfoconduit/Template.txt
 share/apps/ksync/ksyncui.rc
 share/apps/ktnef/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
 share/apps/ktnef/icons/hicolor/22x22/actions/ktnef_extract_to.png
 share/apps/ktnef/icons/locolor/16x16/actions/ktnef_extract_all_to.png
 share/apps/ktnef/icons/locolor/16x16/actions/ktnef_extract_to.png
 share/apps/ktnef/ktnefui.rc
+share/apps/kwatchgnupg/kwatchgnupgui.rc
+share/apps/kwatchgnupg/pics/kwatchgnupg.png
+share/apps/kwatchgnupg/pics/kwatchgnupg2.png
+share/apps/libkleopatra/pics/key.png
+share/apps/libkleopatra/pics/key_bad.png
+share/apps/libkleopatra/pics/key_ok.png
+share/apps/libkleopatra/pics/key_unknown.png
 share/autostart/kalarm.tray.desktop
 share/autostart/kalarmd.autostart.desktop
 share/autostart/korgac.desktop
+share/config.kcfg/abbrowserconduit.kcfg
+share/config.kcfg/docconduit.kcfg
+share/config.kcfg/egroupware.kcfg
 share/config.kcfg/kandy.kcfg
-share/config.kcfg/knotes.kcfg
+share/config.kcfg/kmail.kcfg
+share/config.kcfg/knoteconfig.kcfg
+share/config.kcfg/knotesconduit.kcfg
+share/config.kcfg/knotesglobalconfig.kcfg
+share/config.kcfg/kolab.kcfg
 share/config.kcfg/kontact.kcfg
 share/config.kcfg/korganizer.kcfg
-share/config/khotnewstuffrc
+share/config.kcfg/kpalmdoc.kcfg
+share/config.kcfg/kpilot.kcfg
+share/config.kcfg/kpilotlib.kcfg
+share/config.kcfg/malconduit.kcfg
+share/config.kcfg/popmail.kcfg
+share/config.kcfg/slox.kcfg
+share/config.kcfg/sysinfoconduit.kcfg
+share/config.kcfg/timeconduit.kcfg
+share/config.kcfg/vcalconduitbase.kcfg
+share/config/kmail.antispamrc
+share/config/kmail.antivirusrc
+share/config/libkleopatrarc
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
 share/doc/HTML/en/kaddressbook/contactdlg.png
@@ -691,20 +979,27 @@ share/doc/HTML/en/kalarm/editwindow.png
 share/doc/HTML/en/kalarm/index.cache.bz2
 share/doc/HTML/en/kalarm/index.docbook
 share/doc/HTML/en/kalarm/mainwindow.png
+share/doc/HTML/en/kalarm/spinbox.png
 share/doc/HTML/en/kandy/common
 share/doc/HTML/en/kandy/index.cache.bz2
 share/doc/HTML/en/kandy/index.docbook
+share/doc/HTML/en/karm/clipboard-history.png
 share/doc/HTML/en/karm/common
+share/doc/HTML/en/karm/copy-this-task.png
+share/doc/HTML/en/karm/csvexport.png
+share/doc/HTML/en/karm/daterange.png
+share/doc/HTML/en/karm/idle-detect.png
 share/doc/HTML/en/karm/index.cache.bz2
 share/doc/HTML/en/karm/index.docbook
 share/doc/HTML/en/karm/karm.png
+share/doc/HTML/en/karm/systray.png
 share/doc/HTML/en/kcontrol/kalarmd/common
 share/doc/HTML/en/kcontrol/kalarmd/index.cache.bz2
 share/doc/HTML/en/kcontrol/kalarmd/index.docbook
 share/doc/HTML/en/kdepim-apidocs/common
-share/doc/HTML/en/kgpgcertmanager/common
-share/doc/HTML/en/kgpgcertmanager/index.cache.bz2
-share/doc/HTML/en/kgpgcertmanager/index.docbook
+share/doc/HTML/en/kleopatra/common
+share/doc/HTML/en/kleopatra/index.cache.bz2
+share/doc/HTML/en/kleopatra/index.docbook
 share/doc/HTML/en/kmail/common
 share/doc/HTML/en/kmail/configure.docbook
 share/doc/HTML/en/kmail/credits-and-licenses.docbook
@@ -764,9 +1059,32 @@ share/doc/HTML/en/knotes/index.docbook
 share/doc/HTML/en/konsolekalendar/common
 share/doc/HTML/en/konsolekalendar/index.cache.bz2
 share/doc/HTML/en/konsolekalendar/index.docbook
+share/doc/HTML/en/kontact/calendar-sidebar-icon.png
 share/doc/HTML/en/kontact/common
+share/doc/HTML/en/kontact/configuration-components.png
+share/doc/HTML/en/kontact/configuration-main.png
+share/doc/HTML/en/kontact/configuration-select-components.png
+share/doc/HTML/en/kontact/configuration-summary-view-kpilot.png
+share/doc/HTML/en/kontact/configuration-summary-view.png
 share/doc/HTML/en/kontact/index.cache.bz2
 share/doc/HTML/en/kontact/index.docbook
+share/doc/HTML/en/kontact/kaddressbook-sidebar-icon.png
+share/doc/HTML/en/kontact/main-view.png
+share/doc/HTML/en/kontact/menu-bar-kmail.png
+share/doc/HTML/en/kontact/menu-bar-korganizer.png
+share/doc/HTML/en/kontact/menu-bar-summary.png
+share/doc/HTML/en/kontact/new-menu.png
+share/doc/HTML/en/kontact/settings-menu-kmail.png
+share/doc/HTML/en/kontact/side-pane.png
+share/doc/HTML/en/kontact/summary-view-calendar.png
+share/doc/HTML/en/kontact/summary-view-contacts.png
+share/doc/HTML/en/kontact/summary-view-kpilot.png
+share/doc/HTML/en/kontact/summary-view-mail.png
+share/doc/HTML/en/kontact/summary-view-notes.png
+share/doc/HTML/en/kontact/summary-view-todos.png
+share/doc/HTML/en/kontact/summary-view-weather.png
+share/doc/HTML/en/kontact/summary-view.png
+share/doc/HTML/en/kontact/todo-list-sidebar-icon.png
 share/doc/HTML/en/korganizer/common
 share/doc/HTML/en/korganizer/ep_config.png
 share/doc/HTML/en/korganizer/ep_download.png
@@ -810,6 +1128,7 @@ share/doc/HTML/en/korganizer/i_paste.png
 share/doc/HTML/en/korganizer/i_settings_prefs.png
 share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_view_list.png
+share/doc/HTML/en/korganizer/i_view_month.png
 share/doc/HTML/en/korganizer/i_view_todo_list.png
 share/doc/HTML/en/korganizer/i_view_week.png
 share/doc/HTML/en/korganizer/i_view_work_week.png
@@ -826,6 +1145,47 @@ share/doc/HTML/en/korganizer/outlook-to-vcalendar.docbook
 share/doc/HTML/en/korn/common
 share/doc/HTML/en/korn/index.cache.bz2
 share/doc/HTML/en/korn/index.docbook
+share/doc/HTML/en/kpilot/address-app.png
+share/doc/HTML/en/kpilot/common
+share/doc/HTML/en/kpilot/conduit-knotes.png
+share/doc/HTML/en/kpilot/conduit-mal.png
+share/doc/HTML/en/kpilot/conduit-palmdoc.png
+share/doc/HTML/en/kpilot/conduit-popmail-kmail.png
+share/doc/HTML/en/kpilot/conduit-sysinfo.png
+share/doc/HTML/en/kpilot/conduit-vcal.png
+share/doc/HTML/en/kpilot/configuration.docbook
+share/doc/HTML/en/kpilot/daemon-menu.png
+share/doc/HTML/en/kpilot/db-app.png
+share/doc/HTML/en/kpilot/faq.docbook
+share/doc/HTML/en/kpilot/file-app.png
+share/doc/HTML/en/kpilot/index.cache.bz2
+share/doc/HTML/en/kpilot/index.docbook
+share/doc/HTML/en/kpilot/main-app.png
+share/doc/HTML/en/kpilot/memo-app.png
+share/doc/HTML/en/kpilot/setup-address.png
+share/doc/HTML/en/kpilot/setup-conduit.png
+share/doc/HTML/en/kpilot/setup-dbspecial.png
+share/doc/HTML/en/kpilot/setup-general.png
+share/doc/HTML/en/kpilot/setup-hotsync.png
+share/doc/HTML/en/kpilot/setup-items.png
+share/doc/HTML/en/kpilot/setup-startup-exit.png
+share/doc/HTML/en/kpilot/setup-tabs.png
+share/doc/HTML/en/kpilot/setup-viewer.png
+share/doc/HTML/en/kpilot/sidebar.png
+share/doc/HTML/en/kpilot/sync.docbook
+share/doc/HTML/en/kpilot/todo-app.png
+share/doc/HTML/en/kpilot/toolbar_backup.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
+share/doc/HTML/en/kpilot/usage.docbook
+share/doc/HTML/en/kpilot/wizard-conduits.png
+share/doc/HTML/en/kpilot/wizard-connection.png
+share/doc/HTML/en/kpilot/wizard-general.png
+share/doc/HTML/en/ktnef/common
+share/doc/HTML/en/ktnef/index.cache.bz2
+share/doc/HTML/en/ktnef/index.docbook
+share/doc/HTML/en/kwatchgnupg/common
+share/doc/HTML/en/kwatchgnupg/index.cache.bz2
+share/doc/HTML/en/kwatchgnupg/index.docbook
 share/icons/crystalsvg/128x128/apps/kaddressbook.png
 share/icons/crystalsvg/128x128/apps/karm.png
 share/icons/crystalsvg/128x128/apps/kmail.png
@@ -835,7 +1195,16 @@ share/icons/crystalsvg/128x128/apps/knotes.png
 share/icons/crystalsvg/128x128/apps/kontact.png
 share/icons/crystalsvg/128x128/apps/korganizer.png
 share/icons/crystalsvg/16x16/actions/kalarm.png
-share/icons/crystalsvg/16x16/actions/knewstuff.png
+share/icons/crystalsvg/16x16/actions/kontact_contacts.png
+share/icons/crystalsvg/16x16/actions/kontact_date.png
+share/icons/crystalsvg/16x16/actions/kontact_mail.png
+share/icons/crystalsvg/16x16/actions/kontact_news.png
+share/icons/crystalsvg/16x16/actions/kontact_notes.png
+share/icons/crystalsvg/16x16/actions/kontact_summary.png
+share/icons/crystalsvg/16x16/actions/kontact_summary_green.png
+share/icons/crystalsvg/16x16/actions/kontact_todo.png
+share/icons/crystalsvg/16x16/apps/gpg.png
+share/icons/crystalsvg/16x16/apps/gpgsm.png
 share/icons/crystalsvg/16x16/apps/kaddressbook.png
 share/icons/crystalsvg/16x16/apps/kalarm.png
 share/icons/crystalsvg/16x16/apps/karm.png
@@ -848,12 +1217,29 @@ share/icons/crystalsvg/16x16/apps/konsolekalendar.png
 share/icons/crystalsvg/16x16/apps/kontact.png
 share/icons/crystalsvg/16x16/apps/korganizer.png
 share/icons/crystalsvg/16x16/apps/korn.png
+share/icons/crystalsvg/16x16/apps/kpalmdoc.png
+share/icons/crystalsvg/16x16/apps/kpilot.png
+share/icons/crystalsvg/16x16/apps/kpilotDaemon.png
 share/icons/crystalsvg/22x22/actions/kalarm.png
+share/icons/crystalsvg/22x22/apps/gpg.png
+share/icons/crystalsvg/22x22/apps/gpgsm.png
 share/icons/crystalsvg/22x22/apps/kmail.png
 share/icons/crystalsvg/22x22/apps/kmaillight.png
 share/icons/crystalsvg/22x22/apps/knotes.png
 share/icons/crystalsvg/22x22/apps/konsolekalendar.png
-share/icons/crystalsvg/32x32/actions/knewstuff.png
+share/icons/crystalsvg/22x22/apps/kpalmdoc.png
+share/icons/crystalsvg/22x22/apps/kpilot.png
+share/icons/crystalsvg/22x22/apps/kpilotDaemon.png
+share/icons/crystalsvg/32x32/actions/kontact_contacts.png
+share/icons/crystalsvg/32x32/actions/kontact_date.png
+share/icons/crystalsvg/32x32/actions/kontact_mail.png
+share/icons/crystalsvg/32x32/actions/kontact_news.png
+share/icons/crystalsvg/32x32/actions/kontact_notes.png
+share/icons/crystalsvg/32x32/actions/kontact_summary.png
+share/icons/crystalsvg/32x32/actions/kontact_summary_green.png
+share/icons/crystalsvg/32x32/actions/kontact_todo.png
+share/icons/crystalsvg/32x32/apps/gpg.png
+share/icons/crystalsvg/32x32/apps/gpgsm.png
 share/icons/crystalsvg/32x32/apps/kaddressbook.png
 share/icons/crystalsvg/32x32/apps/kalarm.png
 share/icons/crystalsvg/32x32/apps/karm.png
@@ -867,6 +1253,17 @@ share/icons/crystalsvg/32x32/apps/konsolekalendar.png
 share/icons/crystalsvg/32x32/apps/kontact.png
 share/icons/crystalsvg/32x32/apps/korganizer.png
 share/icons/crystalsvg/32x32/apps/korn.png
+share/icons/crystalsvg/32x32/apps/kpalmdoc.png
+share/icons/crystalsvg/32x32/apps/kpilot.png
+share/icons/crystalsvg/32x32/apps/kpilotDaemon.png
+share/icons/crystalsvg/48x48/actions/kontact_contacts.png
+share/icons/crystalsvg/48x48/actions/kontact_date.png
+share/icons/crystalsvg/48x48/actions/kontact_mail.png
+share/icons/crystalsvg/48x48/actions/kontact_news.png
+share/icons/crystalsvg/48x48/actions/kontact_notes.png
+share/icons/crystalsvg/48x48/actions/kontact_summary.png
+share/icons/crystalsvg/48x48/actions/kontact_summary_green.png
+share/icons/crystalsvg/48x48/actions/kontact_todo.png
 share/icons/crystalsvg/48x48/apps/kaddressbook.png
 share/icons/crystalsvg/48x48/apps/kalarm.png
 share/icons/crystalsvg/48x48/apps/karm.png
@@ -879,7 +1276,17 @@ share/icons/crystalsvg/48x48/apps/kontact.png
 share/icons/crystalsvg/48x48/apps/korganizer.png
 share/icons/crystalsvg/48x48/apps/korganizer_todo.png
 share/icons/crystalsvg/48x48/apps/korn.png
-share/icons/crystalsvg/64x64/actions/knewstuff.png
+share/icons/crystalsvg/48x48/apps/kpalmdoc.png
+share/icons/crystalsvg/48x48/apps/kpilot.png
+share/icons/crystalsvg/48x48/apps/kpilotDaemon.png
+share/icons/crystalsvg/64x64/actions/kontact_contacts.png
+share/icons/crystalsvg/64x64/actions/kontact_date.png
+share/icons/crystalsvg/64x64/actions/kontact_mail.png
+share/icons/crystalsvg/64x64/actions/kontact_news.png
+share/icons/crystalsvg/64x64/actions/kontact_notes.png
+share/icons/crystalsvg/64x64/actions/kontact_summary.png
+share/icons/crystalsvg/64x64/actions/kontact_summary_green.png
+share/icons/crystalsvg/64x64/actions/kontact_todo.png
 share/icons/crystalsvg/64x64/apps/kaddressbook.png
 share/icons/crystalsvg/64x64/apps/karm.png
 share/icons/crystalsvg/64x64/apps/kmail.png
@@ -889,75 +1296,155 @@ share/icons/crystalsvg/64x64/apps/knotes.png
 share/icons/crystalsvg/64x64/apps/kontact.png
 share/icons/crystalsvg/64x64/apps/korganizer.png
 share/icons/hicolor/48x48/apps/ktnef.png
+share/icons/locolor/16x16/apps/kpilot.png
 share/icons/locolor/16x16/apps/ktnef.png
 share/icons/locolor/32x32/apps/ktnef.png
 share/mimelnk/application/ms-tnef.desktop
-share/services/configcolors.desktop
-share/services/configfonts.desktop
-share/services/configfreebusy.desktop
-share/services/configgroupautomation.desktop
-share/services/configgroupscheduling.desktop
-share/services/configmain.desktop
-share/services/configtime.desktop
-share/services/configviews.desktop
+share/mimelnk/kdedevice/cellphone.desktop
+share/mimelnk/kdedevice/pda.desktop
+share/services/abbrowser_conduit.desktop
+share/services/doc_conduit.desktop
 share/services/kabconfig.desktop
+share/services/kabcustomfields.desktop
 share/services/kabldapconfig.desktop
+share/services/kaddressbook/aimprotocol.desktop
 share/services/kaddressbook/bookmark_xxport.desktop
 share/services/kaddressbook/cardview.desktop
+share/services/kaddressbook/cryptosettings.desktop
 share/services/kaddressbook/csv_xxport.desktop
 share/services/kaddressbook/distributionlist.desktop
 share/services/kaddressbook/eudora_xxport.desktop
+share/services/kaddressbook/gaduprotocol.desktop
 share/services/kaddressbook/gnokii_xxport.desktop
 share/services/kaddressbook/iconview.desktop
+share/services/kaddressbook/icqprotocol.desktop
+share/services/kaddressbook/imaddresseditor.desktop
+share/services/kaddressbook/ircprotocol.desktop
+share/services/kaddressbook/jabberprotocol.desktop
 share/services/kaddressbook/kde2_xxport.desktop
 share/services/kaddressbook/ldif_xxport.desktop
-share/services/kaddressbook/location.desktop
-share/services/kaddressbook/merge.desktop
+share/services/kaddressbook/msnprotocol.desktop
 share/services/kaddressbook/opera_xxport.desktop
 share/services/kaddressbook/pab_xxport.desktop
+share/services/kaddressbook/resourceselection.desktop
+share/services/kaddressbook/smsprotocol.desktop
 share/services/kaddressbook/tableview.desktop
 share/services/kaddressbook/vcard_xxport.desktop
+share/services/kaddressbook/yahooprotocol.desktop
+share/services/kcmkabsummary.desktop
+share/services/kcmkmailsummary.desktop
+share/services/kcmkontactknt.desktop
+share/services/kcmkontactsummary.desktop
+share/services/kcmkorgsummary.desktop
+share/services/kded/ksharedfile.desktop
+share/services/kfile_palm.desktop
 share/services/kfile_vcf.desktop
+share/services/kitchensync/backup.desktop
+share/services/kitchensync/debugger.desktop
+share/services/kitchensync/restore.desktop
+share/services/kitchensync/syncerpart.desktop
+share/services/kitchensync/viewer.desktop
+share/services/kleopatra_config_appear.desktop
+share/services/kleopatra_config_dirserv.desktop
+share/services/kleopatra_config_dnorder.desktop
+share/services/kmail_config_appearance.desktop
+share/services/kmail_config_composer.desktop
+share/services/kmail_config_identity.desktop
+share/services/kmail_config_misc.desktop
+share/services/kmail_config_network.desktop
+share/services/kmail_config_security.desktop
 share/services/knewsservice.protocol
+share/services/knode_config_accounts.desktop
+share/services/knode_config_appearance.desktop
+share/services/knode_config_cleanup.desktop
+share/services/knode_config_identity.desktop
+share/services/knode_config_post_news.desktop
+share/services/knode_config_privacy.desktop
+share/services/knode_config_read_news.desktop
+share/services/knotes-conduit.desktop
 share/services/kontact/kaddressbookplugin.desktop
 share/services/kontact/kmailplugin.desktop
 share/services/kontact/knodeplugin.desktop
 share/services/kontact/knotesplugin.desktop
 share/services/kontact/korganizerplugin.desktop
+share/services/kontact/kpilotplugin.desktop
+share/services/kontact/newstickerplugin.desktop
 share/services/kontact/summaryplugin.desktop
 share/services/kontact/todoplugin.desktop
 share/services/kontact/weatherplugin.desktop
 share/services/kontactconfig.desktop
-share/services/korganizer/birthdays.desktop
 share/services/korganizer/datenums.desktop
 share/services/korganizer/exchange.desktop
 share/services/korganizer/hebrew.desktop
 share/services/korganizer/holidays.desktop
 share/services/korganizer/projectview.desktop
 share/services/korganizer/webexport.desktop
+share/services/korganizer_configcolors.desktop
+share/services/korganizer_configfonts.desktop
+share/services/korganizer_configfreebusy.desktop
+share/services/korganizer_configgroupautomation.desktop
+share/services/korganizer_configgroupscheduling.desktop
+share/services/korganizer_configmain.desktop
+share/services/korganizer_configtime.desktop
+share/services/korganizer_configviews.desktop
+share/services/kpilot_config.desktop
 share/services/kresources/kabc/imap.desktop
+share/services/kresources/kabc/kabc_slox.desktop
+share/services/kresources/kabc/kabc_xmlrpc.desktop
+share/services/kresources/kcal/exchange.desktop
 share/services/kresources/kcal/imap.desktop
 share/services/kresources/kcal/kabc.desktop
+share/services/kresources/kcal/kcal_slox.desktop
+share/services/kresources/kcal/kcal_xmlrpc.desktop
 share/services/kresources/kcal/local.desktop
 share/services/kresources/kcal/localdir.desktop
 share/services/kresources/kcal/remote.desktop
+share/services/kresources/knotes/imap.desktop
+share/services/kresources/knotes/knotes_xmlrpc.desktop
+share/services/kresources/knotes/local.desktop
+share/services/kresources/konnector/dummykonnector.desktop
+share/services/kresources/konnector/kabckonnector.desktop
+share/services/kresources/konnector/kcalkonnector.desktop
+share/services/kresources/konnector/localkonnector.desktop
+share/services/kresources/konnector/qtopia.desktop
+share/services/kresources/konnector/remotekonnector.desktop
 share/services/ldifvcardthumbnail.desktop
+share/services/mal_conduit.desktop
+share/services/newimap4.protocol
+share/services/newimaps.protocol
+share/services/overview.desktop
+share/services/popmail-conduit.desktop
 share/services/sieve.protocol
+share/services/sysinfo_conduit.desktop
+share/services/time_conduit.desktop
+share/services/todo-conduit.desktop
+share/services/vcal-conduit.desktop
 share/services/webcal.protocol
 share/servicetypes/calendardecoration.desktop
 share/servicetypes/calendarplugin.desktop
 share/servicetypes/dcopaddressbook.desktop
 share/servicetypes/dcopcalendar.desktop
+share/servicetypes/dcopimap.desktop
 share/servicetypes/dcopmail.desktop
+share/servicetypes/kaddressbook_contacteditorwidget.desktop
 share/servicetypes/kaddressbook_extension.desktop
 share/servicetypes/kaddressbook_view.desktop
 share/servicetypes/kaddressbook_xxport.desktop
+share/servicetypes/kaddressbookimprotocol.desktop
+share/servicetypes/kitchensync.desktop
+share/servicetypes/konnector.desktop
 share/servicetypes/kontactplugin.desktop
 share/servicetypes/korganizerpart.desktop
+share/servicetypes/kpilotconduit.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdenetwork/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdenetwork/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
@@ -975,6 +1462,11 @@ share/servicetypes/korganizerpart.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kmail/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kmail/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kitchensync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kitchensync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kioslaves/imap4/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kioslaves/imap4/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kioslaves/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
@@ -990,27 +1482,42 @@ share/servicetypes/korganizerpart.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/lib/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/lib/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/lib/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kioslaves/imap4/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdenetwork/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/lib/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kmail/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kitchensync/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/karm/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kmail/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/korgac/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kontact/html
+@dirrm share/services/kresources/konnector
+@dirrm share/services/kresources/knotes
 @dirrm share/services/kresources/kcal
 @dirrm share/services/korganizer
 @dirrm share/services/kontact
+@dirrm share/services/kitchensync
 @dirrm share/services/kaddressbook
+@dirrm share/mimelnk/kdedevice
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/16x16/apps
@@ -1018,12 +1525,10 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/icons/locolor
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/32x32/apps
 @dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/doc/HTML/en/kwatchgnupg
+@dirrm share/doc/HTML/en/ktnef
+@dirrm share/doc/HTML/en/kpilot
 @dirrm share/doc/HTML/en/korn
 @dirrm share/doc/HTML/en/korganizer
 @dirrm share/doc/HTML/en/kontact
@@ -1031,11 +1536,15 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/doc/HTML/en/knotes
 @dirrm share/doc/HTML/en/knode
 @dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en/kgpgcertmanager
+@dirrm share/doc/HTML/en/kleopatra
 @dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
 @dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange
 @dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim/html
 @dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkdenetwork/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkdenetwork
 @dirrm share/doc/HTML/en/kdepim-apidocs/libkcal/html
 @dirrm share/doc/HTML/en/kdepim-apidocs/libkcal
 @dirrm share/doc/HTML/en/kdepim-apidocs/ksync/html
@@ -1052,6 +1561,11 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/doc/HTML/en/kdepim-apidocs/knotes
 @dirrm share/doc/HTML/en/kdepim-apidocs/kmail/html
 @dirrm share/doc/HTML/en/kdepim-apidocs/kmail
+@dirrm share/doc/HTML/en/kdepim-apidocs/kitchensync/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/kitchensync
+@dirrm share/doc/HTML/en/kdepim-apidocs/kioslaves/imap4/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/kioslaves/imap4
+@dirrm share/doc/HTML/en/kdepim-apidocs/kioslaves
 @dirrm share/doc/HTML/en/kdepim-apidocs/kgantt/html
 @dirrm share/doc/HTML/en/kdepim-apidocs/kgantt
 @dirrm share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
@@ -1067,6 +1581,10 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
 @dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt
 @dirrm share/doc/HTML/en/kdepim-apidocs/kabc
+@dirrm share/doc/HTML/en/kdepim-apidocs/certmanager/lib/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/certmanager/lib
+@dirrm share/doc/HTML/en/kdepim-apidocs/certmanager/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/certmanager
 @dirrm share/doc/HTML/en/kdepim-apidocs
 @dirrm share/doc/HTML/en/kcontrol/kalarmd
 @dirrm share/doc/HTML/en/kcontrol
@@ -1075,6 +1593,10 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/doc/HTML/en/kalarm
 @dirrm share/doc/HTML/en/kaddressbook
 @dirrm share/config.kcfg
+@dirrm share/apps/libkleopatra/pics
+@dirrm share/apps/libkleopatra
+@dirrm share/apps/kwatchgnupg/pics
+@dirrm share/apps/kwatchgnupg
 @dirrm share/apps/ktnef/icons/locolor/16x16/actions
 @dirrm share/apps/ktnef/icons/locolor/16x16
 @dirrm share/apps/ktnef/icons/locolor
@@ -1084,6 +1606,20 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/apps/ktnef/icons
 @dirrm share/apps/ktnef
 @dirrm share/apps/ksync
+@dirrm share/apps/kpilot/sysinfoconduit
+@dirrm share/apps/kpilot/icons/crystalsvg/48x48/apps
+@dirrm share/apps/kpilot/icons/crystalsvg/48x48
+@dirrm share/apps/kpilot/icons/crystalsvg/32x32/apps
+@dirrm share/apps/kpilot/icons/crystalsvg/32x32
+@dirrm share/apps/kpilot/icons/crystalsvg/22x22/apps
+@dirrm share/apps/kpilot/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kpilot/icons/crystalsvg/22x22
+@dirrm share/apps/kpilot/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kpilot/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kpilot/icons/crystalsvg/16x16
+@dirrm share/apps/kpilot/icons/crystalsvg
+@dirrm share/apps/kpilot/icons
+@dirrm share/apps/kpilot
 @dirrm share/apps/korganizer/sounds
 @dirrm share/apps/korganizer/plugins
 @dirrm share/apps/korganizer/icons/crystalsvg/32x32/actions
@@ -1120,9 +1656,10 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/apps/knode/icons
 @dirrm share/apps/knode/filters
 @dirrm share/apps/knode
-@dirrm share/apps/knewstuff
 @dirrm share/apps/kmailcvt/pics
 @dirrm share/apps/kmailcvt
+@dirrm share/apps/kmail/plugins/bodypartformatter
+@dirrm share/apps/kmail/plugins
 @dirrm share/apps/kmail/pics
 @dirrm share/apps/kmail/icons/crystalsvg/48x48/actions
 @dirrm share/apps/kmail/icons/crystalsvg/48x48
@@ -1136,7 +1673,9 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/apps/kmail/icons
 @dirrm share/apps/kmail/about
 @dirrm share/apps/kmail
-@dirrm share/apps/kgpgcertmanager
+@dirrm share/apps/kleopatra
+@dirrm share/apps/kitchensync/pics
+@dirrm share/apps/kitchensync
 @dirrm share/apps/kgantt/icons/crystalsvg/32x32/actions
 @dirrm share/apps/kgantt/icons/crystalsvg/32x32
 @dirrm share/apps/kgantt/icons/crystalsvg/22x22/actions
@@ -1165,24 +1704,33 @@ share/servicetypes/korganizerpart.desktop
 @dirrm share/apps/kaddressbook/icons/locolor
 @dirrm share/apps/kaddressbook/icons/crystalsvg/32x32/actions
 @dirrm share/apps/kaddressbook/icons/crystalsvg/32x32
+@dirrm share/apps/kaddressbook/icons/crystalsvg/16x16/apps
 @dirrm share/apps/kaddressbook/icons/crystalsvg/16x16/actions
 @dirrm share/apps/kaddressbook/icons/crystalsvg/16x16
 @dirrm share/apps/kaddressbook/icons/crystalsvg
 @dirrm share/apps/kaddressbook/icons
 @dirrm share/apps/kaddressbook/csv-templates
+@dirrm share/apps/kaddressbook/contacteditorpages
 @dirrm share/apps/kaddressbook
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/Applications
 @dirrm share/applnk/.hidden
 @dirrm share/applnk
+@dirrm include/qgpgme
 @dirrm include/mimelib
 @dirrm include/libkcal
 @dirrm include/ktnef
 @dirrm include/ksieve
+@dirrm include/kpilot
 @dirrm include/korganizer
 @dirrm include/kontact
-@dirrm include/knewstuff
+@dirrm include/kmail/interfaces
+@dirrm include/kmail
+@dirrm include/kleo
+@dirrm include/kitchensync
 @dirrm include/kgantt
 @dirrm include/kdepim
 @dirrm include/kaddressbook
+@dirrm include/gpgme++/interfaces
+@dirrm include/gpgme++
 @dirrm include/calendar