Update to KDE 3.5

Many new features and refinements.

Notable changes include:
* Konqueror is the second web browser to pass the Acid2 CSS test,
  ahead of Firefox and Internet Explorer
* Konqueror can also now free web pages from adverts with its
  ad-block feature
* SuperKaramba is included in KDE, providing well-integrated and
  easy-to-install widgets for the user's desktop
* Kopete has support for MSN and Yahoo! webcams
* The edutainment module has three new applications (KGeography,
  Kanagram and blinKen), and has seen huge improvements in Kalzium

8 files changed, 822 insertions, 124 deletions

diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 540d0dfe432..7b72b9f3aea 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.21 2005/10/13 13:12:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.22 2005/12/11 11:40:02 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
 bin/groupwarewizard
 bin/groupwisewizard
 bin/ical2vcal
+bin/indexlib-config
 bin/kabc2mutt
 bin/kaddressbook
 bin/kalarm
@@ -41,6 +42,11 @@ bin/networkstatustestservice
 bin/sloxwizard
 include/KNotesAppIface.h
 include/KNotesIface.h
+include/akregator/feedstorage.h
+include/akregator/plugin.h
+include/akregator/storage.h
+include/akregator/storagefactory.h
+include/akregator/storagefactoryregistry.h
 include/calendar/calendardecoration.h
 include/calendar/plugin.h
 include/gpgme++/context.h
@@ -61,6 +67,9 @@ include/gpgme++/result.h
 include/gpgme++/signingresult.h
 include/gpgme++/trustitem.h
 include/gpgme++/verificationresult.h
+include/index/create.h
+include/index/index.h
+include/index/lockfile.h
 include/kabc/kabc_resourcexmlrpc.h
 include/kabc/kcal_resourcexmlrpc.h
 include/kaddressbook/configurewidget.h
@@ -128,6 +137,7 @@ include/kleo/exportjob.h
 include/kleo/hierarchicalkeylistjob.h
 include/kleo/importjob.h
 include/kleo/job.h
+include/kleo/kdhorizontalline.h
 include/kleo/keyapprovaldialog.h
 include/kleo/keyfilter.h
 include/kleo/keyfiltermanager.h
@@ -168,10 +178,12 @@ include/korganizer/part.h
 include/korganizer/printplugin.h
 include/kpilot/kpilotlink.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/kpilot/uiDialog.h
 include/ksieve/error.h
@@ -218,8 +230,11 @@ include/libkcal/period.h
 include/libkcal/person.h
 include/libkcal/qtopiaformat.h
 include/libkcal/recurrence.h
+include/libkcal/recurrencerule.h
 include/libkcal/resourcecached.h
 include/libkcal/resourcecalendar.h
+include/libkcal/resourcekabc.h
+include/libkcal/resourcekabcconfig.h
 include/libkcal/resourcelocal.h
 include/libkcal/resourcelocalconfig.h
 include/libkcal/resourcelocaldir.h
@@ -298,7 +313,6 @@ lib/kde3/kcal_xmlrpc.la
 lib/kde3/kcm_kabconfig.la
 lib/kde3/kcm_kabcustomfields.la
 lib/kde3/kcm_kabldapconfig.la
-lib/kde3/kcm_kabsummary.la
 lib/kde3/kcm_kleopatra.la
 lib/kde3/kcm_kmail.la
 lib/kde3/kcm_kmailsummary.la
@@ -322,6 +336,7 @@ lib/kde3/knotes_kolab.la
 lib/kde3/knotes_local.la
 lib/kde3/knotes_xmlrpc.la
 lib/kde3/ldifvcardthumbnail.la
+lib/kde3/libakregator_mk4storage_plugin.la
 lib/kde3/libakregatorpart.la
 lib/kde3/libegroupwarewizard.la
 lib/kde3/libexchangewizard.la
@@ -341,6 +356,7 @@ lib/kde3/libkaddrbk_resourceselection.la
 lib/kde3/libkaddrbk_tableview.la
 lib/kde3/libkaddrbk_vcard_xxport.la
 lib/kde3/libkaddressbookpart.la
+lib/kde3/libkarmpart.la
 lib/kde3/libkitchensyncpart.la
 lib/kde3/libkmail_bodypartformatter_application_octetstream.la
 lib/kde3/libkmail_bodypartformatter_text_calendar.la
@@ -351,6 +367,7 @@ lib/kde3/libknodepart.la
 lib/kde3/libkolabwizard.la
 lib/kde3/libkontact_akregator.la
 lib/kde3/libkontact_journalplugin.la
+lib/kde3/libkontact_karm.la
 lib/kde3/libkontact_kaddressbookplugin.la
 lib/kde3/libkontact_kmailplugin.la
 lib/kde3/libkontact_knodeplugin.la
@@ -368,6 +385,8 @@ lib/kde3/libkorg_exchange.la
 lib/kde3/libkorg_hebrew.la
 lib/kde3/libkorg_journalprint.la
 lib/kde3/libkorganizerpart.la
+lib/kde3/libksfilter_addressbook.la
+lib/kde3/libksfilter_calendar.la
 lib/kde3/libksync_backup.la
 lib/kde3/libksync_debugger.la
 lib/kde3/libksync_pluckerpart.la
@@ -382,6 +401,7 @@ lib/kde3/plugins/designer/kpartsdesignerplugin.la
 lib/kde3/resourcecalendarexchange.la
 lib/libakregatorprivate.la
 lib/libgpgme++.la
+lib/libindex.la
 lib/libkabc_groupdav.la
 lib/libkabc_groupwise.la
 lib/libkabc_newexchange.la
@@ -442,6 +462,8 @@ share/applications/kde/KMail.desktop
 share/applications/kde/KNode.desktop
 share/applications/kde/KOrn.desktop
 share/applications/kde/Kontact.desktop
+share/applications/kde/akregator.desktop
+share/applications/kde/groupwarewizard.desktop
 share/applications/kde/kaddressbook.desktop
 share/applications/kde/kalarm.desktop
 share/applications/kde/kandy.desktop
@@ -493,7 +515,6 @@ share/doc/kde/HTML/en/karm/index.cache.bz2
 share/doc/kde/HTML/en/karm/index.docbook
 share/doc/kde/HTML/en/karm/karm.png
 share/doc/kde/HTML/en/karm/systray.png
-share/doc/kde/HTML/en/kdepim-apidocs/common
 share/doc/kde/HTML/en/kleopatra/common
 share/doc/kde/HTML/en/kleopatra/index.cache.bz2
 share/doc/kde/HTML/en/kleopatra/index.docbook
@@ -539,6 +560,7 @@ share/doc/kde/HTML/en/knode/knode-post-settings.png
 share/doc/kde/HTML/en/knode/knode-read-news-appearance-dialog.png
 share/doc/kde/HTML/en/knode/knode-read-news-settings.png
 share/doc/kde/HTML/en/knode/knode-reply.png
+share/doc/kde/HTML/en/knode/knode-rule-editor.png
 share/doc/kde/HTML/en/knode/knode-search.png
 share/doc/kde/HTML/en/knode/knode-start.png
 share/doc/kde/HTML/en/knode/knode-subscribe.png
@@ -586,54 +608,45 @@ share/doc/kde/HTML/en/kontact/summary-view-weather.png
 share/doc/kde/HTML/en/kontact/summary-view.png
 share/doc/kde/HTML/en/kontact/todo-list-sidebar-icon.png
 share/doc/kde/HTML/en/korganizer/common
-share/doc/kde/HTML/en/korganizer/ep_config.png
-share/doc/kde/HTML/en/korganizer/ep_download.png
-share/doc/kde/HTML/en/korganizer/ep_enable.png
-share/doc/kde/HTML/en/korganizer/ep_menu.png
-share/doc/kde/HTML/en/korganizer/ep_progress.png
-share/doc/kde/HTML/en/korganizer/exchange-plugin.docbook
-share/doc/kde/HTML/en/korganizer/group-scheduling.docbook
-share/doc/kde/HTML/en/korganizer/gs_attendee1.png
-share/doc/kde/HTML/en/korganizer/gs_attendee2.png
-share/doc/kde/HTML/en/korganizer/gs_counter.png
-share/doc/kde/HTML/en/korganizer/gs_filter.png
-share/doc/kde/HTML/en/korganizer/gs_inbox1.png
-share/doc/kde/HTML/en/korganizer/gs_inbox2.png
-share/doc/kde/HTML/en/korganizer/gs_korganizer1.png
-share/doc/kde/HTML/en/korganizer/gs_korganizer2.png
-share/doc/kde/HTML/en/korganizer/gs_korganizer3.png
-share/doc/kde/HTML/en/korganizer/gs_outbox1.png
-share/doc/kde/HTML/en/korganizer/gs_outbox2.png
-share/doc/kde/HTML/en/korganizer/gs_publish.png
-share/doc/kde/HTML/en/korganizer/gs_reply.png
-share/doc/kde/HTML/en/korganizer/gs_setup1.png
-share/doc/kde/HTML/en/korganizer/gs_setup2.png
-share/doc/kde/HTML/en/korganizer/gs_show1.png
-share/doc/kde/HTML/en/korganizer/gs_show2.png
-share/doc/kde/HTML/en/korganizer/gs_whatsnext.png
+share/doc/kde/HTML/en/korganizer/event-attachments.png
+share/doc/kde/HTML/en/korganizer/event-attendees.png
+share/doc/kde/HTML/en/korganizer/event-freebusy.png
+share/doc/kde/HTML/en/korganizer/event-general.png
+share/doc/kde/HTML/en/korganizer/event-recurrence.png
+share/doc/kde/HTML/en/korganizer/groupevent.png
+share/doc/kde/HTML/en/korganizer/i_actions_newevent.png
+share/doc/kde/HTML/en/korganizer/i_actions_newtodo.png
 share/doc/kde/HTML/en/korganizer/i_copy.png
 share/doc/kde/HTML/en/korganizer/i_cut.png
+share/doc/kde/HTML/en/korganizer/i_edit_delete.png
 share/doc/kde/HTML/en/korganizer/i_edit_find.png
+share/doc/kde/HTML/en/korganizer/i_edit_redo.png
+share/doc/kde/HTML/en/korganizer/i_edit_undo.png
 share/doc/kde/HTML/en/korganizer/i_file_close.png
 share/doc/kde/HTML/en/korganizer/i_file_new.png
 share/doc/kde/HTML/en/korganizer/i_file_open.png
 share/doc/kde/HTML/en/korganizer/i_file_print.png
-share/doc/kde/HTML/en/korganizer/i_file_print_preview.png
 share/doc/kde/HTML/en/korganizer/i_file_quit.png
+share/doc/kde/HTML/en/korganizer/i_file_revert.png
 share/doc/kde/HTML/en/korganizer/i_file_save.png
+share/doc/kde/HTML/en/korganizer/i_file_saveas.png
 share/doc/kde/HTML/en/korganizer/i_go_backward.png
 share/doc/kde/HTML/en/korganizer/i_go_forward.png
 share/doc/kde/HTML/en/korganizer/i_go_to_today.png
 share/doc/kde/HTML/en/korganizer/i_paste.png
 share/doc/kde/HTML/en/korganizer/i_settings_prefs.png
 share/doc/kde/HTML/en/korganizer/i_view_day.png
