rev 12742 - in branches/kde4.2/packages/kdepim/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Fri Nov 28 09:15:35 UTC 2008


Author: modax-guest
Date: 2008-11-28 09:15:35 +0000 (Fri, 28 Nov 2008)
New Revision: 12742

Added:
   branches/kde4.2/packages/kdepim/debian/README.source
   branches/kde4.2/packages/kdepim/debian/installgen
   branches/kde4.2/packages/kdepim/debian/kdepim-groupware.install
   branches/kde4.2/packages/kdepim/debian/kitchensync.install
   branches/kde4.2/packages/kdepim/debian/libkabcommon4.install
   branches/kde4.2/packages/kdepim/debian/libkontactinterfaces4.install
   branches/kde4.2/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
Removed:
   branches/kde4.2/packages/kdepim/debian/kdepim-doc.install
   branches/kde4.2/packages/kdepim/debian/kmobiletools.install
   branches/kde4.2/packages/kdepim/debian/korn.install
   branches/kde4.2/packages/kdepim/debian/ktnef.install
   branches/kde4.2/packages/kdepim/debian/patches/01_branch_imap_duplication_fix.diff
   branches/kde4.2/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
Modified:
   branches/kde4.2/packages/kdepim/debian/akonadi-kde.install
   branches/kde4.2/packages/kdepim/debian/akregator.install
   branches/kde4.2/packages/kdepim/debian/changelog
   branches/kde4.2/packages/kdepim/debian/control
   branches/kde4.2/packages/kdepim/debian/kaddressbook.install
   branches/kde4.2/packages/kdepim/debian/kalarm.install
   branches/kde4.2/packages/kdepim/debian/kdepim-kresources.install
   branches/kde4.2/packages/kdepim/debian/kdepim-strigi-plugins.install
   branches/kde4.2/packages/kdepim/debian/kdepim-wizards.install
   branches/kde4.2/packages/kdepim/debian/kjots.install
   branches/kde4.2/packages/kdepim/debian/kleopatra.install
   branches/kde4.2/packages/kdepim/debian/kmail.install
   branches/kde4.2/packages/kdepim/debian/knode.install
   branches/kde4.2/packages/kdepim/debian/knotes.install
   branches/kde4.2/packages/kdepim/debian/kode.install
   branches/kde4.2/packages/kdepim/debian/konsolekalendar.install
   branches/kde4.2/packages/kdepim/debian/kontact.install
   branches/kde4.2/packages/kdepim/debian/korganizer.install
   branches/kde4.2/packages/kdepim/debian/kpilot.install
   branches/kde4.2/packages/kdepim/debian/ktimetracker.install
   branches/kde4.2/packages/kdepim/debian/libkdepim4.install
   branches/kde4.2/packages/kdepim/debian/libkholidays4.install
   branches/kde4.2/packages/kdepim/debian/libkleo4.install
   branches/kde4.2/packages/kdepim/debian/libkpgp4.install
   branches/kde4.2/packages/kdepim/debian/libksieve4.install
   branches/kde4.2/packages/kdepim/debian/libmaildir4.install
   branches/kde4.2/packages/kdepim/debian/libmimelib4.install
   branches/kde4.2/packages/kdepim/debian/patches/series
   branches/kde4.2/packages/kdepim/debian/rules
Log:
kdepim snapshot. package split, saner interdependencies (libs only)

Added: branches/kde4.2/packages/kdepim/debian/README.source
===================================================================
--- branches/kde4.2/packages/kdepim/debian/README.source	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/README.source	2008-11-28 09:15:35 UTC (rev 12742)
@@ -0,0 +1,6 @@
+This package uses quilt for upstream source code patch management. Please read
+/usr/share/doc/quilt/README.source for more information how to apply, unapply,
+add, modify or remove patches.
+
+Please note that /usr/share/doc/quilt/README.source is only available in quilt
+version 0.46-4.1 or later.

Modified: branches/kde4.2/packages/kdepim/debian/akonadi-kde.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/akonadi-kde.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/akonadi-kde.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,3 +1,4 @@
+usr/bin/akonadi_distlist_resource
 usr/bin/akonadi_ical_resource
 usr/bin/akonadi_imaplib_resource
 usr/bin/akonadi_kabc_resource
@@ -8,24 +9,32 @@
 usr/bin/akonadi_mailthreader_agent
 usr/bin/akonadi_nepomuk_contact_feeder
 usr/bin/akonadi_nepomuk_email_feeder
+usr/bin/akonadi_nepomuktag_resource
 usr/bin/akonadi_nntp_resource
 usr/bin/akonadi_strigi_feeder
 usr/bin/akonadi_vcard_resource
+usr/bin/akonadi_vcarddir_resource
+usr/bin/akonadiconsole
 usr/bin/akonaditray
+usr/bin/kres-migrator
 usr/lib/kde4/akonadi_serializer_addressee.so
 usr/lib/kde4/akonadi_serializer_bookmark.so
+usr/lib/kde4/akonadi_serializer_contactgroup.so
 usr/lib/kde4/akonadi_serializer_kcal.so
 usr/lib/kde4/akonadi_serializer_mail.so
-# usr/lib/kde4/akonadi_serializer_sms.so
 usr/lib/kde4/kabc_akonadi.so
 usr/lib/kde4/kcal_akonadi.so
+usr/lib/kde4/kcm_akonadi.so
 usr/lib/kde4/kcm_akonadi_resources.so
-usr/lib/libakonadi-kabc.so.4
-usr/lib/libakonadi-kabc.so.4.1.0
+usr/lib/kde4/kcm_akonadi_server.so
+usr/lib/kde4/kio_akonadi.so
+usr/lib/libakonadi-kabccommon.so.4
+usr/lib/libakonadi-kabccommon.so.4.2.0
 usr/lib/libakonadi-kcal.so.4
-usr/lib/libakonadi-kcal.so.4.1.0
-usr/lib/libimap.so.4                 
-usr/lib/libimap.so.4.1.0
+usr/lib/libakonadi-kcal.so.4.2.0
+usr/lib/libimap.so.4
+usr/lib/libimap.so.4.2.0
+usr/share/akonadi/agents/distlistresource.desktop
 usr/share/akonadi/agents/icalresource.desktop
 usr/share/akonadi/agents/imaplibresource.desktop
 usr/share/akonadi/agents/kabcresource.desktop
@@ -36,21 +45,28 @@
 usr/share/akonadi/agents/mailthreaderagent.desktop
 usr/share/akonadi/agents/nepomukcontactfeeder.desktop
 usr/share/akonadi/agents/nepomukemailfeeder.desktop
+usr/share/akonadi/agents/nepomuktagresource.desktop
 usr/share/akonadi/agents/nntpresource.desktop
 usr/share/akonadi/agents/strigifeeder.desktop
+usr/share/akonadi/agents/vcarddirresource.desktop
 usr/share/akonadi/agents/vcardresource.desktop
+usr/share/applications/kde4/akonadiconsole.desktop
 usr/share/applications/kde4/akonaditray.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
+usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
-# usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_sms.desktop
+usr/share/kde4/apps/akonadiconsole/akonadiconsoleui.rc
 usr/share/kde4/apps/nepomuk/ontologies/nco.desktop
 usr/share/kde4/apps/nepomuk/ontologies/nco.trig
 usr/share/kde4/apps/nepomuk/ontologies/nmo.desktop
 usr/share/kde4/apps/nepomuk/ontologies/nmo.trig
+usr/share/kde4/config/kres-migratorrc
 usr/share/kde4/services/akonadi.protocol
+usr/share/kde4/services/kcm_akonadi.desktop
 usr/share/kde4/services/kcm_akonadi_resources.desktop
+usr/share/kde4/services/kcm_akonadi_server.desktop
 usr/share/kde4/services/kresources/kabc/akonadi.desktop
 usr/share/kde4/services/kresources/kcal/akonadi.desktop
-usr/lib/kde4/kio_akonadi.so
+usr/share/opensync-0.38/defaults/akonadi-sync

Modified: branches/kde4.2/packages/kdepim/debian/akregator.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/akregator.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/akregator.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,12 +1,40 @@
 usr/bin/akregator
-usr/lib/kde4/akregator_*_plugin.so
-usr/lib/kde4/akregator_config_*.so
+usr/lib/kde4/akregator_config_advanced.so
+usr/lib/kde4/akregator_config_appearance.so
+usr/lib/kde4/akregator_config_archive.so
+usr/lib/kde4/akregator_config_browser.so
+usr/lib/kde4/akregator_config_general.so
+usr/lib/kde4/akregator_config_onlinesync.so
+usr/lib/kde4/akregator_mk4storage_plugin.so
+usr/lib/kde4/akregator_onlinesync_plugin.so
 usr/lib/kde4/akregatorpart.so
-usr/lib/libakregatorinterfaces.so.*
-usr/lib/libakregatorprivate.so.*
+usr/lib/kde4/kontact_akregatorplugin.so
+usr/lib/libakregatorinterfaces.so.4
+usr/lib/libakregatorinterfaces.so.4.2.0
+usr/lib/libakregatorprivate.so.4
+usr/lib/libakregatorprivate.so.4.2.0
 usr/share/applications/kde4/akregator.desktop
-usr/share/dbus-1/interfaces/org.kde.akregator.part.xml
+usr/share/doc/kde4/HTML/en/akregator/add-feed.png
+usr/share/doc/kde4/HTML/en/akregator/add-feed2.png
+usr/share/doc/kde4/HTML/en/akregator/add-folder.png
+usr/share/doc/kde4/HTML/en/akregator/add-folder2.png
+usr/share/doc/kde4/HTML/en/akregator/advanced-tab.png
+usr/share/doc/kde4/HTML/en/akregator/appearance-tab.png
+usr/share/doc/kde4/HTML/en/akregator/archive-tab.png
+usr/share/doc/kde4/HTML/en/akregator/browser-tab.png
 usr/share/doc/kde4/HTML/en/akregator/common
+usr/share/doc/kde4/HTML/en/akregator/general-tab.png
+usr/share/doc/kde4/HTML/en/akregator/index.cache.bz2
+usr/share/doc/kde4/HTML/en/akregator/index.docbook
+usr/share/doc/kde4/HTML/en/akregator/konq.png
+usr/share/doc/kde4/HTML/en/akregator/konq2.png
+usr/share/doc/kde4/HTML/en/akregator/main-window.png
+usr/share/doc/kde4/HTML/en/akregator/main-window2.png
+usr/share/doc/kde4/HTML/en/akregator/main-window3.png
+usr/share/doc/kde4/HTML/en/akregator/main-window4.png
+usr/share/doc/kde4/HTML/en/akregator/quick-filter.png
+usr/share/doc/kde4/HTML/en/akregator/rss.png
+usr/share/doc/kde4/HTML/en/akregator/rss3.png
 usr/share/icons/hicolor/128x128/apps/akregator.png
 usr/share/icons/hicolor/16x16/apps/akregator.png
 usr/share/icons/hicolor/16x16/apps/akregator_empty.png
@@ -15,16 +43,28 @@
 usr/share/icons/hicolor/48x48/apps/akregator.png
 usr/share/icons/hicolor/64x64/apps/akregator.png
 usr/share/icons/hicolor/scalable/apps/akregator.svgz
