rev 12576 - branches/kde4/packages/kdepim/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2008-11-05 20:38:48 +0000 (Wed, 05 Nov 2008)
New Revision: 12576

Modified:
   branches/kde4/packages/kdepim/debian/akonadi-kde.install
   branches/kde4/packages/kdepim/debian/changelog
   branches/kde4/packages/kdepim/debian/control
   branches/kde4/packages/kdepim/debian/kmail.install
   branches/kde4/packages/kdepim/debian/libkdepim4.install
Log:
* Shuffle around akonadi-files as pr upstream instructions
  - akonadiconsole currently put in kmail - but that should maybe be
    revisited.

Modified: branches/kde4/packages/kdepim/debian/akonadi-kde.install
===================================================================
--- branches/kde4/packages/kdepim/debian/akonadi-kde.install	2008-11-05 20:05:59 UTC (rev 12575)
+++ branches/kde4/packages/kdepim/debian/akonadi-kde.install	2008-11-05 20:38:48 UTC (rev 12576)
@@ -11,7 +11,6 @@
 usr/bin/akonadi_nntp_resource
 usr/bin/akonadi_strigi_feeder
 usr/bin/akonadi_vcard_resource
-usr/bin/akonadiconsole
 usr/bin/akonaditray
 usr/lib/kde4/akonadi_serializer_addressee.so
 usr/lib/kde4/akonadi_serializer_bookmark.so
@@ -40,14 +39,12 @@
 usr/share/akonadi/agents/nntpresource.desktop
 usr/share/akonadi/agents/strigifeeder.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_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
@@ -56,3 +53,4 @@
 usr/share/kde4/services/kcm_akonadi_resources.desktop
 usr/share/kde4/services/kresources/kabc/akonadi.desktop
 usr/share/kde4/services/kresources/kcal/akonadi.desktop
+usr/lib/kde4/kio_akonadi.so

Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog	2008-11-05 20:05:59 UTC (rev 12575)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-11-05 20:38:48 UTC (rev 12576)
@@ -1,8 +1,11 @@
-kdepim (4:4.1.3-0) experimental; urgency=low
+kdepim (4:4.1.3-1) experimental; urgency=low
 
   * New upstream
     - bump b-d
     - refresh patches
+  * Shuffle around akonadi-files as pr upstream instructions
+    - akonadiconsole currently put in kmail - but that should maybe be
+      revisited.
 
  -- Sune Vuorela <debian at pusling.com>  Sat, 01 Nov 2008 17:44:00 +0100
 

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2008-11-05 20:05:59 UTC (rev 12575)
+++ branches/kde4/packages/kdepim/debian/control	2008-11-05 20:38:48 UTC (rev 12576)
@@ -61,6 +61,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: libkdepim4 (<< 4:4.1.3)
 Homepage: http://pim.kde.org/akonadi/
 Description: akonadi resources for KDE
  This package contains the akonadi resources and connectors for KDE.
@@ -178,7 +179,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)
+Replaces: kmailcvt (<< 4:3.90.0), akonadi-kde (<< 4:4.1.3)
 Provides: imap-client, mail-reader
 Homepage: http://kontact.kde.org/kmail/
 Description: KDE Email client

Modified: branches/kde4/packages/kdepim/debian/kmail.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kmail.install	2008-11-05 20:05:59 UTC (rev 12575)
+++ branches/kde4/packages/kdepim/debian/kmail.install	2008-11-05 20:38:48 UTC (rev 12576)
@@ -116,3 +116,6 @@
 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

Modified: branches/kde4/packages/kdepim/debian/libkdepim4.install
===================================================================
--- branches/kde4/packages/kdepim/debian/libkdepim4.install	2008-11-05 20:05:59 UTC (rev 12575)
+++ branches/kde4/packages/kdepim/debian/libkdepim4.install	2008-11-05 20:38:48 UTC (rev 12576)
@@ -1,4 +1,3 @@
-usr/lib/kde4/kio_akonadi.so
 usr/lib/kde4/kio_scalix.so
 usr/lib/kde4/kpartsdesignerplugin.so
 usr/lib/libkcal_resourceremote.so.4