+share/doc/kde/HTML/en/korganizer/i_view_journal.png
 share/doc/kde/HTML/en/korganizer/i_view_list.png
 share/doc/kde/HTML/en/korganizer/i_view_month.png
 share/doc/kde/HTML/en/korganizer/i_view_todo_list.png
 share/doc/kde/HTML/en/korganizer/i_view_week.png
+share/doc/kde/HTML/en/korganizer/i_view_whatsnext.png
 share/doc/kde/HTML/en/korganizer/i_view_work_week.png
+share/doc/kde/HTML/en/korganizer/i_view_xdays.png
 share/doc/kde/HTML/en/korganizer/index.cache.bz2
 share/doc/kde/HTML/en/korganizer/index.docbook
+share/doc/kde/HTML/en/korganizer/korganizer-resource.png
 share/doc/kde/HTML/en/korganizer/o2v_importing1.png
 share/doc/kde/HTML/en/korganizer/o2v_importing2.png
 share/doc/kde/HTML/en/korganizer/o2v_importing3.png
@@ -641,8 +654,11 @@ share/doc/kde/HTML/en/korganizer/o2v_main.png
 share/doc/kde/HTML/en/korganizer/o2v_progress.png
 share/doc/kde/HTML/en/korganizer/o2v_save.png
 share/doc/kde/HTML/en/korganizer/o2v_warning.png
+share/doc/kde/HTML/en/korganizer/organizer.png
 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/korn/common
 share/doc/kde/HTML/en/korn/index.cache.bz2
 share/doc/kde/HTML/en/korn/index.docbook
@@ -703,7 +719,6 @@ share/doc/kde/HTML/en/multisynk/mainwin-filled.png
 share/doc/kde/HTML/en/multisynk/mainwin.png
 share/kde/applnk/.hidden/kalarmd.desktop
 share/kde/applnk/Applications/kalarm.desktop
-share/kde/applnk/Internet/akregator.desktop
 share/kde/applnk/Utilities/kandy.desktop
 share/kde/applnk/Utilities/karm.desktop
 share/kde/applnk/Utilities/kmailcvt.desktop
@@ -736,6 +751,7 @@ share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/irc_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/jabber_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/meanwhile_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/msn_protocol.png
+share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/skype_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/sms_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/yahoo_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/32x32/actions/homepage.png
@@ -753,15 +769,16 @@ 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/icons/crystalsvg/16x16/actions/file.png
 share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/kalarm.png
 share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/message.png
+share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/new_from_template.png
 share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/playsound.png
 share/kde/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm.png
 share/kde/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm_disabled.png
+share/kde/apps/kalarm/icons/crystalsvg/22x22/actions/new_from_template.png
 share/kde/apps/kalarm/kalarmui.rc
 share/kde/apps/kandy/default.kandy
 share/kde/apps/kandy/kandymobileui.rc
@@ -779,6 +796,8 @@ share/kde/apps/karm/pics/clock.xpm
 share/kde/apps/karm/pics/clockedit.xpm
 share/kde/apps/karm/pics/empty-watch.xpm
 share/kde/apps/karm/pics/filedel.xpm
+share/kde/apps/karm/pics/task-complete.xpm
+share/kde/apps/karm/pics/task-incomplete.xpm
 share/kde/apps/karm/pics/watch-0.xpm
 share/kde/apps/karm/pics/watch-1.xpm
 share/kde/apps/karm/pics/watch-2.xpm
@@ -787,6 +806,7 @@ share/kde/apps/karm/pics/watch-4.xpm
 share/kde/apps/karm/pics/watch-5.xpm
 share/kde/apps/karm/pics/watch-6.xpm
 share/kde/apps/karm/pics/watch-7.xpm
+share/kde/apps/karmpart/karmui.rc
 share/kde/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
 share/kde/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
 share/kde/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
@@ -805,6 +825,9 @@ share/kde/apps/kconf_update/kmail-upd-identities.pl
 share/kde/apps/kconf_update/kmail.upd
 share/kde/apps/kconf_update/korganizer.upd
 share/kde/apps/kconf_update/korn-3-4-config_change.upd
+share/kde/apps/kconf_update/korn-3-5-metadata-update.pl
+share/kde/apps/kconf_update/korn-3-5-ssl-update.pl
+share/kde/apps/kconf_update/korn-3-5-update.upd
 share/kde/apps/kconf_update/kpalmdoc.upd
 share/kde/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/kde/apps/kconf_update/kpgp.upd
@@ -832,13 +855,35 @@ share/kde/apps/kmail/about/kmail.css
 share/kde/apps/kmail/about/main.html
 share/kde/apps/kmail/about/top-right-kmail.png
 share/kde/apps/kmail/eventsrc
-share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mark_as_ham.png
-share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mark_as_spam.png
-share/kde/apps/kmail/icons/crystalsvg/22x22/actions/mark_as_ham.png
-share/kde/apps/kmail/icons/crystalsvg/22x22/actions/mark_as_spam.png
-share/kde/apps/kmail/icons/crystalsvg/32x32/actions/mark_as_ham.png
-share/kde/apps/kmail/icons/crystalsvg/32x32/actions/mark_as_spam.png
-share/kde/apps/kmail/icons/crystalsvg/48x48/actions/mark_as_spam.png
+share/kde/apps/kmail/icons/crystalsvg/128x128/actions/online_status.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/kmgroupware_folder_calendar.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/kmgroupware_folder_contacts.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/kmgroupware_folder_journals.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/kmgroupware_folder_notes.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/kmgroupware_folder_tasks.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mail_flag.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mail_ham.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mail_ignore.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mail_spam.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mail_todo.png
+share/kde/apps/kmail/icons/crystalsvg/16x16/actions/online_status.png
+share/kde/apps/kmail/icons/crystalsvg/22x22/actions/kmgroupware_folder_calendar.png
+share/kde/apps/kmail/icons/crystalsvg/22x22/actions/kmgroupware_folder_journals.png
+share/kde/apps/kmail/icons/crystalsvg/22x22/actions/kmgroupware_folder_tasks.png
+share/kde/apps/kmail/icons/crystalsvg/22x22/actions/mail_ham.png
+share/kde/apps/kmail/icons/crystalsvg/22x22/actions/mail_ignore.png
+share/kde/apps/kmail/icons/crystalsvg/22x22/actions/mail_spam.png
+share/kde/apps/kmail/icons/crystalsvg/22x22/actions/online_status.png
+share/kde/apps/kmail/icons/crystalsvg/32x32/actions/kmgroupware_folder_calendar.png
+share/kde/apps/kmail/icons/crystalsvg/32x32/actions/kmgroupware_folder_tasks.png
+share/kde/apps/kmail/icons/crystalsvg/32x32/actions/mail_ham.png
+share/kde/apps/kmail/icons/crystalsvg/32x32/actions/mail_ignore.png
+share/kde/apps/kmail/icons/crystalsvg/32x32/actions/mail_spam.png
+share/kde/apps/kmail/icons/crystalsvg/32x32/actions/online_status.png
+share/kde/apps/kmail/icons/crystalsvg/48x48/actions/online_status.png
+share/kde/apps/kmail/icons/crystalsvg/scalable/actions/mail_ignore.svgz
+share/kde/apps/kmail/icons/crystalsvg/scalable/actions/online_status.svgz
+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
@@ -846,11 +891,6 @@ share/kde/apps/kmail/pics/key.png
 share/kde/apps/kmail/pics/key_bad.png
 share/kde/apps/kmail/pics/key_ok.png
 share/kde/apps/kmail/pics/key_unknown.png
-share/kde/apps/kmail/pics/kmgroupware_folder_calendar.png
-share/kde/apps/kmail/pics/kmgroupware_folder_contacts.png
-share/kde/apps/kmail/pics/kmgroupware_folder_journals.png
-share/kde/apps/kmail/pics/kmgroupware_folder_notes.png
-share/kde/apps/kmail/pics/kmgroupware_folder_tasks.png
 share/kde/apps/kmail/pics/kmmsgattachment.png
 share/kde/apps/kmail/pics/kmmsgdel.png
 share/kde/apps/kmail/pics/kmmsgflag.png
@@ -875,7 +915,10 @@ share/kde/apps/kmail/pics/kmmsgundefinedencrypted.png
 share/kde/apps/kmail/pics/kmmsgundefinedsigned.png
 share/kde/apps/kmail/pics/kmmsgunseen.png
 share/kde/apps/kmail/pics/kmmsgwatched.png
+share/kde/apps/kmail/pics/kmwizard.png
 share/kde/apps/kmail/pics/pgp-keys.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
@@ -897,9 +940,13 @@ share/kde/apps/knode/filters/7.fltr
 share/kde/apps/knode/filters/8.fltr
 share/kde/apps/knode/filters/filters.rc
 share/kde/apps/knode/headers.rc
+share/kde/apps/knode/icons/crystalsvg/16x16/actions/mail_get_all.png
 share/kde/apps/knode/icons/crystalsvg/16x16/actions/message_reply.png
+share/kde/apps/knode/icons/crystalsvg/22x22/actions/mail_get_all.png
 share/kde/apps/knode/icons/crystalsvg/22x22/actions/message_reply.png
+share/kde/apps/knode/icons/crystalsvg/32x32/actions/mail_get_all.png
 share/kde/apps/knode/icons/crystalsvg/32x32/actions/message_reply.png
+share/kde/apps/knode/icons/crystalsvg/scalable/actions/mail_get_all.svg
 share/kde/apps/knode/kncomposerui.rc
 share/kde/apps/knode/knodeui.rc
 share/kde/apps/knode/knreaderui.rc
@@ -1005,6 +1052,7 @@ share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
+share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/xdays.png
 share/kde/apps/korganizer/korganizer_part.rc
 share/kde/apps/korganizer/korganizerui.rc
 share/kde/apps/korganizer/plugins/exchangeui.rc
@@ -1042,13 +1090,13 @@ share/kde/apps/kpilot/icons/crystalsvg/48x48/actions/fullsync.png
 share/kde/apps/kpilot/icons/crystalsvg/48x48/actions/hotsync.png
 share/kde/apps/kpilot/icons/crystalsvg/48x48/actions/listsync.png
 share/kde/apps/kpilot/icons/crystalsvg/48x48/apps/kpalmdoc.png