-usr/share/kde4/apps/akregator/*
-usr/share/kde4/apps/akregator/about/*
-usr/share/kde4/apps/akregator/pics/*
+usr/share/kde4/apps/akregator/about/akregator.css
+usr/share/kde4/apps/akregator/about/main.html
+usr/share/kde4/apps/akregator/about/top-left-akregator.png
+usr/share/kde4/apps/akregator/akregator.notifyrc
+usr/share/kde4/apps/akregator/akregator_part.rc
+usr/share/kde4/apps/akregator/akregator_shell.rc
+usr/share/kde4/apps/akregator/articleviewer.rc
+usr/share/kde4/apps/akregator/pageviewer.rc
+usr/share/kde4/apps/akregator/pics/kmmsgnew.png
+usr/share/kde4/apps/akregator/pics/kmmsgunseen.png
+usr/share/kde4/apps/akregator_onlinesync_plugin/akregator_onlinesync_plugin.rc
 usr/share/kde4/apps/kontact/ksettingsdialog/akregator.setdlg
 usr/share/kde4/config.kcfg/akregator.kcfg
-usr/share/kde4/services/akregator_*_plugin.desktop
-usr/share/kde4/services/akregator_config_*.desktop
+usr/share/kde4/services/akregator_config_advanced.desktop
+usr/share/kde4/services/akregator_config_appearance.desktop
+usr/share/kde4/services/akregator_config_archive.desktop
+usr/share/kde4/services/akregator_config_browser.desktop
+usr/share/kde4/services/akregator_config_general.desktop
+usr/share/kde4/services/akregator_config_onlinesync.desktop
+usr/share/kde4/services/akregator_mk4storage_plugin.desktop
+usr/share/kde4/services/akregator_onlinesync_plugin.desktop
 usr/share/kde4/services/akregator_part.desktop
 usr/share/kde4/services/feed.protocol
 usr/share/kde4/services/kontact/akregatorplugin.desktop
 usr/share/kde4/servicetypes/akregator_plugin.desktop
-usr/share/kde4/apps/akregator_onlinesync_plugin/akregator_onlinesync_plugin.rc
-

Modified: branches/kde4.2/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdepim/debian/changelog	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/changelog	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,3 +1,46 @@
+kdepim (4:4.1.80+svn889885-0r1) UNRELEASED; urgency=low
+
+  * New upstream development snapshot.
+  
+  * TODO: akonadi 1.80
+
+  +++ Changes by Modestas Vainius:
+
+  * Resync patches:
+    - 01_branch_imap_duplication_fix.diff - remove, stolen from upstream.
+    - 97_fix_target_link_libraries.diff - regenerate.
+  * Bump KDE build dependencies to 4.1.80 and later.
+  * Add README.source.
+  * Add debian/installgen.
+  * Remove explicit cmake build dependency.
+  * Add new build dependencies:
+    - libopensync1exp6-dev (>= 0.38);
+    - libglib2.0-dev;
+    - libpisock-dev;
+    - libmal has been removed from Debian some time ago.
+  * Binary package changes:
+    - reenable kpilot;
+    - disable korn;
+    - remove ktnef;
+    - libkabcommon4 - a common KDE address book library widely used by other
+      KDE PIM packages. Add strict (=) shlibs for this library;
+    - kdepim-groupwase - bundle all groupware related stuff into this
+      package. Previously, groupware stuff was scattered all over application
+      KDE PIM packages which resulted into complex and wrong interdependencies
+      kdepim-groupware package is self-contained dependency-wise;
+    - libkontactinterfaces4 - split off this kontact interface library to the
+      separate package. This allows to move kontact plugins to appropriate
+      owner packages with them getting dependency on this package instead of 
+      the whole 'kontact'.
+  * As mentioned earlier, move akregator, kmail etc. kontact plugins to the 
+    respective "owner" packages where they really belong.
+  * Make kdepim-wizards stricktly (=) depend on kdepim-groupware.
+  * Improve some package descriptions.
+  * Update install files.
+  * Tweak kontact Recommends/Suggest a bit.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 28 Nov 2008 05:52:50 +0200
+
 kdepim (4:4.1.3-2) experimental; urgency=low
 
   * Add patch to avoid imap duplication. Pushed out to kde-packagers

Modified: branches/kde4.2/packages/kdepim/debian/control
===================================================================
--- branches/kde4.2/packages/kdepim/debian/control	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/control	2008-11-28 09:15:35 UTC (rev 12742)
@@ -4,27 +4,27 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs, debhelper (>= 6), cmake (>= 2.6.0), quilt,
- kdelibs5-dev (>= 4:4.1.3), kdepimlibs5-dev (>= 4:4.1.3),
+Build-Depends: cdbs, debhelper (>= 6), quilt,
+ kdelibs5-dev (>= 4:4.1.80), kdepimlibs5-dev (>= 4:4.1.80+svn888995),
  libphonon-dev (>= 4:4.2.0), 
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
  xsltproc, libgnokii3-dev, libxss-dev, libqca2-dev (>= 2.0.0),
  libassuan-dev,
  libstreams-dev, libstreamanalyzer-dev, libsearchclient-dev,
  libstrigihtmlgui-dev, libstrigiqtdbusclient-dev, zlib1g-dev,
- libakonadi-dev (>= 1.0.0)
+ libakonadi-dev (>= 1.0.0), libopensync1exp6-dev (>= 0.38), libglib2.0-dev,
+ libpisock-dev 
 Standards-Version: 3.8.0
 Homepage: http://pim.kde.org/
 
 Package: kdepim
 Architecture: all
 Depends: akonadi-kde (>= ${source:Version}), akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}),
- kdepim-kresources (>= ${source:Version}), kdepim-wizards (>= ${source:Version}), kitchensync (>= ${source:Version}), kleopatra (>= ${source:Version}),
+ kdepim-kresources (>= ${source:Version}), kdepim-wizards (>= ${source:Version}), kitchensync (>= ${source:Version}),
  kmail (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), kode (>= ${source:Version}),
  konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}),
- ktimetracker (>= ${source:Version}), ktnef (>= ${source:Version}), kdepim-strigi-plugins (>= ${source:Version}), kjots (>= ${source:Version})
-#korn (>= ${source:Version}),
-# kmobiletools (>= ${source:Version}), kpilot (>= ${source:Version})
+ ktimetracker (>= ${source:Version}), kdepim-strigi-plugins (>= ${source:Version}), kjots (>= ${source:Version}),
+ kpilot (>= ${source:Version}), kleopatra (>= ${source:Version}),
 Suggests: kdepim-doc
 Description: Personal Information Management apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libkdepim4 (<< 4:4.1.3)
+Replaces: libkdepim4 (<< 4:4.1.3), kmail (<< 4:4.1.80)
 Homepage: http://pim.kde.org/akonadi/
 Description: akonadi resources for KDE
  This package contains the akonadi resources and connectors for KDE.
@@ -75,6 +75,7 @@
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: kontact (<< 4:4.1.80)
 Homepage: http://akregator.kde.org/
 Description: RSS feed aggregator for KDE
  aKregator is a fast, lightweight, and intuitive feed reader program
@@ -84,11 +85,24 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
+Package: libkabcommon4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kaddressbook (<< 4:4.1.80)
+Description: KDE PIM common addressbook library
+ This package contains common common address book library used by other
+ KDE PIM components.
+ .
+ This package is part of KDE, and a component of the KDE PIM module.
+ See the 'kde' and 'kdepim' packages for more information.
+
 Package: kaddressbook
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: kdepim-kresources
+Replaces: korganizer (<< 4:4.1.80), kontact (<< 4:4.1.80)
 Description: KDE address book
  KAddressBook is the main address book application for KDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
@@ -128,22 +142,39 @@
 Depends: ${shlibs:Depends}
 Recommends: korganizer
 Suggests: knotes
-Description: KDE pim resource plugins
- This package includes several plugins needed to interface with groupware
- servers. It also includes plugins for features such as blogging and
- tracking feature plans.
+Replaces: korganizer (<< 4:4.1.80)
+Description: KDE PIM resource plugins
+ This package adds more resource plugins for KDE PIM applications such as
+ blogging, tracking feature plans etc.
  .
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
+Package: kdepim-groupware
+Section: kde
+Architecture: any
+Recommends: kdepim-wizards
+Replaces: korganizer (<< 4:4.1.80), knotes (<< 4:4.1.80), kaddressbook (<< 4:4.1.80), libkdepim4 (<< 4:4.1.80),
+ kdepim-kresources (<< 4:4.1.80)
+Depends: ${shlibs:Depends}
+Description: KDE PIM Gruopware plugins
+ This package includes several plugins used by KDE PIM components to
+ interface with Groupware servers. Supported Groupware platforms include
+ eGroupware, Kolab 2, Scalix and SLOX (SuSE Linux Openexchange Server),
+ Novell GroupWise and GroupDAV.
+ .
+ This package is part of KDE, and a component of the KDE PIM module.
+ See the 'kde' and 'kdepim' packages for more information.
+
 Package: kdepim-wizards
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, kdepim-groupware (= ${binary:Version})
 Suggests: egroupware
 Description: KDE server configuration wizards
- This package contains KDE-based wizards for configuring eGroupware,
- Kolab, and SUSE Linux Openexchange servers.
+ This package contains KDE-based wizards for configuring KDE PIM applications
+ to access eGroupware, Kolab 2, Scalix and SLOX (SuSE Linux Openexchange
+ Server) and Novell GroupWise groupware servers.
  .
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
@@ -179,7 +210,7 @@
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
-Replaces: kmailcvt (<< 4:3.90.0), akonadi-kde (<< 4:4.1.3)
+Replaces: kmailcvt (<< 4:3.90.0), akonadi-kde (<< 4:4.1.3), kontact (<< 4:4.1.80)
 Provides: imap-client, mail-reader
 Homepage: http://kontact.kde.org/kmail/
 Description: KDE Email client
@@ -190,7 +221,6 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
-# Enabled for 4.2
 # Package: kmobiletools
 # Section: utils
 # Architecture: any
@@ -210,7 +240,7 @@
 Section: news
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdepim-dev (<< 4:3.4.0)
+Replaces: kdepim-dev (<< 4:3.4.0), kontact (<< 4:4.1.80)
 Provides: news-reader
 Homepage: http://kontact.kde.org/knode/
 Description: KDE news reader
@@ -227,6 +257,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: kdepim-kresources
+Replaces: kontact (<< 4:4.1.80)
 Description: KDE sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
@@ -259,13 +290,27 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
+Package: libkontactinterfaces4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Homepage: http://kontact.kde.org/
+Replaces: kontact (<< 4:4.1.80)
+Description: KDE Kontact interface library
+ This package contains the plugin interface library for KDE Kontact. All
+ Kontact plugins link to this library.
+ .
+ This package is part of KDE, and a component of the KDE PIM module.
+ See the 'kde' and 'kdepim' packages for more information.
+
 Package: kontact
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kitchensync, kmail, knode, knotes
-Suggests: akregator, knewsticker, kweather, gnokii
+Recommends: kitchensync, kmail, knotes, akregator, kaddressbook, korganizer
+Suggests: akregator, knewsticker, gnokii, kjots, ktimeticker, knode
 Homepage: http://kontact.kde.org/
+Replaces: korganizer (<< 4:4.1.80), akregator (<< 4:4.1.80)
 Description: KDE pim application
  Kontact is the integrated solution to your personal information management
  needs. It combines KDE applications like KMail, KOrganizer, and
@@ -280,6 +325,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Homepage: http://kontact.kde.org/korganizer/
+Replaces: kaddressbook (<< 4:4.1.80), kontact (<< 4:4.1.80)
 Description: KDE personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
@@ -295,43 +341,42 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
-#Package: korn
-#Section: kde
-#Architecture: any
-#Depends: ${shlibs:Depends}
-#Description: KDE mail checker
-# Korn is a KDE mail checker that can display a small summary in the Kicker
-# tray.  It supports checking mbox, pop3, imap4, and nntp sources.
-# .
-# Once mail is received you can have Korn run a third party program or change
-# the color/icon of the Kicker display.  In addition to this you can have
-# Korn run a program once you click on the docked icon in Kicker.
-# .
-# This package is part of KDE, and a component of the KDE PIM module.
-# See the 'kde' and 'kdepim' packages for more information.
-
-# Enabled for 4.2
-# Package: kpilot
-# Section: utils
+# Package: korn
+# Section: kde
 # Architecture: any
-# Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0
-# Suggests: knotes, korganizer
-# Homepage: http://cvs.codeyard.net/kpilot/
-# Description: KDE Palm Pilot hot-sync tool
-#  KPilot is an application that synchronizes your Palm Pilot or similar device
-#  (like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
-#  software does for Windows.  KPilot can back-up and restore your Palm Pilot
-#  and synchronize the built-in applications with their KDE counterparts.
+# Depends: ${shlibs:Depends}
+# Description: KDE mail checker
+#  Korn is a KDE mail checker that can display a small summary in the Kicker
+#  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
 #  .
+#  Once mail is received you can have Korn run a third party program or change
+#  the color/icon of the Kicker display.  In addition to this you can have
+#  Korn run a program once you click on the docked icon in Kicker.
+#  .
 #  This package is part of KDE, and a component of the KDE PIM module.
 #  See the 'kde' and 'kdepim' packages for more information.
 
+Package: kpilot
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0
+Suggests: knotes, korganizer
+Homepage: http://cvs.codeyard.net/kpilot/
+Description: KDE Palm Pilot hot-sync tool
+ KPilot is an application that synchronizes your Palm Pilot or similar device
+ (like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
+ software does for Windows.  KPilot can back-up and restore your Palm Pilot
+ and synchronize the built-in applications with their KDE counterparts.
+ .
+ This package is part of KDE, and a component of the KDE PIM module.
+ See the 'kde' and 'kdepim' packages for more information.
+
 Package: ktimetracker
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: karm
-Replaces: karm
+Replaces: karm, kontact (<< 4:4.1.80)
 Description: KDE time tracker tool
  KTimetracker is a time tracker for busy people who need to keep track of the amount of
  time they spend on various tasks.
@@ -339,23 +384,11 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
-Package: ktnef
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: KDE TNEF viewer
- The TNEF File Viewer allows you to handle mail attachments using the TNEF
- format. These attachments are usually found in mails coming from Microsoft
- mail servers and embed the mail properties as well as the actual attachments.
- .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
-
-
 Package: libkdepim4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: kmail (<< 4:4.1.80)
 Description: KDE PIM library
  This is the runtime package for programs that use the libkdepim library.
  .
@@ -441,6 +474,7 @@
 Package: kjots
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kontact (<< 4:4.1.80)
 Section: utils
 Description: note-taking utility for KDE 4
  Kjots is a notebook utility that organizes notes using groups of pages.

Added: branches/kde4.2/packages/kdepim/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdepim/debian/installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/installgen	2008-11-28 09:15:35 UTC (rev 12742)
@@ -0,0 +1,119 @@
+[kdepim-dev_virtual]
+# Do not install development stuff
+miss dst:usr/include
+miss dst:cmake/modules/
+miss dst:usr/lib/lib[^/]+\.so$ link:usr/lib/lib[^/]+\.so\.
+miss dst:/dbus-\d+/interfaces/
+
+[libkdepim4]
+# ktimetracker needs the one below. To avoid linking against
+# kdepim-kresources, add it here even if it really does not
+# belong here.
+dst:libkcal_resourceremote
+from:/libkdepim/
+from:^obj-[^/]+/icons/
+
+[libkholidays4]
+from:/libkholidays/
+
+[libkleo4]
+skip dst:/apps/(kmail|knode)/pics/
+from:/libkleo/
+
+[libkpgp4]
+from:/libkpgp/
+
+[libksieve4]
+from:/libksieve/
+
+[libmaildir4]
+from:^obj-[^/]+/maildir/
+
+[libmimelib4]
+from:^obj-[^/]+/mimelib/
+
+[libkabcommon4]
+dst:usr/lib/libkabcommon\.so\.4($|\.)
+stop dst:usr/lib/libkabcommon\.so\.
+
+[libkontactinterfaces4]
+from:/kontactinterfaces/
+
+[akonadi-kde]
+from:/akonadi/
+from:/kresources/akonadi/
+
+[akregator]
+from:/akregator/
+
+[kaddressbook]
+from:/kaddressbook/
+from:/console/kabcclient/
+from:/doc/kabcclient/
+from:/plugins/ktexteditor/
+
+[kalarm]
+from:/kalarm/
+
+[kdepim-groupware]
+dst:usr/lib/libkgroupware
+from:/kresources/lib/
+from:/kresources/(groupware|groupwise|groupdav)/
+from:/kresources/(egroupware|kolab|scalix|slox)/
+
+[kdepim-kresources]
+from:/kresources/
+
+[kdepim-strigi-plugins]
+from:/strigi-analyzer/
+
+[kdepim-wizards]
+from:/wizards/
+
+[kjots]
+from:/kjots/
+
+[kleopatra]
+from:/kleopatra/
+
+[kmail]
+from:/kmail/
+from:/kmailcvt/
+dst:/kmail/
+
+[knode]
+from:/knode/
+dst:/knode/
+# Questionable
+from:/doc/kioslave/news/
+
+[knotes]
+from:/knotes/
+dst:/knotes/
+
+[kode]
+from:/kode/
+dst:/knotes/
+
+[konsolekalendar]
+from:/konsolekalendar/
+
+[korganizer]
+from:/korganizer/
+# These also link against internal korganizer stuff
+from:/kontact/plugins/(planner|specialdates)/
+
+[kpilot]
+from:/kpilot/
+
+[ktimetracker]
+from:/ktimetracker/
+
+[kitchensync]
+from:/kitchensync/
+
+[kontact]
+# Kontact needs to come last so its plugins get picked up
+# by proper owner packages
+from:/kontact/
+from:/ksendemail/

Modified: branches/kde4.2/packages/kdepim/debian/kaddressbook.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kaddressbook.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kaddressbook.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,11 +1,7 @@
 usr/bin/kabc2mutt
 usr/bin/kabcclient
+usr/bin/kabcdistlistupdater
 usr/bin/kaddressbook
-usr/lib/kde4/kabc_groupdav.so
-usr/lib/kde4/kabc_kolab.so
-usr/lib/kde4/kabc_scalix.so
-usr/lib/kde4/kabc_slox.so
-usr/lib/kde4/kabc_xmlrpc.so
 usr/lib/kde4/kaddrbk_bookmark_xxport.so
 usr/lib/kde4/kaddrbk_cardview.so
 usr/lib/kde4/kaddrbk_cryptosettings.so
@@ -26,32 +22,35 @@
 usr/lib/kde4/kcm_kabconfig.so
 usr/lib/kde4/kcm_kabcustomfields.so
 usr/lib/kde4/kcm_kabldapconfig.so
+usr/lib/kde4/kontact_kaddressbookplugin.so
 usr/lib/kde4/ktexteditorkabcbridge.so
 usr/lib/kde4/ldifvcardthumbnail.so
-usr/lib/libkabc_groupdav.so.4
-usr/lib/libkabc_groupdav.so.4.1.0
-usr/lib/libkabc_slox.so.4
-usr/lib/libkabc_slox.so.4.1.0
-usr/lib/libkabc_xmlrpc.so.4
-usr/lib/libkabc_xmlrpc.so.4.1.0
-usr/lib/libkabckolab.so.4
-usr/lib/libkabckolab.so.4.1.0
-usr/lib/libkabcommon.so.4
-usr/lib/libkabcommon.so.4.1.0
-usr/lib/libkabcscalix.so.4
-usr/lib/libkabcscalix.so.4.1.0
 usr/lib/libkabinterfaces.so.4
-usr/lib/libkabinterfaces.so.4.1.0
-usr/lib/libkaddressbookprivate.so
+usr/lib/libkabinterfaces.so.4.2.0
 usr/lib/libkaddressbookprivate.so.4
-usr/lib/libkaddressbookprivate.so.4.1.0
+usr/lib/libkaddressbookprivate.so.4.2.0
 usr/share/applications/kde4/kaddressbook.desktop
-usr/share/dbus-1/interfaces/org.kde.KAddressbook.Core.xml
+usr/share/autostart/kabcdistlistupdater.desktop
+usr/share/doc/kde4/HTML/en/kabcclient/common
+usr/share/doc/kde4/HTML/en/kabcclient/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kabcclient/index.docbook
+usr/share/doc/kde4/HTML/en/kaddressbook/addhost.png
 usr/share/doc/kde4/HTML/en/kaddressbook/common
+usr/share/doc/kde4/HTML/en/kaddressbook/conf.png
+usr/share/doc/kde4/HTML/en/kaddressbook/contactdlg.png
+usr/share/doc/kde4/HTML/en/kaddressbook/edit_instant_messenging.png
+usr/share/doc/kde4/HTML/en/kaddressbook/exportdlg.png
+usr/share/doc/kde4/HTML/en/kaddressbook/extension.png
+usr/share/doc/kde4/HTML/en/kaddressbook/filtereditdlg.png
+usr/share/doc/kde4/HTML/en/kaddressbook/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kaddressbook/index.docbook
+usr/share/doc/kde4/HTML/en/kaddressbook/mainwin.png
+usr/share/doc/kde4/HTML/en/kaddressbook/resourcedlg.png
+usr/share/doc/kde4/HTML/en/kaddressbook/resourcesdlg.png
+usr/share/doc/kde4/HTML/en/kaddressbook/vieweditdlg.png
 usr/share/icons/hicolor/128x128/apps/kaddressbook.png
 usr/share/icons/hicolor/16x16/apps/kaddressbook.png
 usr/share/icons/hicolor/22x22/apps/kaddressbook.png
-usr/share/icons/hicolor/22x22/apps/korganizer.png
 usr/share/icons/hicolor/32x32/apps/kaddressbook.png
 usr/share/icons/hicolor/48x48/apps/kaddressbook.png
 usr/share/icons/hicolor/64x64/apps/kaddressbook.png
@@ -119,17 +118,13 @@
 usr/share/kde4/services/kaddressbook/tableview.desktop
 usr/share/kde4/services/kaddressbook/vcard_xxport.desktop
 usr/share/kde4/services/kaddressbook/yahooprotocol.desktop
+usr/share/kde4/services/kaddressbookpart.desktop
 usr/share/kde4/services/kontact/kaddressbookplugin.desktop
-usr/share/kde4/services/kresources/kabc/kabc_groupdav.desktop
-usr/share/kde4/services/kresources/kabc/kabc_opengroupware.desktop
-usr/share/kde4/services/kresources/kabc/kabc_ox.desktop
-usr/share/kde4/services/kresources/kabc/kabc_slox.desktop
-usr/share/kde4/services/kresources/kabc/kabc_xmlrpc.desktop
-usr/share/kde4/services/kresources/kabc/kolab.desktop
-usr/share/kde4/services/kresources/kabc/scalix.desktop
 usr/share/kde4/services/ldifvcardthumbnail.desktop
+usr/share/kde4/servicetypes/dbusaddressbook.desktop
 usr/share/kde4/servicetypes/kaddressbook_contacteditorwidget.desktop
 usr/share/kde4/servicetypes/kaddressbook_extension.desktop
 usr/share/kde4/servicetypes/kaddressbook_view.desktop
 usr/share/kde4/servicetypes/kaddressbook_xxport.desktop
 usr/share/kde4/servicetypes/kaddressbookimprotocol.desktop
+usr/share/man/man1/kabcclient.1

Modified: branches/kde4.2/packages/kdepim/debian/kalarm.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kalarm.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kalarm.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -4,11 +4,17 @@
 usr/lib/kde4/kalarm_localdir.so
 usr/lib/kde4/kalarm_remote.so
 usr/lib/libkalarm_resources.so.4
-usr/lib/libkalarm_resources.so.4.1.0
+usr/lib/libkalarm_resources.so.4.2.0
 usr/share/applications/kde4/kalarm.desktop
 usr/share/autostart/kalarm.autostart.desktop
-usr/share/dbus-1/interfaces/org.kde.kalarm.kalarm.xml
+usr/share/doc/kde4/HTML/en/kalarm/alarmmessage.png
 usr/share/doc/kde4/HTML/en/kalarm/common
+usr/share/doc/kde4/HTML/en/kalarm/editwindow-simple.png
+usr/share/doc/kde4/HTML/en/kalarm/editwindow.png
+usr/share/doc/kde4/HTML/en/kalarm/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kalarm/index.docbook
+usr/share/doc/kde4/HTML/en/kalarm/mainwindow.png
+usr/share/doc/kde4/HTML/en/kalarm/spinbox.png
 usr/share/icons/hicolor/16x16/apps/kalarm.png
 usr/share/icons/hicolor/22x22/apps/kalarm.png
 usr/share/icons/hicolor/32x32/apps/kalarm.png

Deleted: branches/kde4.2/packages/kdepim/debian/kdepim-doc.install

Added: branches/kde4.2/packages/kdepim/debian/kdepim-groupware.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kdepim-groupware.install	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/kdepim-groupware.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -0,0 +1,81 @@
+usr/bin/scalixadmin
+usr/lib/kde4/kabc_groupdav.so
+usr/lib/kde4/kabc_groupwise.so
+usr/lib/kde4/kabc_kolab.so
+usr/lib/kde4/kabc_scalix.so
+usr/lib/kde4/kabc_slox.so
+usr/lib/kde4/kabc_xmlrpc.so
+usr/lib/kde4/kcal_groupdav.so
+usr/lib/kde4/kcal_groupwise.so
+usr/lib/kde4/kcal_kolab.so
+usr/lib/kde4/kcal_scalix.so
+usr/lib/kde4/kcal_slox.so
+usr/lib/kde4/kcal_xmlrpc.so
+usr/lib/kde4/kio_groupwise.so
+usr/lib/kde4/kio_scalix.so
+usr/lib/kde4/knotes_kolab.so
+usr/lib/kde4/knotes_scalix.so
+usr/lib/kde4/knotes_xmlrpc.so
+usr/lib/libgwsoap.so.4
+usr/lib/libgwsoap.so.4.2.0
+usr/lib/libkabc_groupdav.so.4
+usr/lib/libkabc_groupdav.so.4.2.0
+usr/lib/libkabc_slox.so.4
+usr/lib/libkabc_slox.so.4.2.0
+usr/lib/libkabc_xmlrpc.so.4
+usr/lib/libkabc_xmlrpc.so.4.2.0
+usr/lib/libkabcgroupwise.so.4
+usr/lib/libkabcgroupwise.so.4.2.0
+usr/lib/libkabckolab.so.4
+usr/lib/libkabckolab.so.4.2.0
+usr/lib/libkabcscalix.so.4
+usr/lib/libkabcscalix.so.4.2.0
+usr/lib/libkcal_groupdav.so.4
+usr/lib/libkcal_groupdav.so.4.2.0
+usr/lib/libkcal_slox.so.4
+usr/lib/libkcal_slox.so.4.2.0
+usr/lib/libkcal_xmlrpc.so.4
+usr/lib/libkcal_xmlrpc.so.4.2.0
+usr/lib/libkcalgroupwise.so.4
+usr/lib/libkcalgroupwise.so.4.2.0
+usr/lib/libkcalkolab.so.4
+usr/lib/libkcalkolab.so.4.2.0
+usr/lib/libkcalscalix.so.4
+usr/lib/libkcalscalix.so.4.2.0
+usr/lib/libkgroupwarebase.so.4
+usr/lib/libkgroupwarebase.so.4.2.0
+usr/lib/libkgroupwaredav.so.4
+usr/lib/libkgroupwaredav.so.4.2.0
+usr/lib/libknotes_xmlrpc.so.4
+usr/lib/libknotes_xmlrpc.so.4.2.0
+usr/lib/libknoteskolab.so.4
+usr/lib/libknoteskolab.so.4.2.0
+usr/lib/libknotesscalix.so.4
+usr/lib/libknotesscalix.so.4.2.0
+usr/lib/libkslox.so.4
+usr/lib/libkslox.so.4.2.0
+usr/share/kde4/apps/kconf_update/kolab-resource.upd
+usr/share/kde4/apps/kconf_update/upgrade-resourcetype.pl
+usr/share/kde4/services/groupwise.protocol
+usr/share/kde4/services/groupwises.protocol
+usr/share/kde4/services/kresources/kabc/kabc_groupdav.desktop
+usr/share/kde4/services/kresources/kabc/kabc_groupwise.desktop
+usr/share/kde4/services/kresources/kabc/kabc_opengroupware.desktop
+usr/share/kde4/services/kresources/kabc/kabc_ox.desktop
+usr/share/kde4/services/kresources/kabc/kabc_slox.desktop
+usr/share/kde4/services/kresources/kabc/kabc_xmlrpc.desktop
+usr/share/kde4/services/kresources/kabc/kolab.desktop
+usr/share/kde4/services/kresources/kabc/scalix.desktop
+usr/share/kde4/services/kresources/kcal/kcal_groupdav.desktop
+usr/share/kde4/services/kresources/kcal/kcal_groupwise.desktop
+usr/share/kde4/services/kresources/kcal/kcal_opengroupware.desktop
+usr/share/kde4/services/kresources/kcal/kcal_ox.desktop
+usr/share/kde4/services/kresources/kcal/kcal_slox.desktop
+usr/share/kde4/services/kresources/kcal/kcal_xmlrpc.desktop
+usr/share/kde4/services/kresources/kcal/kolab.desktop
+usr/share/kde4/services/kresources/kcal/scalix.desktop
+usr/share/kde4/services/kresources/knotes/knotes_xmlrpc.desktop
+usr/share/kde4/services/kresources/knotes/kolabresource.desktop
+usr/share/kde4/services/kresources/knotes/scalix.desktop
+usr/share/kde4/services/scalix.protocol
+usr/share/kde4/services/scalixs.protocol

Modified: branches/kde4.2/packages/kdepim/debian/kdepim-kresources.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kdepim-kresources.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kdepim-kresources.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,7 +1,12 @@
-usr/bin/scalixadmin
-usr/lib/libkgroupwarebase.so.4
-usr/lib/libkgroupwarebase.so.4.1.0
-usr/lib/libkgroupwaredav.so.4
-usr/lib/libkgroupwaredav.so.4.1.0
-usr/lib/libkslox.so.4
-usr/lib/libkslox.so.4.1.0
+usr/lib/kde4/kcal_blog.so
+usr/lib/kde4/kcal_kabc.so
+usr/lib/kde4/kcal_remote.so
+usr/lib/kde4/kcal_resourcefeatureplan_plugin.so
+usr/lib/libkcal_resourceblog.so.4
+usr/lib/libkcal_resourceblog.so.4.2.0
+usr/lib/libkcal_resourcefeatureplan.so.4
+usr/lib/libkcal_resourcefeatureplan.so.4.2.0
+usr/share/kde4/services/kresources/kcal/blog.desktop
+usr/share/kde4/services/kresources/kcal/kabc.desktop
+usr/share/kde4/services/kresources/kcal/kcal_resourcefeatureplan.desktop
+usr/share/kde4/services/kresources/kcal/remote.desktop

Modified: branches/kde4.2/packages/kdepim/debian/kdepim-strigi-plugins.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kdepim-strigi-plugins.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kdepim-strigi-plugins.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,3 +1,2 @@
 usr/lib/strigi/strigiea_ics.so
-usr/lib/strigi/strigiea_rfc822.so
 usr/lib/strigi/strigiea_vcf.so

Modified: branches/kde4.2/packages/kdepim/debian/kdepim-wizards.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kdepim-wizards.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kdepim-wizards.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,4 +1,6 @@
 usr/bin/egroupwarewizard
+usr/bin/groupwarewizard
+usr/bin/groupwisewizard
 usr/bin/kolabwizard
 usr/bin/scalixwizard
 usr/bin/sloxwizard

Added: branches/kde4.2/packages/kdepim/debian/kitchensync.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kitchensync.install	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/kitchensync.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -0,0 +1,20 @@
+usr/bin/kitchensync
+usr/lib/kde4/kitchensyncpart.so
+usr/lib/libkitchensyncprivate.so.4
+usr/lib/libkitchensyncprivate.so.4.2.0
+usr/lib/libqopensync.so.4
+usr/lib/libqopensync.so.4.2.0
+usr/share/applications/kde4/kitchensync.desktop
+usr/share/icons/hicolor/16x16/actions/sync-start.png
+usr/share/icons/hicolor/16x16/apps/kitchensync.png
+usr/share/icons/hicolor/22x22/actions/sync-start.png
+usr/share/icons/hicolor/22x22/apps/kitchensync.png
+usr/share/icons/hicolor/32x32/actions/sync-start.png
+usr/share/icons/hicolor/32x32/apps/kitchensync.png
+usr/share/icons/hicolor/48x48/actions/sync-start.png
+usr/share/icons/hicolor/48x48/apps/kitchensync.png
+usr/share/kde4/apps/kitchensync/about/kitchensync.css
+usr/share/kde4/apps/kitchensync/about/main.html
+usr/share/kde4/apps/kitchensync/about/top-right-kitchensync.png
+usr/share/kde4/apps/kitchensync/kitchensync_part.rc
+usr/share/kde4/apps/kitchensync/kitchensyncui.rc

Modified: branches/kde4.2/packages/kdepim/debian/kjots.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kjots.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kjots.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,25 +1,25 @@
 usr/bin/kjots
 usr/lib/kde4/kjotspart.so
+usr/lib/kde4/kontact_kjotsplugin.so
 usr/share/applications/kde4/Kjots.desktop
 usr/share/doc/kde4/HTML/en/kjots/common
 usr/share/doc/kde4/HTML/en/kjots/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kjots/index.docbook
+usr/share/icons/hicolor/128x128/apps/kjots.png
 usr/share/icons/hicolor/16x16/apps/kjots.png
 usr/share/icons/hicolor/22x22/apps/kjots.png
 usr/share/icons/hicolor/32x32/apps/kjots.png
 usr/share/icons/hicolor/48x48/apps/kjots.png
 usr/share/icons/hicolor/64x64/apps/kjots.png
+usr/share/icons/hicolor/scalable/apps/kjots.svgz
+usr/share/icons/oxygen/16x16/actions/edit-delete-page.png
+usr/share/icons/oxygen/22x22/actions/edit-delete-page.png
+usr/share/icons/oxygen/32x32/actions/edit-delete-page.png
+usr/share/icons/oxygen/48x48/actions/edit-delete-page.png
+usr/share/icons/oxygen/scalable/actions/edit-delete-page.svgz
 usr/share/kde4/apps/kjots/kjotspartui.rc
 usr/share/kde4/apps/kjots/kjotsui.rc
 usr/share/kde4/apps/kontact/ksettingsdialog/kjots.setdlg
 usr/share/kde4/config.kcfg/kjots.kcfg
+usr/share/kde4/services/kjotspart.desktop
 usr/share/kde4/services/kontact/kjots_plugin.desktop
-usr/share/kde4/services/kjotspart.desktop
-usr/share/icons/oxygen/16x16/actions/edit-delete-page.png
-usr/share/icons/oxygen/22x22/actions/edit-delete-page.png
-usr/share/icons/oxygen/32x32/actions/edit-delete-page.png
-usr/share/icons/oxygen/48x48/actions/edit-delete-page.png
-usr/share/icons/oxygen/scalable/actions/edit-delete-page.svgz
-usr/share/icons/hicolor/128x128/apps/kjots.png
-usr/share/icons/hicolor/scalable/apps/kjots.svgz
-

Modified: branches/kde4.2/packages/kdepim/debian/kleopatra.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kleopatra.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kleopatra.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -2,8 +2,8 @@
 usr/bin/kleopatra
 usr/bin/kwatchgnupg
 usr/lib/kde4/kcm_kleopatra.so
-usr/lib/libkleopatraclientcore.so.0.2.0
-usr/lib/libkleopatraclientgui.so.0.2.0
+usr/lib/libkleopatraclientcore.so.0.2.1
+usr/lib/libkleopatraclientgui.so.0.2.1
 usr/share/applications/kde4/kleopatra_import.desktop
 usr/share/doc/kde4/HTML/en/kleopatra/common
 usr/share/doc/kde4/HTML/en/kleopatra/index.cache.bz2
@@ -23,12 +23,6 @@
 usr/share/kde4/apps/kwatchgnupg/kwatchgnupgui.rc
 usr/share/kde4/apps/kwatchgnupg/pics/kwatchgnupg.png
 usr/share/kde4/apps/kwatchgnupg/pics/kwatchgnupg2.png
-usr/share/kde4/apps/libkleopatra/pics/chiasmus_chi.png
-usr/share/kde4/apps/libkleopatra/pics/key.png
-usr/share/kde4/apps/libkleopatra/pics/key_bad.png
-usr/share/kde4/apps/libkleopatra/pics/key_ok.png
-usr/share/kde4/apps/libkleopatra/pics/key_unknown.png
-usr/share/kde4/config/libkleopatrarc
 usr/share/kde4/services/kleopatra_config_appear.desktop
 usr/share/kde4/services/kleopatra_config_dirserv.desktop
 usr/share/kde4/services/kleopatra_config_dnorder.desktop

Modified: branches/kde4.2/packages/kdepim/debian/kmail.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kmail.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kmail.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,5 +1,3 @@
-usr/share/kde4/config/kmail.antispamrc
-usr/share/kde4/config/kmail.antivirusrc
 usr/bin/kmail
 usr/bin/kmail_antivir.sh
 usr/bin/kmail_clamav.sh
@@ -13,14 +11,22 @@
 usr/lib/kde4/kmail_bodypartformatter_text_vcard.so
 usr/lib/kde4/kmail_bodypartformatter_text_xdiff.so
 usr/lib/kde4/kmailpart.so
+usr/lib/kde4/kontact_kmailplugin.so
 usr/lib/libkmailprivate.so.4
-usr/lib/libkmailprivate.so.4.1.0
+usr/lib/libkmailprivate.so.4.2.0
 usr/share/applications/kde4/KMail.desktop
 usr/share/applications/kde4/kmail_view.desktop
-usr/share/dbus-1/interfaces/org.kde.kmail.kmail.xml
-usr/share/dbus-1/interfaces/org.kde.kmail.kmailpart.xml
-usr/share/dbus-1/interfaces/org.kde.kmail.mailcomposer.xml
 usr/share/doc/kde4/HTML/en/kmail/common
+usr/share/doc/kde4/HTML/en/kmail/configure.docbook
+usr/share/doc/kde4/HTML/en/kmail/credits-and-licenses.docbook
+usr/share/doc/kde4/HTML/en/kmail/faq.docbook
+usr/share/doc/kde4/HTML/en/kmail/getting-started.docbook
+usr/share/doc/kde4/HTML/en/kmail/importing.docbook
+usr/share/doc/kde4/HTML/en/kmail/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kmail/index.docbook
+usr/share/doc/kde4/HTML/en/kmail/intro.docbook
+usr/share/doc/kde4/HTML/en/kmail/menus.docbook
+usr/share/doc/kde4/HTML/en/kmail/using-kmail.docbook
 usr/share/icons/hicolor/128x128/apps/kmail.png
 usr/share/icons/hicolor/16x16/apps/kmail.png
 usr/share/icons/hicolor/22x22/apps/kmail.png
@@ -30,26 +36,31 @@
 usr/share/icons/hicolor/scalable/apps/kmail.svgz
 usr/share/icons/oxygen/16x16/actions/mail-forwarded-replied.png
 usr/share/icons/oxygen/16x16/actions/mail-forwarded.png
+usr/share/icons/oxygen/16x16/actions/mail-reply-custom.png
+usr/share/icons/oxygen/16x16/actions/mail-signed-fully.png
 usr/share/icons/oxygen/16x16/actions/mail-signed-part.png
-usr/share/icons/oxygen/16x16/actions/mail-signed-verified.png
 usr/share/icons/oxygen/16x16/actions/mail-signed.png
 usr/share/icons/oxygen/16x16/apps/kmailcvt.png
 usr/share/icons/oxygen/16x16/status/mail-sent.png
+usr/share/icons/oxygen/16x16/status/mail-tagged.png
 usr/share/icons/oxygen/16x16/status/mail-task.png
+usr/share/icons/oxygen/22x22/actions/mail-reply-custom.png
+usr/share/icons/oxygen/22x22/status/mail-tagged.png
 usr/share/icons/oxygen/22x22/status/mail-task.png
+usr/share/icons/oxygen/32x32/actions/mail-reply-custom.png
 usr/share/icons/oxygen/32x32/apps/kmailcvt.png
+usr/share/icons/oxygen/32x32/status/mail-tagged.png
+usr/share/icons/oxygen/48x48/actions/mail-reply-custom.png
 usr/share/icons/oxygen/48x48/apps/kmailcvt.png
+usr/share/icons/oxygen/48x48/status/mail-tagged.png
 usr/share/icons/oxygen/scalable/actions/mail-forwarded-replied.svgz
 usr/share/icons/oxygen/scalable/actions/mail-forwarded.svgz
+usr/share/icons/oxygen/scalable/actions/mail-reply-custom.svgz
+usr/share/icons/oxygen/scalable/actions/mail-signed-fully.svgz
 usr/share/icons/oxygen/scalable/actions/mail-signed-part.svgz
-usr/share/icons/oxygen/scalable/actions/mail-signed-verified.svgz
 usr/share/icons/oxygen/scalable/actions/mail-signed.svgz
+usr/share/icons/oxygen/scalable/status/mail-tagged.svgz
 usr/share/icons/oxygen/scalable/status/mail-task.svgz
-usr/share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
-usr/share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
-usr/share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
-usr/share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
-usr/share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
 usr/share/kde4/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
 usr/share/kde4/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
 usr/share/kde4/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
@@ -78,7 +89,39 @@
 usr/share/kde4/apps/kmail/kmcomposerui.rc
 usr/share/kde4/apps/kmail/kmmainwin.rc
 usr/share/kde4/apps/kmail/kmreadermainwin.rc
-usr/share/kde4/apps/kmail/pics/*
+usr/share/kde4/apps/kmail/pics/attachmentQuicklistClosed.png
+usr/share/kde4/apps/kmail/pics/attachmentQuicklistOpened.png
+usr/share/kde4/apps/kmail/pics/enterprise_bottom.png
+usr/share/kde4/apps/kmail/pics/enterprise_bottom_left.png
+usr/share/kde4/apps/kmail/pics/enterprise_bottom_right.png
+usr/share/kde4/apps/kmail/pics/enterprise_icon.png
+usr/share/kde4/apps/kmail/pics/enterprise_left.png
+usr/share/kde4/apps/kmail/pics/enterprise_right.png
+usr/share/kde4/apps/kmail/pics/enterprise_s_left.png
+usr/share/kde4/apps/kmail/pics/enterprise_s_right.png
+usr/share/kde4/apps/kmail/pics/enterprise_sbar.png
+usr/share/kde4/apps/kmail/pics/enterprise_sp_right.png
+usr/share/kde4/apps/kmail/pics/enterprise_sw.png
+usr/share/kde4/apps/kmail/pics/enterprise_top.png
+usr/share/kde4/apps/kmail/pics/enterprise_top_left.png
+usr/share/kde4/apps/kmail/pics/enterprise_top_right.png
+usr/share/kde4/apps/kmail/pics/enterprise_w.png
+usr/share/kde4/apps/kmail/pics/kmwizard.png
+usr/share/kde4/apps/kmail/pics/mail-deleted.png
+usr/share/kde4/apps/kmail/pics/mail-encrypted-full.png
+usr/share/kde4/apps/kmail/pics/mail-encrypted-part.png
+usr/share/kde4/apps/kmail/pics/mail-encrypted.png
+usr/share/kde4/apps/kmail/pics/mail-horizontal-space.png
+usr/share/kde4/apps/kmail/pics/mail-thread-ignored.png
+usr/share/kde4/apps/kmail/pics/mail-thread-watch.png
+usr/share/kde4/apps/kmail/pics/mail-vertical-separator-line.png
+usr/share/kde4/apps/kmail/pics/overlay-busy-clock-1.png
+usr/share/kde4/apps/kmail/pics/overlay-busy-clock-2.png
+usr/share/kde4/apps/kmail/pics/overlay-busy-clock-3.png
+usr/share/kde4/apps/kmail/pics/overlay-busy-clock-4.png
+usr/share/kde4/apps/kmail/pics/pgp-keys.png
+usr/share/kde4/apps/kmail/pics/quotecollapse.png
+usr/share/kde4/apps/kmail/pics/quoteexpand.png
 usr/share/kde4/apps/kmail/plugins/bodypartformatter/application_octetstream.desktop
 usr/share/kde4/apps/kmail/plugins/bodypartformatter/text_calendar.desktop
 usr/share/kde4/apps/kmail/plugins/bodypartformatter/text_vcard.desktop
@@ -96,6 +139,8 @@
 usr/share/kde4/config.kcfg/kmail.kcfg
 usr/share/kde4/config.kcfg/replyphrases.kcfg
 usr/share/kde4/config.kcfg/templatesconfiguration_kfg.kcfg
+usr/share/kde4/config/kmail.antispamrc
+usr/share/kde4/config/kmail.antivirusrc
 usr/share/kde4/services/kcmkmailsummary.desktop
 usr/share/kde4/services/kmail_config_accounts.desktop
 usr/share/kde4/services/kmail_config_appearance.desktop
@@ -106,16 +151,3 @@
 usr/share/kde4/services/kontact/kmailplugin.desktop
 usr/share/kde4/servicetypes/dbusimap.desktop
 usr/share/kde4/servicetypes/dbusmail.desktop
-usr/share/icons/oxygen/16x16/actions/mail-reply-custom.png
-usr/share/icons/oxygen/16x16/status/mail-tagged.png
-usr/share/icons/oxygen/22x22/actions/mail-reply-custom.png
-usr/share/icons/oxygen/22x22/status/mail-tagged.png
-usr/share/icons/oxygen/32x32/actions/mail-reply-custom.png
-usr/share/icons/oxygen/32x32/status/mail-tagged.png
-usr/share/icons/oxygen/48x48/actions/mail-reply-custom.png
-usr/share/icons/oxygen/48x48/status/mail-tagged.png
-usr/share/icons/oxygen/scalable/actions/mail-reply-custom.svgz
-usr/share/icons/oxygen/scalable/status/mail-tagged.svgz
-usr/bin/akonadiconsole
-usr/share/applications/kde4/akonadiconsole.desktop
-usr/share/kde4/apps/akonadiconsole/akonadiconsoleui.rc

Deleted: branches/kde4.2/packages/kdepim/debian/kmobiletools.install

Modified: branches/kde4.2/packages/kdepim/debian/knode.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/knode.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/knode.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,11 +1,56 @@
 usr/bin/knode
 usr/lib/kde4/kcm_knode.so
 usr/lib/kde4/knodepart.so
+usr/lib/kde4/kontact_knodeplugin.so
 usr/lib/libknodecommon.so.4
-usr/lib/libknodecommon.so.4.1.0
+usr/lib/libknodecommon.so.4.2.0
 usr/share/applications/kde4/KNode.desktop
-usr/share/dbus-1/interfaces/org.kde.knode.xml
+usr/share/doc/kde4/HTML/en/kioslave/news/common
+usr/share/doc/kde4/HTML/en/kioslave/news/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kioslave/news/index.docbook
+usr/share/doc/kde4/HTML/en/knode/commands.docbook
 usr/share/doc/kde4/HTML/en/knode/common
+usr/share/doc/kde4/HTML/en/knode/credits.docbook
+usr/share/doc/kde4/HTML/en/knode/eyes.png
+usr/share/doc/kde4/HTML/en/knode/faq.docbook
+usr/share/doc/kde4/HTML/en/knode/gloss.docbook
+usr/share/doc/kde4/HTML/en/knode/greyball.png
+usr/share/doc/kde4/HTML/en/knode/greyballchk.png
+usr/share/doc/kde4/HTML/en/knode/index.cache.bz2
+usr/share/doc/kde4/HTML/en/knode/index.docbook
+usr/share/doc/kde4/HTML/en/knode/install.docbook
+usr/share/doc/kde4/HTML/en/knode/introduction.docbook
+usr/share/doc/kde4/HTML/en/knode/journey.docbook
+usr/share/doc/kde4/HTML/en/knode/knode-cleanup.png
+usr/share/doc/kde4/HTML/en/knode/knode-colors-fonts.png
+usr/share/doc/kde4/HTML/en/knode/knode-composer-attachments.png
+usr/share/doc/kde4/HTML/en/knode/knode-composer-settings.png
+usr/share/doc/kde4/HTML/en/knode/knode-edit-filter.png
+usr/share/doc/kde4/HTML/en/knode/knode-edit-header1.png
+usr/share/doc/kde4/HTML/en/knode/knode-edit-header2.png
+usr/share/doc/kde4/HTML/en/knode/knode-filters.png
+usr/share/doc/kde4/HTML/en/knode/knode-followup.png
+usr/share/doc/kde4/HTML/en/knode/knode-header-settings.png
+usr/share/doc/kde4/HTML/en/knode/knode-identity.png
+usr/share/doc/kde4/HTML/en/knode/knode-mail-account.png
+usr/share/doc/kde4/HTML/en/knode/knode-new-article.png
+usr/share/doc/kde4/HTML/en/knode/knode-news-account.png
+usr/share/doc/kde4/HTML/en/knode/knode-post-settings.png
+usr/share/doc/kde4/HTML/en/knode/knode-read-news-appearance-dialog.png
+usr/share/doc/kde4/HTML/en/knode/knode-read-news-settings.png
+usr/share/doc/kde4/HTML/en/knode/knode-reply.png
+usr/share/doc/kde4/HTML/en/knode/knode-rule-editor.png
+usr/share/doc/kde4/HTML/en/knode/knode-search.png
+usr/share/doc/kde4/HTML/en/knode/knode-start.png
+usr/share/doc/kde4/HTML/en/knode/knode-subscribe.png
+usr/share/doc/kde4/HTML/en/knode/knode-views.png
+usr/share/doc/kde4/HTML/en/knode/more.docbook
+usr/share/doc/kde4/HTML/en/knode/newsubs.png
+usr/share/doc/kde4/HTML/en/knode/redball.png
+usr/share/doc/kde4/HTML/en/knode/redballchk.png
+usr/share/doc/kde4/HTML/en/knode/using-firststart.docbook
+usr/share/doc/kde4/HTML/en/knode/using-morefeatures.docbook
+usr/share/doc/kde4/HTML/en/knode/using-subscribing.docbook
 usr/share/icons/hicolor/128x128/apps/knode.png
 usr/share/icons/hicolor/128x128/apps/knode2.png
 usr/share/icons/hicolor/16x16/apps/knode.png
@@ -37,10 +82,6 @@
 usr/share/kde4/apps/knode/pics/group.png
 usr/share/kde4/apps/knode/pics/group_big.png
 usr/share/kde4/apps/knode/pics/ignore.png
-usr/share/kde4/apps/knode/pics/key.png
-usr/share/kde4/apps/knode/pics/key_bad.png
-usr/share/kde4/apps/knode/pics/key_ok.png
-usr/share/kde4/apps/knode/pics/key_unknown.png
 usr/share/kde4/apps/knode/pics/mail.png
 usr/share/kde4/apps/knode/pics/newsubs.png
 usr/share/kde4/apps/knode/pics/pgp-keys.png

Modified: branches/kde4.2/packages/kdepim/debian/knotes.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/knotes.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/knotes.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,17 +1,10 @@
 usr/bin/knotes
-usr/lib/kde4/knotes_kolab.so
 usr/lib/kde4/knotes_local.so
-usr/lib/kde4/knotes_scalix.so
-usr/lib/kde4/knotes_xmlrpc.so
-usr/lib/libknotes_xmlrpc.so.4
-usr/lib/libknotes_xmlrpc.so.4.1.0
-usr/lib/libknoteskolab.so.4
-usr/lib/libknoteskolab.so.4.1.0
-usr/lib/libknotesscalix.so.4
-usr/lib/libknotesscalix.so.4.1.0
+usr/lib/kde4/kontact_knotesplugin.so
 usr/share/applications/kde4/knotes.desktop
-usr/share/dbus-1/interfaces/org.kde.KNotes.xml
 usr/share/doc/kde4/HTML/en/knotes/common
+usr/share/doc/kde4/HTML/en/knotes/index.cache.bz2
+usr/share/doc/kde4/HTML/en/knotes/index.docbook
 usr/share/icons/hicolor/128x128/apps/knotes.png
 usr/share/icons/hicolor/16x16/apps/knotes.png
 usr/share/icons/hicolor/22x22/apps/knotes.png
@@ -29,8 +22,5 @@
 usr/share/kde4/config.kcfg/knoteconfig.kcfg
 usr/share/kde4/config.kcfg/knotesglobalconfig.kcfg
 usr/share/kde4/services/kontact/knotesplugin.desktop
-usr/share/kde4/services/kresources/knotes/knotes_xmlrpc.desktop
-usr/share/kde4/services/kresources/knotes/kolabresource.desktop
 usr/share/kde4/services/kresources/knotes/local.desktop
-usr/share/kde4/services/kresources/knotes/scalix.desktop
 usr/share/kde4/services/kresources/knotes_manager.desktop

Modified: branches/kde4.2/packages/kdepim/debian/kode.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kode.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kode.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -5,23 +5,19 @@
 usr/bin/kxml_compiler
 usr/bin/schematest
 usr/lib/libkode.so.4
-usr/lib/libkode.so.4.1.0
+usr/lib/libkode.so.4.2.0
 usr/lib/libkschema.so.4
-usr/lib/libkschema.so.4.1.0
+usr/lib/libkschema.so.4.2.0
 usr/lib/libkschemawidgets.so.4
-usr/lib/libkschemawidgets.so.4.1.0
+usr/lib/libkschemawidgets.so.4.2.0
 usr/lib/libkxmlcommon.so.4
-usr/lib/libkxmlcommon.so.4.1.0
+usr/lib/libkxmlcommon.so.4.2.0
 usr/lib/libschema.so.4
-usr/lib/libschema.so.4.1.0
+usr/lib/libschema.so.4.2.0
 usr/lib/libwscl.so.4
-usr/lib/libwscl.so.4.1.0
+usr/lib/libwscl.so.4.2.0
 usr/lib/libwsdl.so.4
-usr/lib/libwsdl.so.4.1.0
+usr/lib/libwsdl.so.4.2.0
 usr/share/applications/kde4/kwsdl_compiler.desktop
 usr/share/kde4/apps/kxforms/kxformsui.rc
 usr/share/kde4/config.kcfg/kxforms.kcfg
-usr/share/doc/kde4/HTML/en/kwsdl_compiler/common
-usr/share/doc/kde4/HTML/en/kwsdl_compiler/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kwsdl_compiler/index.docbook
-

Modified: branches/kde4.2/packages/kdepim/debian/konsolekalendar.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/konsolekalendar.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/konsolekalendar.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,3 +1,5 @@
 usr/bin/konsolekalendar
 usr/share/applications/kde4/konsolekalendar.desktop
 usr/share/doc/kde4/HTML/en/konsolekalendar/common
+usr/share/doc/kde4/HTML/en/konsolekalendar/index.cache.bz2
+usr/share/doc/kde4/HTML/en/konsolekalendar/index.docbook

Modified: branches/kde4.2/packages/kdepim/debian/kontact.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kontact.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kontact.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,15 +1,40 @@
 usr/bin/kontact
-usr/lib/kde4/kcm_apptsummary.so
+usr/bin/ksendemail
 usr/lib/kde4/kcm_kontact.so
 usr/lib/kde4/kcm_kontactsummary.so
-usr/lib/kde4/kcm_sdsummary.so
-usr/lib/kde4/kcm_todosummary.so
-usr/lib/kde4/kontact_*plugin.so
-usr/lib/libkontactinterfaces.so.*
-usr/lib/libkontactprivate.so.*
+usr/lib/kde4/kontact_summaryplugin.so
+usr/lib/libkontactprivate.so.4
+usr/lib/libkontactprivate.so.4.2.0
 usr/share/applications/kde4/Kontact.desktop
-usr/share/dbus-1/interfaces/org.kde.kontact.KNotes.xml
+usr/share/doc/kde4/HTML/en/kontact/calendar-sidebar-icon.png
 usr/share/doc/kde4/HTML/en/kontact/common
+usr/share/doc/kde4/HTML/en/kontact/configuration-components.png
+usr/share/doc/kde4/HTML/en/kontact/configuration-main.png
+usr/share/doc/kde4/HTML/en/kontact/configuration-select-components.png
+usr/share/doc/kde4/HTML/en/kontact/configuration-starting-component.png
+usr/share/doc/kde4/HTML/en/kontact/configuration-summary-view-kpilot.png
+usr/share/doc/kde4/HTML/en/kontact/configuration-summary-view.png
+usr/share/doc/kde4/HTML/en/kontact/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kontact/index.docbook
+usr/share/doc/kde4/HTML/en/kontact/kaddressbook-sidebar-icon.png
+usr/share/doc/kde4/HTML/en/kontact/main-view.png
+usr/share/doc/kde4/HTML/en/kontact/menu-bar-kmail.png
+usr/share/doc/kde4/HTML/en/kontact/menu-bar-korganizer.png
+usr/share/doc/kde4/HTML/en/kontact/menu-bar-summary.png
+usr/share/doc/kde4/HTML/en/kontact/new-menu.png
+usr/share/doc/kde4/HTML/en/kontact/settings-menu-kmail.png
+usr/share/doc/kde4/HTML/en/kontact/side-pane.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-calendar.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-contacts.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-kpilot.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-mail.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-newsticker.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-notes.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-repositioning.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-todos.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view-weather.png
+usr/share/doc/kde4/HTML/en/kontact/summary-view.png
+usr/share/doc/kde4/HTML/en/kontact/todo-list-sidebar-icon.png
 usr/share/icons/hicolor/128x128/apps/kontact.png
 usr/share/icons/hicolor/16x16/apps/kontact.png
 usr/share/icons/hicolor/22x22/apps/kontact.png
@@ -20,15 +45,9 @@
 usr/share/kde4/apps/kontact/about/main.html
 usr/share/kde4/apps/kontact/about/top-left-kontact.png
 usr/share/kde4/apps/kontact/kontactui.rc
-usr/share/kde4/apps/kontact/ksettingsdialog/specialdates.setdlg
 usr/share/kde4/apps/kontact/ksettingsdialog/summary.setdlg
 usr/share/kde4/apps/kontactsummary/kontactsummary_part.rc
 usr/share/kde4/config.kcfg/kontact.kcfg
-usr/share/kde4/services/kcmapptsummary.desktop
 usr/share/kde4/services/kcmkontactsummary.desktop
-usr/share/kde4/services/kcmsdsummary.desktop
-usr/share/kde4/services/kcmtodosummary.desktop
-usr/share/kde4/services/kontact/specialdatesplugin.desktop
 usr/share/kde4/services/kontact/summaryplugin.desktop
 usr/share/kde4/services/kontactconfig.desktop
-usr/share/kde4/servicetypes/kontactplugin.desktop

Modified: branches/kde4.2/packages/kdepim/debian/korganizer.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/korganizer.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/korganizer.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,18 +1,17 @@
-usr/share/kde4/config/korganizer.knsrc
 usr/bin/ical2vcal
 usr/bin/korgac
 usr/bin/korganizer
 usr/bin/thememain
-usr/lib/kde4/kcal_blog.so
-usr/lib/kde4/kcal_groupdav.so
-usr/lib/kde4/kcal_kabc.so
-usr/lib/kde4/kcal_kolab.so
-usr/lib/kde4/kcal_remote.so
-usr/lib/kde4/kcal_resourcefeatureplan_plugin.so
-usr/lib/kde4/kcal_scalix.so
-usr/lib/kde4/kcal_slox.so
-usr/lib/kde4/kcal_xmlrpc.so
+usr/lib/kde4/kcm_apptsummary.so
 usr/lib/kde4/kcm_korganizer.so
+usr/lib/kde4/kcm_planner.so
+usr/lib/kde4/kcm_sdsummary.so
+usr/lib/kde4/kcm_todosummary.so
+usr/lib/kde4/kontact_journalplugin.so
+usr/lib/kde4/kontact_korganizerplugin.so
+usr/lib/kde4/kontact_plannerplugin.so
+usr/lib/kde4/kontact_specialdatesplugin.so
+usr/lib/kde4/kontact_todoplugin.so
 usr/lib/kde4/korg_datenums.so
 usr/lib/kde4/korg_hebrew.so
 usr/lib/kde4/korg_journalprint.so
@@ -20,41 +19,76 @@
 usr/lib/kde4/korg_thisdayinhistory.so
 usr/lib/kde4/korg_yearprint.so
 usr/lib/kde4/korganizerpart.so
-usr/lib/libkcal_groupdav.so.4
-usr/lib/libkcal_groupdav.so.4.1.0
-usr/lib/libkcal_resourceblog.so.4
-usr/lib/libkcal_resourceblog.so.4.1.0
-usr/lib/libkcal_resourcefeatureplan.so.4
-usr/lib/libkcal_resourcefeatureplan.so.4.1.0
-usr/lib/libkcal_slox.so.4
-usr/lib/libkcal_slox.so.4.1.0
-usr/lib/libkcal_xmlrpc.so.4
-usr/lib/libkcal_xmlrpc.so.4.1.0
-usr/lib/libkcalkolab.so.4
-usr/lib/libkcalkolab.so.4.1.0
-usr/lib/libkcalscalix.so.4
-usr/lib/libkcalscalix.so.4.1.0
 usr/lib/libkocorehelper.so.4
-usr/lib/libkocorehelper.so.4.1.0
+usr/lib/libkocorehelper.so.4.2.0
 usr/lib/libkorg_stdprinting.so.4
-usr/lib/libkorg_stdprinting.so.4.1.0
+usr/lib/libkorg_stdprinting.so.4.2.0
 usr/lib/libkorganizer_calendar.so.4
-usr/lib/libkorganizer_calendar.so.4.1.0
+usr/lib/libkorganizer_calendar.so.4.2.0
 usr/lib/libkorganizer_eventviewer.so.4
-usr/lib/libkorganizer_eventviewer.so.4.1.0
+usr/lib/libkorganizer_eventviewer.so.4.2.0
 usr/lib/libkorganizer_interfaces.so.4
-usr/lib/libkorganizer_interfaces.so.4.1.0
+usr/lib/libkorganizer_interfaces.so.4.2.0
 usr/lib/libkorganizerprivate.so.4
-usr/lib/libkorganizerprivate.so.4.1.0
+usr/lib/libkorganizerprivate.so.4.2.0
 usr/share/applications/kde4/korganizer-import.desktop
 usr/share/applications/kde4/korganizer.desktop
 usr/share/autostart/korgac.desktop
-usr/share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml
-usr/share/dbus-1/interfaces/org.kde.korganizer.KOrgac.xml
-usr/share/dbus-1/interfaces/org.kde.korganizer.Korganizer.xml
 usr/share/doc/kde4/HTML/en/korganizer/common
+usr/share/doc/kde4/HTML/en/korganizer/event-attachments.png
+usr/share/doc/kde4/HTML/en/korganizer/event-attendees.png
+usr/share/doc/kde4/HTML/en/korganizer/event-freebusy.png
+usr/share/doc/kde4/HTML/en/korganizer/event-general.png
+usr/share/doc/kde4/HTML/en/korganizer/event-recurrence.png
+usr/share/doc/kde4/HTML/en/korganizer/groupevent.png
+usr/share/doc/kde4/HTML/en/korganizer/i_actions_newevent.png
+usr/share/doc/kde4/HTML/en/korganizer/i_actions_newtodo.png
+usr/share/doc/kde4/HTML/en/korganizer/i_copy.png
+usr/share/doc/kde4/HTML/en/korganizer/i_cut.png
+usr/share/doc/kde4/HTML/en/korganizer/i_edit_delete.png
+usr/share/doc/kde4/HTML/en/korganizer/i_edit_find.png
+usr/share/doc/kde4/HTML/en/korganizer/i_edit_redo.png
+usr/share/doc/kde4/HTML/en/korganizer/i_edit_undo.png
+usr/share/doc/kde4/HTML/en/korganizer/i_file_close.png
+usr/share/doc/kde4/HTML/en/korganizer/i_file_new.png
+usr/share/doc/kde4/HTML/en/korganizer/i_file_open.png
+usr/share/doc/kde4/HTML/en/korganizer/i_file_print.png
+usr/share/doc/kde4/HTML/en/korganizer/i_file_quit.png
+usr/share/doc/kde4/HTML/en/korganizer/i_file_revert.png
+usr/share/doc/kde4/HTML/en/korganizer/i_file_save.png
+usr/share/doc/kde4/HTML/en/korganizer/i_file_saveas.png
+usr/share/doc/kde4/HTML/en/korganizer/i_go_backward.png
+usr/share/doc/kde4/HTML/en/korganizer/i_go_forward.png
+usr/share/doc/kde4/HTML/en/korganizer/i_go_to_today.png
+usr/share/doc/kde4/HTML/en/korganizer/i_paste.png
+usr/share/doc/kde4/HTML/en/korganizer/i_settings_prefs.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_day.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_journal.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_list.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_month.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_todo_list.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_week.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_whatsnext.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_work_week.png
+usr/share/doc/kde4/HTML/en/korganizer/i_view_xdays.png
+usr/share/doc/kde4/HTML/en/korganizer/index.cache.bz2
+usr/share/doc/kde4/HTML/en/korganizer/index.docbook
+usr/share/doc/kde4/HTML/en/korganizer/korganizer-resource.png
+usr/share/doc/kde4/HTML/en/korganizer/o2v_importing1.png
+usr/share/doc/kde4/HTML/en/korganizer/o2v_importing2.png
+usr/share/doc/kde4/HTML/en/korganizer/o2v_importing3.png
+usr/share/doc/kde4/HTML/en/korganizer/o2v_main.png
+usr/share/doc/kde4/HTML/en/korganizer/o2v_progress.png
+usr/share/doc/kde4/HTML/en/korganizer/o2v_save.png
+usr/share/doc/kde4/HTML/en/korganizer/o2v_warning.png
+usr/share/doc/kde4/HTML/en/korganizer/organizer.png
+usr/share/doc/kde4/HTML/en/korganizer/outlook-to-vcalendar.docbook
+usr/share/doc/kde4/HTML/en/korganizer/plugins-chapter.docbook
+usr/share/doc/kde4/HTML/en/korganizer/remotefile-resource.png
+usr/share/doc/kde4/HTML/en/korganizer/todo-general.png
 usr/share/icons/hicolor/128x128/apps/korganizer.png
 usr/share/icons/hicolor/16x16/apps/korganizer.png
+usr/share/icons/hicolor/22x22/apps/korganizer.png
 usr/share/icons/hicolor/32x32/apps/korganizer.png
 usr/share/icons/hicolor/48x48/apps/korganizer.png
 usr/share/icons/hicolor/64x64/apps/korganizer.png
@@ -64,6 +98,8 @@
 usr/share/icons/oxygen/22x22/actions/checkmark.png
 usr/share/kde4/apps/kconf_update/korganizer.upd
 usr/share/kde4/apps/kontact/ksettingsdialog/korganizer.setdlg
+usr/share/kde4/apps/kontact/ksettingsdialog/planner.setdlg
+usr/share/kde4/apps/kontact/ksettingsdialog/specialdates.setdlg
 usr/share/kde4/apps/korgac/icons/oxygen/22x22/actions/korgac.png
 usr/share/kde4/apps/korganizer/korganizer_part.rc
 usr/share/kde4/apps/korganizer/korganizerui.rc
@@ -74,8 +110,15 @@
 usr/share/kde4/apps/korganizer/sounds/spinout.wav
 usr/share/kde4/apps/korganizer/tips
 usr/share/kde4/config.kcfg/korganizer.kcfg
+usr/share/kde4/config/korganizer.knsrc
+usr/share/kde4/services/kcmapptsummary.desktop
+usr/share/kde4/services/kcmplanner.desktop
+usr/share/kde4/services/kcmsdsummary.desktop
+usr/share/kde4/services/kcmtodosummary.desktop
 usr/share/kde4/services/kontact/journalplugin.desktop
 usr/share/kde4/services/kontact/korganizerplugin.desktop
+usr/share/kde4/services/kontact/plannerplugin.desktop
+usr/share/kde4/services/kontact/specialdatesplugin.desktop
 usr/share/kde4/services/kontact/todoplugin.desktop
 usr/share/kde4/services/korganizer/datenums.desktop
 usr/share/kde4/services/korganizer/hebrew.desktop
@@ -91,21 +134,9 @@
 usr/share/kde4/services/korganizer_configplugins.desktop
 usr/share/kde4/services/korganizer_configtime.desktop
 usr/share/kde4/services/korganizer_configviews.desktop
-usr/share/kde4/services/kresources/kcal/blog.desktop
-usr/share/kde4/services/kresources/kcal/kabc.desktop
-usr/share/kde4/services/kresources/kcal/kcal_groupdav.desktop
-usr/share/kde4/services/kresources/kcal/kcal_opengroupware.desktop
-usr/share/kde4/services/kresources/kcal/kcal_ox.desktop
-usr/share/kde4/services/kresources/kcal/kcal_resourcefeatureplan.desktop
-usr/share/kde4/services/kresources/kcal/kcal_slox.desktop
-usr/share/kde4/services/kresources/kcal/kcal_xmlrpc.desktop
-usr/share/kde4/services/kresources/kcal/kolab.desktop
-usr/share/kde4/services/kresources/kcal/remote.desktop
-usr/share/kde4/services/kresources/kcal/scalix.desktop
 usr/share/kde4/services/webcal.protocol
 usr/share/kde4/servicetypes/calendardecoration.desktop
 usr/share/kde4/servicetypes/calendarplugin.desktop
-usr/share/kde4/servicetypes/dbusaddressbook.desktop
 usr/share/kde4/servicetypes/dbuscalendar.desktop
 usr/share/kde4/servicetypes/korganizerpart.desktop
 usr/share/kde4/servicetypes/korgprintplugin.desktop

Deleted: branches/kde4.2/packages/kdepim/debian/korn.install

Modified: branches/kde4.2/packages/kdepim/debian/kpilot.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kpilot.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/kpilot.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,20 +1,17 @@
 usr/bin/kpilot
 usr/bin/kpilotDaemon
 usr/lib/kde4/kcm_kpilot.so
-usr/lib/kde4/kpilot_conduit_keyring.so
+usr/lib/kde4/kpilot_conduit_calendar2.so
+usr/lib/kde4/kpilot_conduit_contacts.so
 usr/lib/kde4/kpilot_conduit_memofile.so
-usr/lib/kde4/kpilot_conduit_notepad.so
-usr/lib/kde4/kpilot_conduit_null.so
-usr/lib/kde4/kpilot_conduit_popmail.so
 usr/lib/kde4/kpilot_conduit_time.so
-usr/lib/kde4/kpilot_conduit_todo.so
-usr/lib/kde4/kpilot_conduit_vcal.so
+usr/lib/kde4/kpilot_conduit_todo2.so
 usr/lib/libkpilot.so.4
-usr/lib/libkpilot.so.4.1.0
+usr/lib/libkpilot.so.4.2.0
+usr/lib/libkpilot_akonadibase.so
 usr/lib/libkpilot_conduit_base.so
 usr/share/applications/kde4/kpilot.desktop
 usr/share/applications/kde4/kpilotdaemon.desktop
-usr/share/doc/kde4/HTML/en/kpilot/common
 usr/share/icons/hicolor/16x16/actions/kpilot_backup.png
 usr/share/icons/hicolor/16x16/actions/kpilot_busysync.png
 usr/share/icons/hicolor/16x16/actions/kpilot_fullsync.png
@@ -56,16 +53,17 @@
 usr/share/icons/hicolor/64x64/actions/kpilot_todo.png
 usr/share/kde4/apps/kconf_update/kpilot.upd
 usr/share/kde4/apps/kpilot/kpilotui.rc
+usr/share/kde4/config.kcfg/calendarsettings.kcfg
+usr/share/kde4/config.kcfg/contactssettings.kcfg
 usr/share/kde4/config.kcfg/kpilot.kcfg
 usr/share/kde4/config.kcfg/kpilotlib.kcfg
-usr/share/kde4/config.kcfg/popmail.kcfg
-usr/share/kde4/services/kpilot-conduit-keyring.desktop
+usr/share/kde4/config.kcfg/memofileconduit.kcfg
+usr/share/kde4/config.kcfg/timeconduit.kcfg
+usr/share/kde4/config.kcfg/todosettings.kcfg
+usr/share/kde4/services/kpilot-conduit-calendar.desktop
+usr/share/kde4/services/kpilot-conduit-contacts.desktop
+usr/share/kde4/services/kpilot-conduit-todo.desktop
 usr/share/kde4/services/kpilot_config.desktop
 usr/share/kde4/services/memofile-conduit.desktop
-usr/share/kde4/services/notepad-conduit.desktop
-usr/share/kde4/services/null-conduit.desktop
-usr/share/kde4/services/popmail-conduit.desktop
 usr/share/kde4/services/time_conduit.desktop
-usr/share/kde4/services/todo-conduit.desktop
-usr/share/kde4/services/vcal-conduit.desktop
 usr/share/kde4/servicetypes/kpilotconduit.desktop

Modified: branches/kde4.2/packages/kdepim/debian/ktimetracker.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/ktimetracker.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/ktimetracker.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,17 +1,25 @@
 usr/bin/karm
 usr/bin/ktimetracker
-usr/lib/kde4/karmpart.so
 usr/lib/kde4/kcm_ktimetrackerconfig.so
-usr/share/applications/kde4/karm.desktop
-usr/share/dbus-1/interfaces/org.kde.ktimetracker.ktimetracker.xml
+usr/lib/kde4/kontact_ktimetrackerplugin.so
+usr/lib/kde4/ktimetrackerpart.so
+usr/share/applications/kde4/ktimetracker.desktop
+usr/share/doc/kde4/HTML/en/ktimetracker/clipboard-history.png
 usr/share/doc/kde4/HTML/en/ktimetracker/common
+usr/share/doc/kde4/HTML/en/ktimetracker/copy-this-task.png
+usr/share/doc/kde4/HTML/en/ktimetracker/csvexport.png
+usr/share/doc/kde4/HTML/en/ktimetracker/daterange.png
+usr/share/doc/kde4/HTML/en/ktimetracker/idle-detect.png
+usr/share/doc/kde4/HTML/en/ktimetracker/index.cache.bz2
+usr/share/doc/kde4/HTML/en/ktimetracker/index.docbook
+usr/share/doc/kde4/HTML/en/ktimetracker/karm.png
+usr/share/doc/kde4/HTML/en/ktimetracker/systray.png
 usr/share/icons/hicolor/128x128/apps/ktimetracker.png
 usr/share/icons/hicolor/16x16/apps/ktimetracker.png
 usr/share/icons/hicolor/22x22/apps/ktimetracker.png
 usr/share/icons/hicolor/32x32/apps/ktimetracker.png
 usr/share/icons/hicolor/48x48/apps/ktimetracker.png
 usr/share/icons/hicolor/64x64/apps/ktimetracker.png
-usr/share/kde4/apps/karmpart/karmui.rc
 usr/share/kde4/apps/kontact/ksettingsdialog/ktimetracker.setdlg
 usr/share/kde4/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
 usr/share/kde4/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
@@ -20,7 +28,7 @@
 usr/share/kde4/apps/ktimetracker/icons/oxygen/48x48/actions/subtask-new-ktimetracker.png
 usr/share/kde4/apps/ktimetracker/icons/oxygen/64x64/actions/subtask-new-ktimetracker.png
 usr/share/kde4/apps/ktimetracker/icons/oxygen/scalable/actions/subtask-new-ktimetracker.svgz
-usr/share/kde4/apps/ktimetracker/karmui.rc
+usr/share/kde4/apps/ktimetracker/ktimetrackerui.rc
 usr/share/kde4/apps/ktimetracker/pics/active-icon-0.xpm
 usr/share/kde4/apps/ktimetracker/pics/active-icon-1.xpm
 usr/share/kde4/apps/ktimetracker/pics/active-icon-2.xpm
@@ -43,6 +51,6 @@
 usr/share/kde4/apps/ktimetracker/pics/watch-5.xpm
 usr/share/kde4/apps/ktimetracker/pics/watch-6.xpm
 usr/share/kde4/apps/ktimetracker/pics/watch-7.xpm
-usr/share/kde4/services/karm_part.desktop
 usr/share/kde4/services/kontact/ktimetracker_plugin.desktop
 usr/share/kde4/services/ktimetrackerconfig.desktop
+usr/share/kde4/services/ktimetrackerpart.desktop

Deleted: branches/kde4.2/packages/kdepim/debian/ktnef.install

Added: branches/kde4.2/packages/kdepim/debian/libkabcommon4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libkabcommon4.install	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/libkabcommon4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -0,0 +1,2 @@
+usr/lib/libkabcommon.so.4
+usr/lib/libkabcommon.so.4.2.0

Modified: branches/kde4.2/packages/kdepim/debian/libkdepim4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libkdepim4.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/libkdepim4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,41 +1,42 @@
-usr/lib/kde4/kio_scalix.so
 usr/lib/kde4/kpartsdesignerplugin.so
+usr/lib/kde4/plugins/designer/kdepimwidgets.so
 usr/lib/libkcal_resourceremote.so.4
-usr/lib/libkcal_resourceremote.so.4.1.0
+usr/lib/libkcal_resourceremote.so.4.2.0
 usr/lib/libkdepim.so.4
-usr/lib/libkdepim.so.4.1.0
-usr/share/dbus-1/interfaces/org.kde.addressbook.service.xml
-usr/share/dbus-1/interfaces/org.kde.mailtransport.service.xml
-usr/share/icons/oxygen/16x16/actions/meeting-attending-tentative.png                                                             
-usr/share/icons/oxygen/16x16/actions/meeting-attending.png                                                                       
-usr/share/icons/oxygen/16x16/status/appointment-recurring.png                                                                    
-usr/share/icons/oxygen/16x16/status/appointment-reminder.png                                                                     
-usr/share/icons/oxygen/16x16/status/meeting-organizer.png                                                                        
-usr/share/icons/oxygen/16x16/status/task-complete.png                                                                            
-usr/share/icons/oxygen/16x16/status/task-recurring.png                                                                           
-usr/share/icons/oxygen/16x16/status/task-reminder.png                                                                            
+usr/lib/libkdepim.so.4.2.0
+usr/share/icons/oxygen/16x16/actions/meeting-attending-tentative.png
+usr/share/icons/oxygen/16x16/actions/meeting-attending.png
+usr/share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
+usr/share/icons/oxygen/16x16/status/appointment-recurring.png
+usr/share/icons/oxygen/16x16/status/appointment-reminder.png
+usr/share/icons/oxygen/16x16/status/meeting-organizer.png
+usr/share/icons/oxygen/16x16/status/task-complete.png
+usr/share/icons/oxygen/16x16/status/task-recurring.png
+usr/share/icons/oxygen/16x16/status/task-reminder.png
 usr/share/icons/oxygen/22x22/actions/button_fewer.png
 usr/share/icons/oxygen/22x22/actions/button_more.png
-usr/share/icons/oxygen/22x22/actions/meeting-attending-tentative.png                                                             
-usr/share/icons/oxygen/22x22/actions/meeting-attending.png                                                                       
-usr/share/icons/oxygen/22x22/status/appointment-recurring.png                                                                    
-usr/share/icons/oxygen/22x22/status/appointment-reminder.png                                                                     
-usr/share/icons/oxygen/22x22/status/meeting-organizer.png                                                                        
-usr/share/icons/oxygen/22x22/status/task-complete.png                                                                            
-usr/share/icons/oxygen/22x22/status/task-recurring.png                                                                           
-usr/share/icons/oxygen/22x22/status/task-reminder.png                                                                            
-usr/share/icons/oxygen/32x32/actions/journal-new.png                                                                             
-usr/share/icons/oxygen/32x32/actions/meeting-attending-tentative.png                                                             
-usr/share/icons/oxygen/32x32/actions/meeting-attending.png                                                                       
-usr/share/icons/oxygen/32x32/actions/task-new.png                                                                                
-usr/share/icons/oxygen/32x32/status/appointment-recurring.png                                                                    
-usr/share/icons/oxygen/32x32/status/appointment-reminder.png                                                                     
-usr/share/icons/oxygen/32x32/status/meeting-organizer.png                                                                        
-usr/share/icons/oxygen/32x32/status/task-complete.png                                                                            
-usr/share/icons/oxygen/32x32/status/task-recurring.png                                                                           
+usr/share/icons/oxygen/22x22/actions/meeting-attending-tentative.png
+usr/share/icons/oxygen/22x22/actions/meeting-attending.png
+usr/share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
+usr/share/icons/oxygen/22x22/status/appointment-recurring.png
+usr/share/icons/oxygen/22x22/status/appointment-reminder.png
+usr/share/icons/oxygen/22x22/status/meeting-organizer.png
+usr/share/icons/oxygen/22x22/status/task-complete.png
+usr/share/icons/oxygen/22x22/status/task-recurring.png
+usr/share/icons/oxygen/22x22/status/task-reminder.png
+usr/share/icons/oxygen/32x32/actions/journal-new.png
+usr/share/icons/oxygen/32x32/actions/meeting-attending-tentative.png
+usr/share/icons/oxygen/32x32/actions/meeting-attending.png
+usr/share/icons/oxygen/32x32/actions/task-new.png
+usr/share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
+usr/share/icons/oxygen/32x32/status/appointment-recurring.png
+usr/share/icons/oxygen/32x32/status/appointment-reminder.png
+usr/share/icons/oxygen/32x32/status/meeting-organizer.png
+usr/share/icons/oxygen/32x32/status/task-complete.png
+usr/share/icons/oxygen/32x32/status/task-recurring.png
 usr/share/icons/oxygen/32x32/status/task-reminder.png
-usr/share/kde4/apps/kconf_update/kolab-resource.upd
-usr/share/kde4/apps/kconf_update/upgrade-resourcetype.pl
+usr/share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
+usr/share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
 usr/share/kde4/apps/kdepimwidgets/pics/addresseelineedit.png
 usr/share/kde4/apps/kdepimwidgets/pics/clicklineedit.png
 usr/share/kde4/apps/kdepimwidgets/pics/kdateedit.png
@@ -63,5 +64,3 @@
 usr/share/kde4/apps/libkdepim/about/kde_infopage_rtl.css
 usr/share/kde4/apps/libkdepim/about/top-left.png
 usr/share/kde4/apps/libkdepim/about/top-middle.png
-usr/share/kde4/services/scalix.protocol
-usr/share/kde4/services/scalixs.protocol

Modified: branches/kde4.2/packages/kdepim/debian/libkholidays4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libkholidays4.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/libkholidays4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,5 +1,5 @@
 usr/lib/libkholidays.so.4
-usr/lib/libkholidays.so.4.1.0
+usr/lib/libkholidays.so.4.2.0
 usr/share/kde4/apps/libkholidays/holiday_BelgiumDutch
 usr/share/kde4/apps/libkholidays/holiday_BelgiumFrench
 usr/share/kde4/apps/libkholidays/holiday_BelgiumWalloon

Modified: branches/kde4.2/packages/kdepim/debian/libkleo4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libkleo4.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/libkleo4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,2 +1,8 @@
 usr/lib/libkleo.so.4
-usr/lib/libkleo.so.4.1.0
+usr/lib/libkleo.so.4.2.0
+usr/share/kde4/apps/libkleopatra/pics/chiasmus_chi.png
+usr/share/kde4/apps/libkleopatra/pics/key.png
+usr/share/kde4/apps/libkleopatra/pics/key_bad.png
+usr/share/kde4/apps/libkleopatra/pics/key_ok.png
+usr/share/kde4/apps/libkleopatra/pics/key_unknown.png
+usr/share/kde4/config/libkleopatrarc

Added: branches/kde4.2/packages/kdepim/debian/libkontactinterfaces4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libkontactinterfaces4.install	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/libkontactinterfaces4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -0,0 +1,3 @@
+usr/lib/libkontactinterfaces.so.4
+usr/lib/libkontactinterfaces.so.4.2.0
+usr/share/kde4/servicetypes/kontactplugin.desktop

Modified: branches/kde4.2/packages/kdepim/debian/libkpgp4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libkpgp4.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/libkpgp4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,4 +1,12 @@
 usr/lib/libkpgp.so.4
-usr/lib/libkpgp.so.4.1.0
+usr/lib/libkpgp.so.4.2.0
 usr/share/kde4/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 usr/share/kde4/apps/kconf_update/kpgp.upd
+usr/share/kde4/apps/kmail/pics/key.png
+usr/share/kde4/apps/kmail/pics/key_bad.png
+usr/share/kde4/apps/kmail/pics/key_ok.png
+usr/share/kde4/apps/kmail/pics/key_unknown.png
+usr/share/kde4/apps/knode/pics/key.png
+usr/share/kde4/apps/knode/pics/key_bad.png
+usr/share/kde4/apps/knode/pics/key_ok.png
+usr/share/kde4/apps/knode/pics/key_unknown.png

Modified: branches/kde4.2/packages/kdepim/debian/libksieve4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libksieve4.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/libksieve4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,2 +1,2 @@
 usr/lib/libksieve.so.4
-usr/lib/libksieve.so.4.1.0
+usr/lib/libksieve.so.4.2.0

Modified: branches/kde4.2/packages/kdepim/debian/libmaildir4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libmaildir4.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/libmaildir4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,2 +1,2 @@
 usr/lib/libmaildir.so.4
-usr/lib/libmaildir.so.4.1.0
+usr/lib/libmaildir.so.4.2.0

Modified: branches/kde4.2/packages/kdepim/debian/libmimelib4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libmimelib4.install	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/libmimelib4.install	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,2 +1,2 @@
 usr/lib/libmimelib.so.4
-usr/lib/libmimelib.so.4.1.0
+usr/lib/libmimelib.so.4.2.0

Deleted: branches/kde4.2/packages/kdepim/debian/patches/01_branch_imap_duplication_fix.diff

Deleted: branches/kde4.2/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff

Added: branches/kde4.2/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-11-28 09:15:35 UTC (rev 12742)
@@ -0,0 +1,85 @@
+--- a/akonadi/kabc/CMakeLists.txt
++++ b/akonadi/kabc/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ qt4_wrap_ui(kabcakonadi_LIB_SRC kabcitemeditor.ui)
+ kde4_add_library( akonadi-kabccommon SHARED ${kabcakonadi_LIB_SRC} )
+ 
+-target_link_libraries( akonadi-kabccommon ${KDE4_AKONADI_LIBS} ${KDE4_KABC_LIBS} )
++target_link_libraries( akonadi-kabccommon ${KDE4_AKONADI_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} )
+ set_target_properties( akonadi-kabccommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} 
+                                                SOVERSION ${GENERIC_LIB_SOVERSION} 
+                                                ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${KDE4_KABC_LIBRARY}" )
+--- a/akonadi/kcal/CMakeLists.txt
++++ b/akonadi/kcal/CMakeLists.txt
+@@ -18,6 +18,6 @@
+ 
+ kde4_add_library( akonadi-kcal SHARED ${kcalakonadi_LIB_SRC} )
+ 
+-target_link_libraries( akonadi-kcal ${KDE4_AKONADI_LIBS} ${KDE4_KCAL_LIBS} )
++target_link_libraries( akonadi-kcal ${KDE4_AKONADI_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} )
+ set_target_properties( akonadi-kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS akonadi-kcal ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- a/akonadi/opensync/CMakeLists.txt
++++ b/akonadi/opensync/CMakeLists.txt
+@@ -23,6 +23,7 @@
+   ${KDE4_KDECORE_LIBS}
+   ${KDE4_AKONADI_LIBS}
+   ${KDE4_KCAL_LIBS}
++  ${KDE4_KABC_LIBS}
+ )
+ 
+ OPENSYNC_PLUGIN_INSTALL( akonadi_opensync_plugin )
+--- a/kpilot/conduits/contacts/CMakeLists.txt
++++ b/kpilot/conduits/contacts/CMakeLists.txt
+@@ -23,7 +23,7 @@
+ kde4_add_library( kpilot_conduit_contacts SHARED ${contacts_SRCS} )
+ 
+ target_link_libraries( kpilot_conduit_contacts
+-	${KDE4_KCAL_LIBS} ${KDE4_AKONADI_LIBS}
++	${KDE4_KCAL_LIBS} ${KDE4_AKONADI_LIBS} ${KDE4_KABC_LIBS}
+ 	kpilot_akonadibase kpilot_conduit_base kpilot
+ )
+ 
+--- a/kresources/akonadi/kabc/CMakeLists.txt
++++ b/kresources/akonadi/kabc/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ kde4_add_plugin(kabc_akonadi ${kabc_akonadi_SRCS})
+ 
+-target_link_libraries(kabc_akonadi ${KDE4_KABC_LIBS} ${KDE4_AKONADI_LIBS} ${KDE4_KUTILS_LIBS})
++target_link_libraries(kabc_akonadi ${KDE4_KABC_LIBS} ${KDE4_AKONADI_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KRESOURCES_LIBS})
+ 
+ 
+ install(TARGETS kabc_akonadi  DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- a/kresources/akonadi/kcal/CMakeLists.txt
++++ b/kresources/akonadi/kcal/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ 
+ kde4_add_plugin(kcal_akonadi ${kcal_akonadi_SRCS})
+ 
+-target_link_libraries(kcal_akonadi ${KDE4_KCAL_LIBS} ${KDE4_AKONADI_LIBS} akonadi-kcal)
++target_link_libraries(kcal_akonadi ${KDE4_KCAL_LIBS} ${KDE4_AKONADI_LIBS} ${KDE4_KRESOURCES_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KUTILS_LIBS} akonadi-kcal)
+ 
+ 
+ install(TARGETS kcal_akonadi  DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- a/kresources/groupwise/soap/CMakeLists.txt
++++ b/kresources/groupwise/soap/CMakeLists.txt
+@@ -26,7 +26,7 @@
+    )
+ 
+ kde4_add_library(gwsoap SHARED ${gwsoap_SRCS})
+-target_link_libraries(gwsoap ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS})
++target_link_libraries(gwsoap ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY})
+ set_target_properties(gwsoap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS gwsoap ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+--- a/strigi-analyzer/vcf/CMakeLists.txt
++++ b/strigi-analyzer/vcf/CMakeLists.txt
+@@ -6,6 +6,6 @@
+ 
+ kde4_add_library(vcf MODULE ${vcfendanalyzer_SRCS})
+ 
+-target_link_libraries(vcf ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_KABC_LIBS})
++target_link_libraries(vcf ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_KABC_LIBS} ${KDE4_KDECORE_LIBS})
+ set_target_properties(vcf PROPERTIES PREFIX strigiea_)
+ install(TARGETS vcf LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)

Modified: branches/kde4.2/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/series	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/patches/series	2008-11-28 09:15:35 UTC (rev 12742)
@@ -1,3 +1,2 @@
-01_branch_imap_duplication_fix.diff
 30_debianize_akregator_default.diff
 97_fix_target_link_libraries.diff

Modified: branches/kde4.2/packages/kdepim/debian/rules
===================================================================
--- branches/kde4.2/packages/kdepim/debian/rules	2008-11-28 00:23:12 UTC (rev 12741)
+++ branches/kde4.2/packages/kdepim/debian/rules	2008-11-28 09:15:35 UTC (rev 12742)
@@ -11,3 +11,5 @@
 DEB_DH_MAKESHLIBS_ARGS_libksieve4 :=  -V'libksieve4 (= $(DEBIANVERSION))'
 DEB_DH_MAKESHLIBS_ARGS_libmaildir4 :=  -V'libmaildir4 (= $(DEBIANVERSION))'
 DEB_DH_MAKESHLIBS_ARGS_libmimelib4 :=  -V'libmimelib4 (= $(DEBIANVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libkabcommon4 :=  -V'libkabcommon4 (= $(DEBIANVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libkontactinterfaces4 :=  -V'libkontactinterfaces4 (= $(DEBIANVERSION))'




More information about the pkg-kde-commits mailing list