-share/kde/apps/kpilot/icons/kpilot-address.png
-share/kde/apps/kpilot/icons/kpilot-bhotsync.png
-share/kde/apps/kpilot/icons/kpilot-calendar.png
-share/kde/apps/kpilot/icons/kpilot-db.png
-share/kde/apps/kpilot/icons/kpilot-fileinstaller.png
-share/kde/apps/kpilot/icons/kpilot-knotes.png
-share/kde/apps/kpilot/icons/kpilot-todo.png
+share/kde/apps/kpilot/icons/crystalsvg/64x64/actions/kpilotaddress.png
+share/kde/apps/kpilot/icons/crystalsvg/64x64/actions/kpilotbhotsync.png
+share/kde/apps/kpilot/icons/crystalsvg/64x64/actions/kpilotcalendar.png
+share/kde/apps/kpilot/icons/crystalsvg/64x64/actions/kpilotdb.png
+share/kde/apps/kpilot/icons/crystalsvg/64x64/actions/kpilotfileinstaller.png
+share/kde/apps/kpilot/icons/crystalsvg/64x64/actions/kpilotknotes.png
+share/kde/apps/kpilot/icons/crystalsvg/64x64/actions/kpilottodo.png
 share/kde/apps/kpilot/kpilotui.rc
 share/kde/apps/kpilot/pics/kpilot-splash.png
 share/kde/apps/kpilot/sysinfoconduit/Template.html
@@ -1062,6 +1110,380 @@ share/kde/apps/ktnef/ktnefui.rc
 share/kde/apps/kwatchgnupg/kwatchgnupgui.rc
 share/kde/apps/kwatchgnupg/pics/kwatchgnupg.png
 share/kde/apps/kwatchgnupg/pics/kwatchgnupg2.png
+share/kde/apps/libical/zoneinfo/Africa/Abidjan.ics
+share/kde/apps/libical/zoneinfo/Africa/Accra.ics
+share/kde/apps/libical/zoneinfo/Africa/Addis_Ababa.ics
+share/kde/apps/libical/zoneinfo/Africa/Algiers.ics
+share/kde/apps/libical/zoneinfo/Africa/Asmera.ics
+share/kde/apps/libical/zoneinfo/Africa/Bamako.ics
+share/kde/apps/libical/zoneinfo/Africa/Bangui.ics
+share/kde/apps/libical/zoneinfo/Africa/Banjul.ics
+share/kde/apps/libical/zoneinfo/Africa/Bissau.ics
+share/kde/apps/libical/zoneinfo/Africa/Blantyre.ics
+share/kde/apps/libical/zoneinfo/Africa/Brazzaville.ics
+share/kde/apps/libical/zoneinfo/Africa/Bujumbura.ics
+share/kde/apps/libical/zoneinfo/Africa/Cairo.ics
+share/kde/apps/libical/zoneinfo/Africa/Casablanca.ics
+share/kde/apps/libical/zoneinfo/Africa/Ceuta.ics
+share/kde/apps/libical/zoneinfo/Africa/Conakry.ics
+share/kde/apps/libical/zoneinfo/Africa/Dakar.ics
+share/kde/apps/libical/zoneinfo/Africa/Dar_es_Salaam.ics
+share/kde/apps/libical/zoneinfo/Africa/Djibouti.ics
+share/kde/apps/libical/zoneinfo/Africa/Douala.ics
+share/kde/apps/libical/zoneinfo/Africa/El_Aaiun.ics
+share/kde/apps/libical/zoneinfo/Africa/Freetown.ics
+share/kde/apps/libical/zoneinfo/Africa/Gaborone.ics
+share/kde/apps/libical/zoneinfo/Africa/Harare.ics
+share/kde/apps/libical/zoneinfo/Africa/Johannesburg.ics
+share/kde/apps/libical/zoneinfo/Africa/Kampala.ics
+share/kde/apps/libical/zoneinfo/Africa/Khartoum.ics
+share/kde/apps/libical/zoneinfo/Africa/Kigali.ics
+share/kde/apps/libical/zoneinfo/Africa/Kinshasa.ics
+share/kde/apps/libical/zoneinfo/Africa/Lagos.ics
+share/kde/apps/libical/zoneinfo/Africa/Libreville.ics
+share/kde/apps/libical/zoneinfo/Africa/Lome.ics
+share/kde/apps/libical/zoneinfo/Africa/Luanda.ics
+share/kde/apps/libical/zoneinfo/Africa/Lubumbashi.ics
+share/kde/apps/libical/zoneinfo/Africa/Lusaka.ics
+share/kde/apps/libical/zoneinfo/Africa/Malabo.ics
+share/kde/apps/libical/zoneinfo/Africa/Maputo.ics
+share/kde/apps/libical/zoneinfo/Africa/Maseru.ics
+share/kde/apps/libical/zoneinfo/Africa/Mbabane.ics
+share/kde/apps/libical/zoneinfo/Africa/Mogadishu.ics
+share/kde/apps/libical/zoneinfo/Africa/Monrovia.ics
+share/kde/apps/libical/zoneinfo/Africa/Nairobi.ics
+share/kde/apps/libical/zoneinfo/Africa/Ndjamena.ics
+share/kde/apps/libical/zoneinfo/Africa/Niamey.ics
+share/kde/apps/libical/zoneinfo/Africa/Nouakchott.ics
+share/kde/apps/libical/zoneinfo/Africa/Ouagadougou.ics
+share/kde/apps/libical/zoneinfo/Africa/Porto-Novo.ics
+share/kde/apps/libical/zoneinfo/Africa/Sao_Tome.ics
+share/kde/apps/libical/zoneinfo/Africa/Timbuktu.ics
+share/kde/apps/libical/zoneinfo/Africa/Tripoli.ics
+share/kde/apps/libical/zoneinfo/Africa/Tunis.ics
+share/kde/apps/libical/zoneinfo/Africa/Windhoek.ics
+share/kde/apps/libical/zoneinfo/America/Adak.ics
+share/kde/apps/libical/zoneinfo/America/Anchorage.ics
+share/kde/apps/libical/zoneinfo/America/Anguilla.ics
+share/kde/apps/libical/zoneinfo/America/Antigua.ics
+share/kde/apps/libical/zoneinfo/America/Araguaina.ics
+share/kde/apps/libical/zoneinfo/America/Aruba.ics
+share/kde/apps/libical/zoneinfo/America/Asuncion.ics
+share/kde/apps/libical/zoneinfo/America/Barbados.ics
+share/kde/apps/libical/zoneinfo/America/Belem.ics
+share/kde/apps/libical/zoneinfo/America/Belize.ics
+share/kde/apps/libical/zoneinfo/America/Boa_Vista.ics
+share/kde/apps/libical/zoneinfo/America/Bogota.ics
+share/kde/apps/libical/zoneinfo/America/Boise.ics
+share/kde/apps/libical/zoneinfo/America/Buenos_Aires.ics
+share/kde/apps/libical/zoneinfo/America/Cambridge_Bay.ics
+share/kde/apps/libical/zoneinfo/America/Cancun.ics
+share/kde/apps/libical/zoneinfo/America/Caracas.ics
+share/kde/apps/libical/zoneinfo/America/Catamarca.ics
+share/kde/apps/libical/zoneinfo/America/Cayenne.ics
+share/kde/apps/libical/zoneinfo/America/Cayman.ics
+share/kde/apps/libical/zoneinfo/America/Chicago.ics
+share/kde/apps/libical/zoneinfo/America/Chihuahua.ics
+share/kde/apps/libical/zoneinfo/America/Cordoba.ics
+share/kde/apps/libical/zoneinfo/America/Costa_Rica.ics
+share/kde/apps/libical/zoneinfo/America/Cuiaba.ics
+share/kde/apps/libical/zoneinfo/America/Curacao.ics
+share/kde/apps/libical/zoneinfo/America/Dawson.ics
+share/kde/apps/libical/zoneinfo/America/Dawson_Creek.ics
+share/kde/apps/libical/zoneinfo/America/Denver.ics
+share/kde/apps/libical/zoneinfo/America/Detroit.ics
+share/kde/apps/libical/zoneinfo/America/Dominica.ics
+share/kde/apps/libical/zoneinfo/America/Edmonton.ics
+share/kde/apps/libical/zoneinfo/America/Eirunepe.ics
+share/kde/apps/libical/zoneinfo/America/El_Salvador.ics
+share/kde/apps/libical/zoneinfo/America/Fortaleza.ics
+share/kde/apps/libical/zoneinfo/America/Glace_Bay.ics
+share/kde/apps/libical/zoneinfo/America/Godthab.ics
+share/kde/apps/libical/zoneinfo/America/Goose_Bay.ics
+share/kde/apps/libical/zoneinfo/America/Grand_Turk.ics
+share/kde/apps/libical/zoneinfo/America/Grenada.ics
+share/kde/apps/libical/zoneinfo/America/Guadeloupe.ics
+share/kde/apps/libical/zoneinfo/America/Guatemala.ics
+share/kde/apps/libical/zoneinfo/America/Guayaquil.ics
+share/kde/apps/libical/zoneinfo/America/Guyana.ics
+share/kde/apps/libical/zoneinfo/America/Halifax.ics
+share/kde/apps/libical/zoneinfo/America/Havana.ics
+share/kde/apps/libical/zoneinfo/America/Hermosillo.ics
+share/kde/apps/libical/zoneinfo/America/Indiana/Indianapolis.ics
+share/kde/apps/libical/zoneinfo/America/Indiana/Knox.ics
+share/kde/apps/libical/zoneinfo/America/Indiana/Marengo.ics
+share/kde/apps/libical/zoneinfo/America/Indiana/Vevay.ics
+share/kde/apps/libical/zoneinfo/America/Indianapolis.ics
+share/kde/apps/libical/zoneinfo/America/Inuvik.ics
+share/kde/apps/libical/zoneinfo/America/Iqaluit.ics
+share/kde/apps/libical/zoneinfo/America/Jamaica.ics
+share/kde/apps/libical/zoneinfo/America/Jujuy.ics
+share/kde/apps/libical/zoneinfo/America/Juneau.ics
+share/kde/apps/libical/zoneinfo/America/Kentucky/Louisville.ics
+share/kde/apps/libical/zoneinfo/America/Kentucky/Monticello.ics
+share/kde/apps/libical/zoneinfo/America/La_Paz.ics
+share/kde/apps/libical/zoneinfo/America/Lima.ics
+share/kde/apps/libical/zoneinfo/America/Los_Angeles.ics
+share/kde/apps/libical/zoneinfo/America/Louisville.ics
+share/kde/apps/libical/zoneinfo/America/Maceio.ics
+share/kde/apps/libical/zoneinfo/America/Managua.ics
+share/kde/apps/libical/zoneinfo/America/Manaus.ics
+share/kde/apps/libical/zoneinfo/America/Martinique.ics
+share/kde/apps/libical/zoneinfo/America/Mazatlan.ics
+share/kde/apps/libical/zoneinfo/America/Mendoza.ics
+share/kde/apps/libical/zoneinfo/America/Menominee.ics
+share/kde/apps/libical/zoneinfo/America/Merida.ics
+share/kde/apps/libical/zoneinfo/America/Mexico_City.ics
+share/kde/apps/libical/zoneinfo/America/Miquelon.ics
+share/kde/apps/libical/zoneinfo/America/Monterrey.ics
+share/kde/apps/libical/zoneinfo/America/Montevideo.ics
+share/kde/apps/libical/zoneinfo/America/Montreal.ics
+share/kde/apps/libical/zoneinfo/America/Montserrat.ics
+share/kde/apps/libical/zoneinfo/America/Nassau.ics
+share/kde/apps/libical/zoneinfo/America/New_York.ics
+share/kde/apps/libical/zoneinfo/America/Nipigon.ics
+share/kde/apps/libical/zoneinfo/America/Nome.ics
+share/kde/apps/libical/zoneinfo/America/Noronha.ics
+share/kde/apps/libical/zoneinfo/America/Panama.ics
+share/kde/apps/libical/zoneinfo/America/Pangnirtung.ics
+share/kde/apps/libical/zoneinfo/America/Paramaribo.ics
+share/kde/apps/libical/zoneinfo/America/Phoenix.ics
+share/kde/apps/libical/zoneinfo/America/Port-au-Prince.ics
+share/kde/apps/libical/zoneinfo/America/Port_of_Spain.ics
+share/kde/apps/libical/zoneinfo/America/Porto_Velho.ics
+share/kde/apps/libical/zoneinfo/America/Puerto_Rico.ics
+share/kde/apps/libical/zoneinfo/America/Rainy_River.ics
+share/kde/apps/libical/zoneinfo/America/Rankin_Inlet.ics
+share/kde/apps/libical/zoneinfo/America/Recife.ics
+share/kde/apps/libical/zoneinfo/America/Regina.ics
+share/kde/apps/libical/zoneinfo/America/Rio_Branco.ics
+share/kde/apps/libical/zoneinfo/America/Rosario.ics
+share/kde/apps/libical/zoneinfo/America/Santiago.ics
+share/kde/apps/libical/zoneinfo/America/Santo_Domingo.ics
+share/kde/apps/libical/zoneinfo/America/Sao_Paulo.ics
+share/kde/apps/libical/zoneinfo/America/Scoresbysund.ics
+share/kde/apps/libical/zoneinfo/America/Shiprock.ics
+share/kde/apps/libical/zoneinfo/America/St_Johns.ics
+share/kde/apps/libical/zoneinfo/America/St_Kitts.ics
+share/kde/apps/libical/zoneinfo/America/St_Lucia.ics
+share/kde/apps/libical/zoneinfo/America/St_Thomas.ics
+share/kde/apps/libical/zoneinfo/America/St_Vincent.ics
+share/kde/apps/libical/zoneinfo/America/Swift_Current.ics
+share/kde/apps/libical/zoneinfo/America/Tegucigalpa.ics
+share/kde/apps/libical/zoneinfo/America/Thule.ics
+share/kde/apps/libical/zoneinfo/America/Thunder_Bay.ics
+share/kde/apps/libical/zoneinfo/America/Tijuana.ics
+share/kde/apps/libical/zoneinfo/America/Tortola.ics
+share/kde/apps/libical/zoneinfo/America/Vancouver.ics
+share/kde/apps/libical/zoneinfo/America/Whitehorse.ics
+share/kde/apps/libical/zoneinfo/America/Winnipeg.ics
+share/kde/apps/libical/zoneinfo/America/Yakutat.ics
+share/kde/apps/libical/zoneinfo/America/Yellowknife.ics
+share/kde/apps/libical/zoneinfo/Antarctica/Casey.ics
+share/kde/apps/libical/zoneinfo/Antarctica/Davis.ics
+share/kde/apps/libical/zoneinfo/Antarctica/DumontDUrville.ics
+share/kde/apps/libical/zoneinfo/Antarctica/Mawson.ics
+share/kde/apps/libical/zoneinfo/Antarctica/McMurdo.ics
+share/kde/apps/libical/zoneinfo/Antarctica/Palmer.ics
+share/kde/apps/libical/zoneinfo/Antarctica/South_Pole.ics
+share/kde/apps/libical/zoneinfo/Antarctica/Syowa.ics
+share/kde/apps/libical/zoneinfo/Antarctica/Vostok.ics
+share/kde/apps/libical/zoneinfo/Arctic/Longyearbyen.ics
+share/kde/apps/libical/zoneinfo/Asia/Aden.ics
+share/kde/apps/libical/zoneinfo/Asia/Almaty.ics
+share/kde/apps/libical/zoneinfo/Asia/Amman.ics
+share/kde/apps/libical/zoneinfo/Asia/Anadyr.ics
+share/kde/apps/libical/zoneinfo/Asia/Aqtau.ics
+share/kde/apps/libical/zoneinfo/Asia/Aqtobe.ics
+share/kde/apps/libical/zoneinfo/Asia/Ashgabat.ics
+share/kde/apps/libical/zoneinfo/Asia/Baghdad.ics
+share/kde/apps/libical/zoneinfo/Asia/Bahrain.ics
+share/kde/apps/libical/zoneinfo/Asia/Baku.ics
+share/kde/apps/libical/zoneinfo/Asia/Bangkok.ics
+share/kde/apps/libical/zoneinfo/Asia/Beirut.ics
+share/kde/apps/libical/zoneinfo/Asia/Bishkek.ics
+share/kde/apps/libical/zoneinfo/Asia/Brunei.ics
+share/kde/apps/libical/zoneinfo/Asia/Calcutta.ics
+share/kde/apps/libical/zoneinfo/Asia/Chungking.ics
+share/kde/apps/libical/zoneinfo/Asia/Colombo.ics
+share/kde/apps/libical/zoneinfo/Asia/Damascus.ics
+share/kde/apps/libical/zoneinfo/Asia/Dhaka.ics
+share/kde/apps/libical/zoneinfo/Asia/Dili.ics
+share/kde/apps/libical/zoneinfo/Asia/Dubai.ics
+share/kde/apps/libical/zoneinfo/Asia/Dushanbe.ics
+share/kde/apps/libical/zoneinfo/Asia/Gaza.ics
+share/kde/apps/libical/zoneinfo/Asia/Harbin.ics
+share/kde/apps/libical/zoneinfo/Asia/Hong_Kong.ics
+share/kde/apps/libical/zoneinfo/Asia/Hovd.ics
+share/kde/apps/libical/zoneinfo/Asia/Irkutsk.ics
+share/kde/apps/libical/zoneinfo/Asia/Istanbul.ics
+share/kde/apps/libical/zoneinfo/Asia/Jakarta.ics
+share/kde/apps/libical/zoneinfo/Asia/Jayapura.ics
+share/kde/apps/libical/zoneinfo/Asia/Jerusalem.ics
+share/kde/apps/libical/zoneinfo/Asia/Kabul.ics
+share/kde/apps/libical/zoneinfo/Asia/Kamchatka.ics
+share/kde/apps/libical/zoneinfo/Asia/Karachi.ics
+share/kde/apps/libical/zoneinfo/Asia/Kashgar.ics
+share/kde/apps/libical/zoneinfo/Asia/Katmandu.ics
+share/kde/apps/libical/zoneinfo/Asia/Krasnoyarsk.ics
+share/kde/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
+share/kde/apps/libical/zoneinfo/Asia/Kuching.ics
+share/kde/apps/libical/zoneinfo/Asia/Kuwait.ics
+share/kde/apps/libical/zoneinfo/Asia/Macao.ics
+share/kde/apps/libical/zoneinfo/Asia/Magadan.ics
+share/kde/apps/libical/zoneinfo/Asia/Manila.ics
+share/kde/apps/libical/zoneinfo/Asia/Muscat.ics
+share/kde/apps/libical/zoneinfo/Asia/Nicosia.ics
+share/kde/apps/libical/zoneinfo/Asia/Novosibirsk.ics
+share/kde/apps/libical/zoneinfo/Asia/Omsk.ics
+share/kde/apps/libical/zoneinfo/Asia/Phnom_Penh.ics
+share/kde/apps/libical/zoneinfo/Asia/Pontianak.ics
+share/kde/apps/libical/zoneinfo/Asia/Pyongyang.ics
+share/kde/apps/libical/zoneinfo/Asia/Qatar.ics
+share/kde/apps/libical/zoneinfo/Asia/Rangoon.ics
+share/kde/apps/libical/zoneinfo/Asia/Riyadh.ics
+share/kde/apps/libical/zoneinfo/Asia/Saigon.ics
+share/kde/apps/libical/zoneinfo/Asia/Samarkand.ics
+share/kde/apps/libical/zoneinfo/Asia/Seoul.ics
+share/kde/apps/libical/zoneinfo/Asia/Shanghai.ics
+share/kde/apps/libical/zoneinfo/Asia/Singapore.ics
+share/kde/apps/libical/zoneinfo/Asia/Taipei.ics
+share/kde/apps/libical/zoneinfo/Asia/Tashkent.ics
+share/kde/apps/libical/zoneinfo/Asia/Tbilisi.ics
+share/kde/apps/libical/zoneinfo/Asia/Tehran.ics
+share/kde/apps/libical/zoneinfo/Asia/Thimphu.ics
+share/kde/apps/libical/zoneinfo/Asia/Tokyo.ics
+share/kde/apps/libical/zoneinfo/Asia/Ujung_Pandang.ics
+share/kde/apps/libical/zoneinfo/Asia/Ulaanbaatar.ics
+share/kde/apps/libical/zoneinfo/Asia/Urumqi.ics
+share/kde/apps/libical/zoneinfo/Asia/Vientiane.ics
+share/kde/apps/libical/zoneinfo/Asia/Vladivostok.ics
+share/kde/apps/libical/zoneinfo/Asia/Yakutsk.ics
+share/kde/apps/libical/zoneinfo/Asia/Yekaterinburg.ics
+share/kde/apps/libical/zoneinfo/Asia/Yerevan.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Azores.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Bermuda.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Canary.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Cape_Verde.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Faeroe.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Jan_Mayen.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Madeira.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Reykjavik.ics
+share/kde/apps/libical/zoneinfo/Atlantic/South_Georgia.ics
+share/kde/apps/libical/zoneinfo/Atlantic/St_Helena.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Stanley.ics
+share/kde/apps/libical/zoneinfo/Australia/Adelaide.ics
+share/kde/apps/libical/zoneinfo/Australia/Brisbane.ics
+share/kde/apps/libical/zoneinfo/Australia/Broken_Hill.ics
+share/kde/apps/libical/zoneinfo/Australia/Darwin.ics
+share/kde/apps/libical/zoneinfo/Australia/Hobart.ics
+share/kde/apps/libical/zoneinfo/Australia/Lindeman.ics
+share/kde/apps/libical/zoneinfo/Australia/Lord_Howe.ics
+share/kde/apps/libical/zoneinfo/Australia/Melbourne.ics
+share/kde/apps/libical/zoneinfo/Australia/Perth.ics
+share/kde/apps/libical/zoneinfo/Australia/Sydney.ics
+share/kde/apps/libical/zoneinfo/Europe/Amsterdam.ics
+share/kde/apps/libical/zoneinfo/Europe/Andorra.ics
+share/kde/apps/libical/zoneinfo/Europe/Athens.ics
+share/kde/apps/libical/zoneinfo/Europe/Belfast.ics
+share/kde/apps/libical/zoneinfo/Europe/Belgrade.ics
+share/kde/apps/libical/zoneinfo/Europe/Berlin.ics
+share/kde/apps/libical/zoneinfo/Europe/Bratislava.ics
+share/kde/apps/libical/zoneinfo/Europe/Brussels.ics
+share/kde/apps/libical/zoneinfo/Europe/Bucharest.ics
+share/kde/apps/libical/zoneinfo/Europe/Budapest.ics
+share/kde/apps/libical/zoneinfo/Europe/Chisinau.ics
+share/kde/apps/libical/zoneinfo/Europe/Copenhagen.ics
+share/kde/apps/libical/zoneinfo/Europe/Dublin.ics
+share/kde/apps/libical/zoneinfo/Europe/Gibraltar.ics
+share/kde/apps/libical/zoneinfo/Europe/Helsinki.ics
+share/kde/apps/libical/zoneinfo/Europe/Istanbul.ics
+share/kde/apps/libical/zoneinfo/Europe/Kaliningrad.ics
+share/kde/apps/libical/zoneinfo/Europe/Kiev.ics
+share/kde/apps/libical/zoneinfo/Europe/Lisbon.ics
+share/kde/apps/libical/zoneinfo/Europe/Ljubljana.ics
+share/kde/apps/libical/zoneinfo/Europe/London.ics
+share/kde/apps/libical/zoneinfo/Europe/Luxembourg.ics
+share/kde/apps/libical/zoneinfo/Europe/Madrid.ics
+share/kde/apps/libical/zoneinfo/Europe/Malta.ics
+share/kde/apps/libical/zoneinfo/Europe/Minsk.ics
+share/kde/apps/libical/zoneinfo/Europe/Monaco.ics
+share/kde/apps/libical/zoneinfo/Europe/Moscow.ics
+share/kde/apps/libical/zoneinfo/Europe/Nicosia.ics
+share/kde/apps/libical/zoneinfo/Europe/Oslo.ics
+share/kde/apps/libical/zoneinfo/Europe/Paris.ics
+share/kde/apps/libical/zoneinfo/Europe/Prague.ics
+share/kde/apps/libical/zoneinfo/Europe/Riga.ics
+share/kde/apps/libical/zoneinfo/Europe/Rome.ics
+share/kde/apps/libical/zoneinfo/Europe/Samara.ics
+share/kde/apps/libical/zoneinfo/Europe/San_Marino.ics
+share/kde/apps/libical/zoneinfo/Europe/Sarajevo.ics
+share/kde/apps/libical/zoneinfo/Europe/Simferopol.ics
+share/kde/apps/libical/zoneinfo/Europe/Skopje.ics
+share/kde/apps/libical/zoneinfo/Europe/Sofia.ics
+share/kde/apps/libical/zoneinfo/Europe/Stockholm.ics
+share/kde/apps/libical/zoneinfo/Europe/Tallinn.ics
+share/kde/apps/libical/zoneinfo/Europe/Tirane.ics
+share/kde/apps/libical/zoneinfo/Europe/Uzhgorod.ics
+share/kde/apps/libical/zoneinfo/Europe/Vaduz.ics
+share/kde/apps/libical/zoneinfo/Europe/Vatican.ics
+share/kde/apps/libical/zoneinfo/Europe/Vienna.ics
+share/kde/apps/libical/zoneinfo/Europe/Vilnius.ics
+share/kde/apps/libical/zoneinfo/Europe/Warsaw.ics
+share/kde/apps/libical/zoneinfo/Europe/Zagreb.ics
+share/kde/apps/libical/zoneinfo/Europe/Zaporozhye.ics
+share/kde/apps/libical/zoneinfo/Europe/Zurich.ics
+share/kde/apps/libical/zoneinfo/Indian/Antananarivo.ics
+share/kde/apps/libical/zoneinfo/Indian/Chagos.ics
+share/kde/apps/libical/zoneinfo/Indian/Christmas.ics
+share/kde/apps/libical/zoneinfo/Indian/Cocos.ics
+share/kde/apps/libical/zoneinfo/Indian/Comoro.ics
+share/kde/apps/libical/zoneinfo/Indian/Kerguelen.ics
+share/kde/apps/libical/zoneinfo/Indian/Mahe.ics
+share/kde/apps/libical/zoneinfo/Indian/Maldives.ics
+share/kde/apps/libical/zoneinfo/Indian/Mauritius.ics
+share/kde/apps/libical/zoneinfo/Indian/Mayotte.ics
+share/kde/apps/libical/zoneinfo/Indian/Reunion.ics
+share/kde/apps/libical/zoneinfo/Pacific/Apia.ics
+share/kde/apps/libical/zoneinfo/Pacific/Auckland.ics
+share/kde/apps/libical/zoneinfo/Pacific/Chatham.ics
+share/kde/apps/libical/zoneinfo/Pacific/Easter.ics
+share/kde/apps/libical/zoneinfo/Pacific/Efate.ics
+share/kde/apps/libical/zoneinfo/Pacific/Enderbury.ics
+share/kde/apps/libical/zoneinfo/Pacific/Fakaofo.ics
+share/kde/apps/libical/zoneinfo/Pacific/Fiji.ics
+share/kde/apps/libical/zoneinfo/Pacific/Funafuti.ics
+share/kde/apps/libical/zoneinfo/Pacific/Galapagos.ics
+share/kde/apps/libical/zoneinfo/Pacific/Gambier.ics
+share/kde/apps/libical/zoneinfo/Pacific/Guadalcanal.ics
+share/kde/apps/libical/zoneinfo/Pacific/Guam.ics
+share/kde/apps/libical/zoneinfo/Pacific/Honolulu.ics
+share/kde/apps/libical/zoneinfo/Pacific/Johnston.ics
+share/kde/apps/libical/zoneinfo/Pacific/Kiritimati.ics
+share/kde/apps/libical/zoneinfo/Pacific/Kosrae.ics
+share/kde/apps/libical/zoneinfo/Pacific/Kwajalein.ics
+share/kde/apps/libical/zoneinfo/Pacific/Majuro.ics
+share/kde/apps/libical/zoneinfo/Pacific/Marquesas.ics
+share/kde/apps/libical/zoneinfo/Pacific/Midway.ics
+share/kde/apps/libical/zoneinfo/Pacific/Nauru.ics
+share/kde/apps/libical/zoneinfo/Pacific/Niue.ics
+share/kde/apps/libical/zoneinfo/Pacific/Norfolk.ics
+share/kde/apps/libical/zoneinfo/Pacific/Noumea.ics
+share/kde/apps/libical/zoneinfo/Pacific/Pago_Pago.ics
+share/kde/apps/libical/zoneinfo/Pacific/Palau.ics
+share/kde/apps/libical/zoneinfo/Pacific/Pitcairn.ics
+share/kde/apps/libical/zoneinfo/Pacific/Ponape.ics
+share/kde/apps/libical/zoneinfo/Pacific/Port_Moresby.ics
+share/kde/apps/libical/zoneinfo/Pacific/Rarotonga.ics
+share/kde/apps/libical/zoneinfo/Pacific/Saipan.ics
+share/kde/apps/libical/zoneinfo/Pacific/Tahiti.ics
+share/kde/apps/libical/zoneinfo/Pacific/Tarawa.ics
+share/kde/apps/libical/zoneinfo/Pacific/Tongatapu.ics
+share/kde/apps/libical/zoneinfo/Pacific/Truk.ics
+share/kde/apps/libical/zoneinfo/Pacific/Wake.ics
+share/kde/apps/libical/zoneinfo/Pacific/Wallis.ics
+share/kde/apps/libical/zoneinfo/Pacific/Yap.ics
+share/kde/apps/libical/zoneinfo/zones.tab
 share/kde/apps/libkdepim/about/bar-bottom-left.png
 share/kde/apps/libkdepim/about/bar-bottom-middle.png
 share/kde/apps/libkdepim/about/bar-bottom-right.png
@@ -1125,6 +1547,7 @@ share/kde/apps/libkholidays/holiday_si
 share/kde/apps/libkholidays/holiday_th
 share/kde/apps/libkholidays/holiday_us
 share/kde/apps/libkholidays/holiday_uy
+share/kde/apps/libkleopatra/pics/chiasmus_chi.png
 share/kde/apps/libkleopatra/pics/key.png
 share/kde/apps/libkleopatra/pics/key_bad.png
 share/kde/apps/libkleopatra/pics/key_ok.png
@@ -1157,6 +1580,7 @@ share/kde/config.kcfg/kpilot.kcfg
 share/kde/config.kcfg/kpilotlib.kcfg
 share/kde/config.kcfg/malconduit.kcfg
 share/kde/config.kcfg/memofileconduit.kcfg
+share/kde/config.kcfg/mk4config.kcfg
 share/kde/config.kcfg/pimemoticons.kcfg
 share/kde/config.kcfg/popmail.kcfg
 share/kde/config.kcfg/replyphrases.kcfg
@@ -1167,15 +1591,6 @@ share/kde/config.kcfg/vcalconduitbase.kcfg
 share/kde/config/kmail.antispamrc
 share/kde/config/kmail.antivirusrc
 share/kde/config/libkleopatrarc
-share/kde/icons/crystalsvg/128x128/apps/akregator.png
-share/kde/icons/crystalsvg/128x128/apps/kaddressbook.png
-share/kde/icons/crystalsvg/128x128/apps/karm.png
-share/kde/icons/crystalsvg/128x128/apps/kmail.png
-share/kde/icons/crystalsvg/128x128/apps/knode.png
-share/kde/icons/crystalsvg/128x128/apps/knode2.png
-share/kde/icons/crystalsvg/128x128/apps/knotes.png
-share/kde/icons/crystalsvg/128x128/apps/kontact.png
-share/kde/icons/crystalsvg/128x128/apps/korganizer.png
 share/kde/icons/crystalsvg/16x16/actions/kalarm.png
 share/kde/icons/crystalsvg/16x16/actions/kontact_contacts.png
 share/kde/icons/crystalsvg/16x16/actions/kontact_date.png
@@ -1186,26 +1601,16 @@ share/kde/icons/crystalsvg/16x16/actions/kontact_notes.png
 share/kde/icons/crystalsvg/16x16/actions/kontact_summary.png
 share/kde/icons/crystalsvg/16x16/actions/kontact_summary_green.png
 share/kde/icons/crystalsvg/16x16/actions/kontact_todo.png
-share/kde/icons/crystalsvg/16x16/apps/akregator.png
+share/kde/icons/crystalsvg/16x16/actions/rss_tag.png
 share/kde/icons/crystalsvg/16x16/apps/akregator_empty.png
 share/kde/icons/crystalsvg/16x16/apps/gpg.png
 share/kde/icons/crystalsvg/16x16/apps/gpgsm.png
-share/kde/icons/crystalsvg/16x16/apps/kaddressbook.png
-share/kde/icons/crystalsvg/16x16/apps/kalarm.png
-share/kde/icons/crystalsvg/16x16/apps/karm.png
-share/kde/icons/crystalsvg/16x16/apps/kmail.png
 share/kde/icons/crystalsvg/16x16/apps/kmailcvt.png
-share/kde/icons/crystalsvg/16x16/apps/knode.png
-share/kde/icons/crystalsvg/16x16/apps/knode2.png
-share/kde/icons/crystalsvg/16x16/apps/knotes.png
 share/kde/icons/crystalsvg/16x16/apps/konsolekalendar.png
-share/kde/icons/crystalsvg/16x16/apps/kontact.png
-share/kde/icons/crystalsvg/16x16/apps/korganizer.png
-share/kde/icons/crystalsvg/16x16/apps/korn.png
 share/kde/icons/crystalsvg/16x16/apps/kpalmdoc.png
-share/kde/icons/crystalsvg/16x16/apps/kpilot.png
 share/kde/icons/crystalsvg/16x16/apps/kpilotDaemon.png
-share/kde/icons/crystalsvg/16x16/apps/multisynk.png
+share/kde/icons/crystalsvg/22x22/actions/button_fewer.png
+share/kde/icons/crystalsvg/22x22/actions/button_more.png
 share/kde/icons/crystalsvg/22x22/actions/kalarm.png
 share/kde/icons/crystalsvg/22x22/actions/kontact_contacts.png
 share/kde/icons/crystalsvg/22x22/actions/kontact_date.png
@@ -1216,18 +1621,13 @@ share/kde/icons/crystalsvg/22x22/actions/kontact_notes.png
 share/kde/icons/crystalsvg/22x22/actions/kontact_summary.png
 share/kde/icons/crystalsvg/22x22/actions/kontact_summary_green.png
 share/kde/icons/crystalsvg/22x22/actions/kontact_todo.png
-share/kde/icons/crystalsvg/22x22/apps/akregator.png
+share/kde/icons/crystalsvg/22x22/actions/rss_tag.png
 share/kde/icons/crystalsvg/22x22/apps/gpg.png
 share/kde/icons/crystalsvg/22x22/apps/gpgsm.png
-share/kde/icons/crystalsvg/22x22/apps/kmail.png
 share/kde/icons/crystalsvg/22x22/apps/kmaillight.png
-share/kde/icons/crystalsvg/22x22/apps/knotes.png
 share/kde/icons/crystalsvg/22x22/apps/konsolekalendar.png
-share/kde/icons/crystalsvg/22x22/apps/kontact.png
 share/kde/icons/crystalsvg/22x22/apps/kpalmdoc.png
-share/kde/icons/crystalsvg/22x22/apps/kpilot.png
 share/kde/icons/crystalsvg/22x22/apps/kpilotDaemon.png
-share/kde/icons/crystalsvg/22x22/apps/multisynk.png
 share/kde/icons/crystalsvg/32x32/actions/kontact_contacts.png
 share/kde/icons/crystalsvg/32x32/actions/kontact_date.png
 share/kde/icons/crystalsvg/32x32/actions/kontact_journal.png
@@ -1237,26 +1637,14 @@ share/kde/icons/crystalsvg/32x32/actions/kontact_notes.png
 share/kde/icons/crystalsvg/32x32/actions/kontact_summary.png
 share/kde/icons/crystalsvg/32x32/actions/kontact_summary_green.png
 share/kde/icons/crystalsvg/32x32/actions/kontact_todo.png
-share/kde/icons/crystalsvg/32x32/apps/akregator.png
+share/kde/icons/crystalsvg/32x32/actions/rss_tag.png
 share/kde/icons/crystalsvg/32x32/apps/gpg.png
 share/kde/icons/crystalsvg/32x32/apps/gpgsm.png
-share/kde/icons/crystalsvg/32x32/apps/kaddressbook.png
-share/kde/icons/crystalsvg/32x32/apps/kalarm.png
-share/kde/icons/crystalsvg/32x32/apps/karm.png
-share/kde/icons/crystalsvg/32x32/apps/kmail.png
 share/kde/icons/crystalsvg/32x32/apps/kmailcvt.png
 share/kde/icons/crystalsvg/32x32/apps/kmaillight.png
-share/kde/icons/crystalsvg/32x32/apps/knode.png
-share/kde/icons/crystalsvg/32x32/apps/knode2.png
-share/kde/icons/crystalsvg/32x32/apps/knotes.png
 share/kde/icons/crystalsvg/32x32/apps/konsolekalendar.png
-share/kde/icons/crystalsvg/32x32/apps/kontact.png
-share/kde/icons/crystalsvg/32x32/apps/korganizer.png
-share/kde/icons/crystalsvg/32x32/apps/korn.png
 share/kde/icons/crystalsvg/32x32/apps/kpalmdoc.png
-share/kde/icons/crystalsvg/32x32/apps/kpilot.png
 share/kde/icons/crystalsvg/32x32/apps/kpilotDaemon.png
-share/kde/icons/crystalsvg/32x32/apps/multisynk.png
 share/kde/icons/crystalsvg/48x48/actions/kontact_contacts.png
 share/kde/icons/crystalsvg/48x48/actions/kontact_date.png
 share/kde/icons/crystalsvg/48x48/actions/kontact_journal.png
@@ -1266,23 +1654,10 @@ share/kde/icons/crystalsvg/48x48/actions/kontact_notes.png
 share/kde/icons/crystalsvg/48x48/actions/kontact_summary.png
 share/kde/icons/crystalsvg/48x48/actions/kontact_summary_green.png
 share/kde/icons/crystalsvg/48x48/actions/kontact_todo.png
-share/kde/icons/crystalsvg/48x48/apps/akregator.png
-share/kde/icons/crystalsvg/48x48/apps/kaddressbook.png
-share/kde/icons/crystalsvg/48x48/apps/kalarm.png
-share/kde/icons/crystalsvg/48x48/apps/karm.png
-share/kde/icons/crystalsvg/48x48/apps/kmail.png
+share/kde/icons/crystalsvg/48x48/actions/rss_tag.png
 share/kde/icons/crystalsvg/48x48/apps/kmailcvt.png
-share/kde/icons/crystalsvg/48x48/apps/knode.png
-share/kde/icons/crystalsvg/48x48/apps/knode2.png
-share/kde/icons/crystalsvg/48x48/apps/knotes.png
-share/kde/icons/crystalsvg/48x48/apps/kontact.png
-share/kde/icons/crystalsvg/48x48/apps/korganizer.png
-share/kde/icons/crystalsvg/48x48/apps/korganizer_todo.png
-share/kde/icons/crystalsvg/48x48/apps/korn.png
 share/kde/icons/crystalsvg/48x48/apps/kpalmdoc.png
-share/kde/icons/crystalsvg/48x48/apps/kpilot.png
 share/kde/icons/crystalsvg/48x48/apps/kpilotDaemon.png
-share/kde/icons/crystalsvg/48x48/apps/multisynk.png
 share/kde/icons/crystalsvg/64x64/actions/kontact_contacts.png
 share/kde/icons/crystalsvg/64x64/actions/kontact_date.png
 share/kde/icons/crystalsvg/64x64/actions/kontact_journal.png
@@ -1292,23 +1667,80 @@ share/kde/icons/crystalsvg/64x64/actions/kontact_notes.png
 share/kde/icons/crystalsvg/64x64/actions/kontact_summary.png
 share/kde/icons/crystalsvg/64x64/actions/kontact_summary_green.png
 share/kde/icons/crystalsvg/64x64/actions/kontact_todo.png
-share/kde/icons/crystalsvg/64x64/apps/akregator.png
-share/kde/icons/crystalsvg/64x64/apps/kaddressbook.png
-share/kde/icons/crystalsvg/64x64/apps/karm.png
-share/kde/icons/crystalsvg/64x64/apps/kmail.png
-share/kde/icons/crystalsvg/64x64/apps/knode.png
-share/kde/icons/crystalsvg/64x64/apps/knode2.png
-share/kde/icons/crystalsvg/64x64/apps/knotes.png
-share/kde/icons/crystalsvg/64x64/apps/kontact.png
-share/kde/icons/crystalsvg/64x64/apps/korganizer.png
-share/kde/icons/crystalsvg/scalable/apps/akregator.svgz
-share/kde/icons/crystalsvg/scalable/apps/kmail.svgz
+share/kde/icons/crystalsvg/64x64/actions/rss_tag.png
+share/kde/icons/hicolor/128x128/apps/akregator.png
+share/kde/icons/hicolor/128x128/apps/kaddressbook.png
+share/kde/icons/hicolor/128x128/apps/karm.png
+share/kde/icons/hicolor/128x128/apps/kmail.png
+share/kde/icons/hicolor/128x128/apps/knode.png
+share/kde/icons/hicolor/128x128/apps/knode2.png
+share/kde/icons/hicolor/128x128/apps/knotes.png
+share/kde/icons/hicolor/128x128/apps/kontact.png
+share/kde/icons/hicolor/128x128/apps/korganizer.png
+share/kde/icons/hicolor/16x16/apps/akregator.png
+share/kde/icons/hicolor/16x16/apps/kaddressbook.png
+share/kde/icons/hicolor/16x16/apps/kalarm.png
+share/kde/icons/hicolor/16x16/apps/karm.png
+share/kde/icons/hicolor/16x16/apps/kmail.png
+share/kde/icons/hicolor/16x16/apps/knode.png
+share/kde/icons/hicolor/16x16/apps/knode2.png
+share/kde/icons/hicolor/16x16/apps/knotes.png
+share/kde/icons/hicolor/16x16/apps/kontact.png
+share/kde/icons/hicolor/16x16/apps/korganizer.png
+share/kde/icons/hicolor/16x16/apps/korn.png
+share/kde/icons/hicolor/16x16/apps/kpilot.png
+share/kde/icons/hicolor/16x16/apps/multisynk.png
+share/kde/icons/hicolor/22x22/apps/akregator.png
+share/kde/icons/hicolor/22x22/apps/karm.png
+share/kde/icons/hicolor/22x22/apps/kmail.png
+share/kde/icons/hicolor/22x22/apps/knotes.png
+share/kde/icons/hicolor/22x22/apps/kontact.png
+share/kde/icons/hicolor/22x22/apps/kpilot.png
+share/kde/icons/hicolor/22x22/apps/multisynk.png
+share/kde/icons/hicolor/32x32/apps/akregator.png
+share/kde/icons/hicolor/32x32/apps/kaddressbook.png
+share/kde/icons/hicolor/32x32/apps/kalarm.png
+share/kde/icons/hicolor/32x32/apps/karm.png
+share/kde/icons/hicolor/32x32/apps/kmail.png
+share/kde/icons/hicolor/32x32/apps/knode.png
+share/kde/icons/hicolor/32x32/apps/knode2.png
+share/kde/icons/hicolor/32x32/apps/knotes.png
+share/kde/icons/hicolor/32x32/apps/kontact.png
+share/kde/icons/hicolor/32x32/apps/korganizer.png
+share/kde/icons/hicolor/32x32/apps/korn.png
+share/kde/icons/hicolor/32x32/apps/kpilot.png
+share/kde/icons/hicolor/32x32/apps/multisynk.png
+share/kde/icons/hicolor/48x48/apps/akregator.png
+share/kde/icons/hicolor/48x48/apps/kaddressbook.png
+share/kde/icons/hicolor/48x48/apps/kalarm.png
+share/kde/icons/hicolor/48x48/apps/karm.png
+share/kde/icons/hicolor/48x48/apps/kmail.png
+share/kde/icons/hicolor/48x48/apps/knode.png
+share/kde/icons/hicolor/48x48/apps/knode2.png
+share/kde/icons/hicolor/48x48/apps/knotes.png
+share/kde/icons/hicolor/48x48/apps/kontact.png
+share/kde/icons/hicolor/48x48/apps/korganizer.png
+share/kde/icons/hicolor/48x48/apps/korn.png
+share/kde/icons/hicolor/48x48/apps/kpilot.png
 share/kde/icons/hicolor/48x48/apps/ktnef.png
+share/kde/icons/hicolor/48x48/apps/multisynk.png
+share/kde/icons/hicolor/64x64/apps/akregator.png
+share/kde/icons/hicolor/64x64/apps/kaddressbook.png
+share/kde/icons/hicolor/64x64/apps/karm.png
+share/kde/icons/hicolor/64x64/apps/kmail.png
+share/kde/icons/hicolor/64x64/apps/knode.png
+share/kde/icons/hicolor/64x64/apps/knode2.png
+share/kde/icons/hicolor/64x64/apps/knotes.png
+share/kde/icons/hicolor/64x64/apps/kontact.png
+share/kde/icons/hicolor/64x64/apps/korganizer.png
+share/kde/icons/hicolor/scalable/apps/akregator.svgz
+share/kde/icons/hicolor/scalable/apps/kmail.svgz
 share/kde/icons/locolor/16x16/apps/kpilot.png
 share/kde/icons/locolor/16x16/apps/ktnef.png
 share/kde/icons/locolor/32x32/apps/ktnef.png
 share/kde/mimelnk/application/ms-tnef.desktop
 share/kde/services/abbrowser_conduit.desktop
+share/kde/services/akregator_mk4storage_plugin.desktop
 share/kde/services/akregator_part.desktop
 share/kde/services/doc_conduit.desktop
 share/kde/services/feed.protocol
@@ -1340,11 +1772,12 @@ share/kde/services/kaddressbook/msnprotocol.desktop
 share/kde/services/kaddressbook/opera_xxport.desktop
 share/kde/services/kaddressbook/pab_xxport.desktop
 share/kde/services/kaddressbook/resourceselection.desktop
+share/kde/services/kaddressbook/skypeprotocol.desktop
 share/kde/services/kaddressbook/smsprotocol.desktop
 share/kde/services/kaddressbook/tableview.desktop
 share/kde/services/kaddressbook/vcard_xxport.desktop
 share/kde/services/kaddressbook/yahooprotocol.desktop
-share/kde/services/kcmkabsummary.desktop
+share/kde/services/karm_part.desktop
 share/kde/services/kcmkmailsummary.desktop
 share/kde/services/kcmkontactknt.desktop
 share/kde/services/kcmkontactsummary.desktop
@@ -1356,6 +1789,8 @@ share/kde/services/kfile_palm.desktop
 share/kde/services/kfile_vcf.desktop
 share/kde/services/kitchensync/backup.desktop
 share/kde/services/kitchensync/debugger.desktop
+share/kde/services/kitchensync/filter/addressbookfilter.desktop
+share/kde/services/kitchensync/filter/calendarfilter.desktop
 share/kde/services/kitchensync/plucker.desktop
 share/kde/services/kitchensync/restore.desktop
 share/kde/services/kitchensync/syncerpart.desktop
@@ -1382,6 +1817,7 @@ share/kde/services/kontact/akregatorplugin.desktop
 share/kde/services/kontact/akregatorplugin3.2.desktop
 share/kde/services/kontact/journalplugin.desktop
 share/kde/services/kontact/kaddressbookplugin.desktop
+share/kde/services/kontact/karmplugin.desktop
 share/kde/services/kontact/kmailplugin.desktop
 share/kde/services/kontact/knodeplugin.desktop
 share/kde/services/kontact/knotesplugin.desktop
@@ -1416,6 +1852,7 @@ share/kde/services/kresources/kabc/kabc_groupdav.desktop
 share/kde/services/kresources/kabc/kabc_groupwise.desktop
 share/kde/services/kresources/kabc/kabc_newexchange.desktop
 share/kde/services/kresources/kabc/kabc_opengroupware.desktop
+share/kde/services/kresources/kabc/kabc_ox.desktop
 share/kde/services/kresources/kabc/kabc_slox.desktop
 share/kde/services/kresources/kabc/kabc_xmlrpc.desktop
 share/kde/services/kresources/kabc/kolab.desktop
@@ -1427,6 +1864,7 @@ share/kde/services/kresources/kcal/kcal_groupdav.desktop
 share/kde/services/kresources/kcal/kcal_groupwise.desktop
 share/kde/services/kresources/kcal/kcal_newexchange.desktop
 share/kde/services/kresources/kcal/kcal_opengroupware.desktop
+share/kde/services/kresources/kcal/kcal_ox.desktop
 share/kde/services/kresources/kcal/kcal_resourcefeatureplan.desktop
 share/kde/services/kresources/kcal/kcal_slox.desktop
 share/kde/services/kresources/kcal/kcal_xmlrpc.desktop
@@ -1459,6 +1897,7 @@ share/kde/services/time_conduit.desktop
 share/kde/services/todo-conduit.desktop
 share/kde/services/vcal-conduit.desktop
 share/kde/services/webcal.protocol
+share/kde/servicetypes/akregator_plugin.desktop
 share/kde/servicetypes/calendardecoration.desktop
 share/kde/servicetypes/calendarplugin.desktop
 share/kde/servicetypes/dcopaddressbook.desktop
@@ -1485,6 +1924,7 @@ share/kde/servicetypes/kpilotconduit.desktop
 @comment in kde: @dirrm share/kde/services/kresources
 @dirrm share/kde/services/korganizer
 @dirrm share/kde/services/kontact
+@dirrm share/kde/services/kitchensync/filter
 @dirrm share/kde/services/kitchensync
 @comment in kde: @dirrm share/kde/services/kded
 @comment in kde: @dirrm share/kde/services/kaddressbook
@@ -1492,7 +1932,13 @@ share/kde/servicetypes/kpilotconduit.desktop
 @comment in kde: @dirrm share/kde/mimelnk/application
 @comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
 @comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
 @comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/actions
@@ -1524,6 +1970,20 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/libkholidays
 @dirrm share/kde/apps/libkdepim/about
 @dirrm share/kde/apps/libkdepim
+@dirrm share/kde/apps/libical/zoneinfo/Pacific
+@dirrm share/kde/apps/libical/zoneinfo/Indian
+@dirrm share/kde/apps/libical/zoneinfo/Europe
+@dirrm share/kde/apps/libical/zoneinfo/Australia
+@dirrm share/kde/apps/libical/zoneinfo/Atlantic
+@dirrm share/kde/apps/libical/zoneinfo/Asia
+@dirrm share/kde/apps/libical/zoneinfo/Arctic
+@dirrm share/kde/apps/libical/zoneinfo/Antarctica
+@dirrm share/kde/apps/libical/zoneinfo/America/Kentucky
+@dirrm share/kde/apps/libical/zoneinfo/America/Indiana
+@dirrm share/kde/apps/libical/zoneinfo/America
+@dirrm share/kde/apps/libical/zoneinfo/Africa
+@dirrm share/kde/apps/libical/zoneinfo
+@dirrm share/kde/apps/libical
 @dirrm share/kde/apps/kwatchgnupg/pics
 @dirrm share/kde/apps/kwatchgnupg
 @dirrm share/kde/apps/ktnef/icons/locolor/16x16/actions
@@ -1537,6 +1997,8 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/ksync
 @dirrm share/kde/apps/kpilot/sysinfoconduit
 @dirrm share/kde/apps/kpilot/pics
+@dirrm share/kde/apps/kpilot/icons/crystalsvg/64x64/actions
+@dirrm share/kde/apps/kpilot/icons/crystalsvg/64x64
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/48x48/apps
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/48x48/actions
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/48x48
@@ -1579,12 +2041,16 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/knotes/icons
 @dirrm share/kde/apps/knotes
 @dirrm share/kde/apps/knode/pics
+@dirrm share/kde/apps/knode/icons/crystalsvg/scalable/actions
+@dirrm share/kde/apps/knode/icons/crystalsvg/scalable
 @dirrm share/kde/apps/knode/icons/crystalsvg/32x32/actions
 @dirrm share/kde/apps/knode/icons/crystalsvg/32x32
 @dirrm share/kde/apps/knode/icons/crystalsvg/22x22/actions
 @dirrm share/kde/apps/knode/icons/crystalsvg/22x22
 @dirrm share/kde/apps/knode/icons/crystalsvg/16x16/actions
 @dirrm share/kde/apps/knode/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kmail/icons/crystalsvg/128x128/actions
+@dirrm share/kde/apps/kmail/icons/crystalsvg/128x128
 @dirrm share/kde/apps/knode/icons/crystalsvg
 @dirrm share/kde/apps/knode/icons
 @dirrm share/kde/apps/knode/filters
@@ -1594,6 +2060,8 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/kmail/plugins/bodypartformatter
 @dirrm share/kde/apps/kmail/plugins
 @dirrm share/kde/apps/kmail/pics
+@dirrm share/kde/apps/kmail/icons/crystalsvg/scalable/actions
+@dirrm share/kde/apps/kmail/icons/crystalsvg/scalable
 @dirrm share/kde/apps/kmail/icons/crystalsvg/48x48/actions
 @dirrm share/kde/apps/kmail/icons/crystalsvg/48x48
 @dirrm share/kde/apps/kmail/icons/crystalsvg/32x32/actions
@@ -1621,6 +2089,7 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/kdepimwidgets/pics
 @dirrm share/kde/apps/kdepimwidgets
 @comment in kde: @dirrm share/kde/apps/kconf_update
+@dirrm share/kde/apps/karmpart
 @dirrm share/kde/apps/karm/pics
 @dirrm share/kde/apps/karm
 @dirrm share/kde/apps/kandy
@@ -1731,9 +2200,14 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kitchensync/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kitchensync/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kitchensync
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/mbox/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/mbox/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/mbox
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
@@ -1741,15 +2215,18 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kdgantt/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kdgantt/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kdgantt
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/karm/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/karm/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/karm
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kandy/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kandy/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kandy
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kalarm/kalarmd/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm/kalarmd/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm/kalarmd
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kalarm/lib/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm/lib/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm/lib
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kalarm/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm
@@ -1795,6 +2272,8 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm include/kdepim
 @dirrm include/kaddressbook
 @comment in kde: @dirrm include/kabc
+@dirrm include/index
 @dirrm include/gpgme++/interfaces
 @dirrm include/gpgme++
 @dirrm include/calendar
+@dirrm include/akregator
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 24196d421fe..a59cfb179c1 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.34 2005/10/13 13:12:25 markd Exp $
+$NetBSD: distinfo,v 1.35 2005/12/11 11:40:02 markd Exp $
 
-SHA1 (kdepim-3.4.3.tar.bz2) = 06566beba4a3a7487e716b814796e32ec4206a1a
-RMD160 (kdepim-3.4.3.tar.bz2) = a1c15ae5759b9865297a28e0ee00f66b04fc2a96
-Size (kdepim-3.4.3.tar.bz2) = 11327132 bytes
+SHA1 (kdepim-3.5.0.tar.bz2) = fb98ea719990bf1169289ca5012ad75ac261f488
+RMD160 (kdepim-3.5.0.tar.bz2) = 8a41dedd61f8607520d9bcfe49baadeb2b47d845
+Size (kdepim-3.5.0.tar.bz2) = 12865623 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
+SHA1 (patch-ac) = fe390dca8f1464166e9d515bf3071a5cff0eb793
+SHA1 (patch-ad) = 2d37bf3b0263291be65861ae633839a86558170a
+SHA1 (patch-ae) = 3814c6778417503fa088e689df16d36b2e2d1d2c
+SHA1 (patch-af) = f72f09de9dfe811fd1324906cfb8a0801dce5454
+SHA1 (patch-ag) = 7c3974ddf207367015ffd1ac6ec2ceffa840febf
+SHA1 (patch-ah) = ffe68d07a0d49555b30ccd322c14f646bf2972cd
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
new file mode 100644
index 00000000000..b1176598953
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ac
@@ -0,0 +1,55 @@
+$NetBSD: patch-ac,v 1.9 2005/12/11 11:40:02 markd Exp $
+
+--- kmail/actionscheduler.cpp.orig	2005-09-10 20:24:02.000000000 +1200
++++ kmail/actionscheduler.cpp
+@@ -570,7 +570,7 @@ void ActionScheduler::filterMessage()
+        (!mAccount ||
+ 	(mAccount && (*mFilterIt).applyOnAccount(mAccountId)))) ||
+       ((mSet & KMFilterMgr::Explicit) && (*mFilterIt).applyOnExplicit())) {
+-      
++
+       // filter is applicable
+     if ( FilterLog::instance()->isLogging() ) {
+       QString logText( i18n( "<b>Evaluating filter rules:</b> " ) );
+@@ -646,8 +646,11 @@ void ActionScheduler::moveMessage()
+   if (!orgMsg || !orgMsg->parent()) {
+     // Original message is gone, no point filtering it anymore
+     mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
++    kdDebug(5006) << "The original serial number is missing. "
++                  << "Cannot complete the filtering." << endl;
+     mExecutingLock = false;
+     processMessageTimer->start( 0, true );
++    return;
+   } else {
+     if (!folder) // no filter folder specified leave in current place
+       folder = orgMsg->parent();
+@@ -659,7 +662,7 @@ void ActionScheduler::moveMessage()
+   mSrcFolder->addMsg( msg );
+   mIgnore = false;
+ 
+-  if (msg && kmkernel->folderIsTrash( folder ))
++  if (msg && folder && kmkernel->folderIsTrash( folder ))
+     KMFilterAction::sendMDN( msg, KMime::MDN::Deleted );
+ 
+   timeOutTime = QTime::currentTime();
+@@ -722,8 +725,6 @@ void ActionScheduler::moveMessageFinishe
+ 
+ void ActionScheduler::copyMessageFinished( KMCommand *command )
+ {
+-  // FIXME remove the debug output
+-  kdDebug(5006) << "##### ActionScheduler::copyMessageFinished( KMCommand *command )" << endl;
+   if ( command->result() != KMCommand::OK )
+     actionMessage( KMFilterAction::ErrorButGoOn );
+   else 
+@@ -803,4 +804,11 @@ bool ActionScheduler::isEnabled()
+     return sEnabled;
+ }
+ 
++bool ActionScheduler::ignoreChanges( bool ignore )
++{
++  bool oldValue = mIgnore;
++  mIgnore = ignore;
++  return oldValue;
++}
++
+ #include "actionscheduler.moc"
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
new file mode 100644
index 00000000000..a320d6c8370
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ad
@@ -0,0 +1,34 @@
+$NetBSD: patch-ad,v 1.7 2005/12/11 11:40:02 markd Exp $
+
+--- kmail/actionscheduler.h.orig	2005-09-10 20:24:02.000000000 +1200
++++ kmail/actionscheduler.h
+@@ -77,10 +77,10 @@ public:
+    of messages left to process is empty */
+   void setFilterList( QValueList<KMFilter*> filters );
+ 
+-  /* Set the id of the account associated with this scheduler */
++  /** Set the id of the account associated with this scheduler */
+   void setAccountId( uint id  ) { mAccountId = id; mAccount = true; }
+ 
+-  /* Clear the id of the account associated with this scheduler */
++  /** Clear the id of the account associated with this scheduler */
+   void clearAccountId() { mAccountId = 0; mAccount = false; }
+ 
+   /** Queue a message for filtering */
+@@ -88,9 +88,16 @@ public:
+   void execFilters(const QPtrList<KMMsgBase> msgList);
+   void execFilters(KMMsgBase* msgBase);
+   void execFilters(Q_UINT32 serNum);
++
+   static QString debug();
+   static bool isEnabled();
+ 
++  /** Allow or deny manipulations on the message to be filtered.
++      This is needed when using pipe-through filters, because the
++      changes made by the filter have to be written back.
++      The old value before applying the new value is returned. */
++  bool ignoreChanges( bool ignore );
++
+ signals:
+   /** Emitted when filtering is completed */
+   void result(ReturnCode);
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae
new file mode 100644
index 00000000000..addda33b815
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ae
@@ -0,0 +1,59 @@
+$NetBSD: patch-ae,v 1.7 2005/12/11 11:40:02 markd Exp $
+
+--- kmail/kmcommands.cpp.orig	2005-10-11 04:02:11.000000000 +1300
++++ kmail/kmcommands.cpp
+@@ -1496,30 +1496,30 @@ KMMetaFilterActionCommand::KMMetaFilterA
+ 
+ void KMMetaFilterActionCommand::start()
+ {
+-#if 0 // use action scheduler
+-  KMFilterMgr::FilterSet set = KMFilterMgr::All;
+-  QPtrList<KMFilter> filters;
+-  filters.append( mFilter );
+-  ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
+-  scheduler->setAlwaysMatch( true );
+-  scheduler->setAutoDestruct( true );
+-
+-  int contentX, contentY;
+-  HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
+-  QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
+-  mHeaders->finalizeMove( nextItem, contentX, contentY );
+-
+-
+-  for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
+-    scheduler->execFilters( msg );
+-#else
+-  KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
+-  *mHeaders->selectedMsgs(), mFilter);
+-  filterCommand->start();
+-  int contentX, contentY;
+-  HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
+-  mHeaders->finalizeMove( item, contentX, contentY );
+-#endif
++  if (ActionScheduler::isEnabled() ) {
++    // use action scheduler
++    KMFilterMgr::FilterSet set = KMFilterMgr::All;
++    QValueList<KMFilter*> filters;
++    filters.append( mFilter );
++    ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
++    scheduler->setAlwaysMatch( true );
++    scheduler->setAutoDestruct( true );
++
++    int contentX, contentY;
++    HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
++    QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
++    mHeaders->finalizeMove( nextItem, contentX, contentY );
++
++    for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
++      scheduler->execFilters( msg );
++  } else {
++    KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
++    *mHeaders->selectedMsgs(), mFilter);
++    filterCommand->start();
++    int contentX, contentY;
++    HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
++    mHeaders->finalizeMove( item, contentX, contentY );
++  }
+ }
+ 
+ FolderShortcutCommand::FolderShortcutCommand( KMMainWidget *mainwidget,
diff --git a/misc/kdepim3/patches/patch-af b/misc/kdepim3/patches/patch-af
new file mode 100644
index 00000000000..4845355805c
--- /dev/null
+++ b/misc/kdepim3/patches/patch-af
@@ -0,0 +1,35 @@
+$NetBSD: patch-af,v 1.3 2005/12/11 11:40:02 markd Exp $
+
+--- kmail/kmfilteraction.cpp.orig	2005-09-10 20:24:02.000000000 +1200
++++ kmail/kmfilteraction.cpp
+@@ -1617,6 +1617,9 @@ class PipeJob : public KPIM::ThreadWeave
+       FILE *p;
+       QByteArray ba;
+ 
++      // backup the serial number in case the header gets lost
++      QString origSerNum = mMsg->headerField( "X-KMail-Filtered" );
++
+       p = popen(QFile::encodeName(mCmd), "r");
+       int len =100;
+       char buffer[100];
+@@ -1630,7 +1633,20 @@ class PipeJob : public KPIM::ThreadWeave
+       pclose(p);
+       if ( !ba.isEmpty() ) {
+         KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", QString(ba).latin1() );
++        KMFolder *filterFolder =  mMsg->parent();
++        ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() );
++
+         mMsg->fromByteArray( ba );
++        if ( !origSerNum.isEmpty() )
++          mMsg->setHeaderField( "X-KMail-Filtered", origSerNum );
++        if ( filterFolder && handler ) {
++          bool oldStatus = handler->ignoreChanges( true );
++          filterFolder->take( filterFolder->find( mMsg ) );
++          filterFolder->addMsg( mMsg );
++          handler->ignoreChanges( oldStatus );
++        } else {
++          kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl;
++        }
+       }
+ 
+       KPIM::ThreadWeaver::debug (1, "PipeJob::run: done.\n" );
diff --git a/misc/kdepim3/patches/patch-ag b/misc/kdepim3/patches/patch-ag
new file mode 100644
index 00000000000..0858d5412a0
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.3 2005/12/11 11:40:02 markd Exp $
+
+--- kmail/kmkernel.cpp.orig	2005-11-09 11:33:29.000000000 +1300
++++ kmail/kmkernel.cpp
+@@ -1432,11 +1432,11 @@ void KMKernel::init()
+   the_msgIndex = 0;
+ #endif
+ 
+-#if 0
++//#if 0
+   the_weaver =  new KPIM::ThreadWeaver::Weaver( this );
+   the_weaverLogger = new KPIM::ThreadWeaver::WeaverThreadLogger(this);
+   the_weaverLogger->attach (the_weaver);
+-#endif
++//#endif
+ 
+   connect( the_folderMgr, SIGNAL( folderRemoved(KMFolder*) ),
+            this, SIGNAL( folderRemoved(KMFolder*) ) );
diff --git a/misc/kdepim3/patches/patch-ah b/misc/kdepim3/patches/patch-ah
new file mode 100644
index 00000000000..2bfa6a6db65
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.4 2005/12/11 11:40:02 markd Exp $
+
+--- kmail/kmversion.h.orig	2005-11-09 11:33:29.000000000 +1300
++++ kmail/kmversion.h
+@@ -3,6 +3,6 @@
+ #ifndef kmversion_h
+ #define kmversion_h
+ 
+-#define KMAIL_VERSION "1.9"
++#define KMAIL_VERSION "1.9.1"
+ 
+ #endif /*kmversion_h*/