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

Armin Berres trigger-guest at alioth.debian.org
Sun May 4 22:58:31 UTC 2008


Author: trigger-guest
Date: 2008-05-04 22:58:30 +0000 (Sun, 04 May 2008)
New Revision: 10469

Removed:
   branches/kde4/packages/kdepim/debian/kdepim-kio-plugins.install
Modified:
   branches/kde4/packages/kdepim/debian/akonadi.install
   branches/kde4/packages/kdepim/debian/changelog
   branches/kde4/packages/kdepim/debian/control
   branches/kde4/packages/kdepim/debian/kaddressbook.install
   branches/kde4/packages/kdepim/debian/kmail.install
   branches/kde4/packages/kdepim/debian/kontact.install
   branches/kde4/packages/kdepim/debian/libkdepim4.install
Log:
 * Add build dependency on libakonadi-dev and libplasma-dev.                                                                                               
 * Remove package kdepim-kio-plugins and all the dependencies on it. The                                                                                   
   residual kio slaves live in libkdepim4 now.                                                                                                             
 * Remove dependencies on kdebase-kio-plugins, this package is KDE 3 only.                                                                                 
 * Remove conflicts and replaces from pre-etch times.
 * Remove some useless conflicts and replaces for libraries with a raised
   soname.
 * Move kmail and korganizer kontact plugins into the kontact package.

thanks to sune for hints and tips.
kdepim isn't really finished, butmy bed is waiting. copyright is completely missing, 
the large akonadi package needs some love, and maybe other things are completely b0rked...


Modified: branches/kde4/packages/kdepim/debian/akonadi.install
===================================================================
--- branches/kde4/packages/kdepim/debian/akonadi.install	2008-05-04 22:15:44 UTC (rev 10468)
+++ branches/kde4/packages/kdepim/debian/akonadi.install	2008-05-04 22:58:30 UTC (rev 10469)
@@ -1,4 +1,3 @@
-usr/share/applications/kde4/akonaditray.desktop
 usr/bin/akonadi_ical_resource
 usr/bin/akonadi_imaplib_resource
 usr/bin/akonadi_kabc_resource
@@ -49,6 +48,7 @@
 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/applications/kde4/kcontactmanager.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop

Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog	2008-05-04 22:15:44 UTC (rev 10468)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-05-04 22:58:30 UTC (rev 10469)
@@ -1,4 +1,4 @@
-kdepim (4:4.0.71+svn802208-1~pre1) experimental; urgency=low
+kdepim (4:4.0.72) experimental; urgency=low
 
   * First KDE 4.1 snapshot packaged.
 
@@ -18,8 +18,16 @@
     kdepimlibs according to upstream.
   * Add 97_fix_target_link_libraries.diff which fixes linkage problems with
     recent kdelibs5.
+  * Add build dependency on libakonadi-dev and libplasma-dev.
+  * Remove package kdepim-kio-plugins and all the dependencies on it. The
+    residual kio slaves live in libkdepim4 now.
+  * Remove dependencies on kdebase-kio-plugins, this package is KDE 3 only.
+  * Remove conflicts and replaces from pre-etch times.
+  * Remove some useless conflicts and replaces for libraries with a raised
+    soname.
+  * Move kmail and korganizer kontact plugins into the kontact package.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Apr 2008 11:14:37 +0000
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 05 May 2008 00:06:13 +0200
 
 kdepim (4:3.96.0-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2008-05-04 22:15:44 UTC (rev 10468)
+++ branches/kde4/packages/kdepim/debian/control	2008-05-04 22:58:30 UTC (rev 10469)
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, 
- kdepimlibs5-dev (>=4:4.0.68+svn798657), libphonon-dev (>=4:4.0.68)
+ kdepimlibs5-dev (>=4:4.0.72), libphonon-dev (>=4:4.0.72), libplasma-dev ((>=4:4.0.72),
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
  xsltproc, libgnokii3-dev, libxss-dev, libqca2-dev (>= 2.0.0-5),
  libpisock-dev, libopensync1exp3-dev, libassuan-dev,
  libstreams-dev, libstreamanalyzer-dev, libsearchclient-dev,  
  libstrigihtmlgui-dev, libstrigiqtdbusclient-dev, zlib1g-dev,
+ libakonadi-dev
 Standards-Version: 3.7.2
 Homepage: http://pim.kde.org/
 
@@ -69,7 +70,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: kdepim-kresources, kdebase-kio-plugins
+Suggests: kdepim-kresources
 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
@@ -103,23 +104,10 @@
  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-kio-plugins
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: kdebase-kio-plugins (<< 4:3.4.0)
-Description: KDE pim I/O Slaves
- This package includes the pim kioslaves. This includes imap4, sieve,
- and mbox.
- .
- 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-kresources
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libkcal2a (<< 4:3.4.1), kaddressbook (<< 4:3.4.1), knotes (<< 4:3.4.1)
 Recommends: korganizer
 Suggests: knotes
 Description: KDE pim resource plugins
@@ -134,7 +122,6 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdepim-dev (<< 4:3.4.1-2)
 Suggests: egroupware
 Description: KDE server configuration wizards
  This package contains KDE-based wizards for configuring eGroupware,
@@ -171,7 +158,7 @@
 Package: kmail
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, kdepim-kio-plugins, kdebase-kio-plugins
+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)
@@ -182,9 +169,6 @@
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
- You need to install kdepim-kio-plugins if you want to use IMAP or
- mbox files, and/or kdebase-kio-plugins if you want to use POP3.
- .
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
@@ -262,8 +246,6 @@
 Depends: ${shlibs:Depends}
 Recommends: kitchensync, kmail, knode, knotes
 Suggests: akregator, knewsticker, kweather, gnokii
-Replaces: akregator (<< 4:3.4.0), akregator-kontact-plugin
-Conflicts: akregator-kontact-plugin
 Homepage: http://kontact.kde.org/
 Description: KDE pim application
  Kontact is the integrated solution to your personal information management
@@ -298,7 +280,7 @@
 Package: korn
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdepim-kio-plugins, kdebase-kio-plugins
+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.
@@ -353,8 +335,6 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libkdepim1a
-Replaces: libkdepim1a
 Description: KDE PIM library
  This is the runtime package for programs that use the libkdepim library.
  .
@@ -386,8 +366,6 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libksieve0
-Conflicts: libksieve0
 Description: KDE mail/news message filtering library
  This is the runtime package for programs that use the libksieve library.
  .
@@ -403,8 +381,6 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libmimelib1c2a
-Replaces: libmimelib1c2a, libmimelib1-dev
 Description: KDE mime library
  This library is used by several KDE applications to handle mime types.
  .

Modified: branches/kde4/packages/kdepim/debian/kaddressbook.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kaddressbook.install	2008-05-04 22:15:44 UTC (rev 10468)
+++ branches/kde4/packages/kdepim/debian/kaddressbook.install	2008-05-04 22:58:30 UTC (rev 10469)
@@ -27,7 +27,6 @@
 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
@@ -120,7 +119,6 @@
 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/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

Deleted: branches/kde4/packages/kdepim/debian/kdepim-kio-plugins.install

Modified: branches/kde4/packages/kdepim/debian/kmail.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kmail.install	2008-05-04 22:15:44 UTC (rev 10468)
+++ branches/kde4/packages/kdepim/debian/kmail.install	2008-05-04 22:58:30 UTC (rev 10469)
@@ -111,6 +111,5 @@
 usr/share/kde4/services/kmail_config_identity.desktop
 usr/share/kde4/services/kmail_config_misc.desktop
 usr/share/kde4/services/kmail_config_security.desktop
-usr/share/kde4/services/kontact/kmailplugin.desktop
 usr/share/kde4/servicetypes/dbusimap.desktop
 usr/share/kde4/servicetypes/dbusmail.desktop

Modified: branches/kde4/packages/kdepim/debian/kontact.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kontact.install	2008-05-04 22:15:44 UTC (rev 10468)
+++ branches/kde4/packages/kdepim/debian/kontact.install	2008-05-04 22:58:30 UTC (rev 10469)
@@ -1,4 +1,3 @@
-usr/share/kde4/apps/kontact/about/top-left-kontact.png
 usr/bin/kontact
 usr/lib/kde4/kcm_apptsummary.so
 usr/lib/kde4/kcm_kontact.so
@@ -9,7 +8,9 @@
 usr/lib/kde4/kcm_todosummary.so
 usr/lib/kde4/kontact_akregatorplugin.so
 usr/lib/kde4/kontact_journalplugin.so
+usr/lib/kde4/kontact_kaddressbookplugin.so
 usr/lib/kde4/kontact_karmplugin.so
+usr/lib/kde4/kontact_kmailplugin.so
 usr/lib/kde4/kontact_knodeplugin.so
 usr/lib/kde4/kontact_knotesplugin.so
 usr/lib/kde4/kontact_korganizerplugin.so
@@ -80,6 +81,7 @@
 usr/share/icons/oxygen/64x64/actions/kontact_todo.png
 usr/share/kde4/apps/kontact/about/kontact.css
 usr/share/kde4/apps/kontact/about/main.html
+usr/share/kde4/apps/kontact/about/top-left-kontact.png
 usr/share/kde4/apps/kontact/kontact.setdlg
 usr/share/kde4/apps/kontact/kontactui.rc
 usr/share/kde4/apps/kontactsummary/kontactsummary_part.rc
@@ -91,7 +93,9 @@
 usr/share/kde4/services/kcmsdsummary.desktop
 usr/share/kde4/services/kcmtodosummary.desktop
 usr/share/kde4/services/kontact/journalplugin.desktop
+usr/share/kde4/services/kontact/kaddressbookplugin.desktop
 usr/share/kde4/services/kontact/karmplugin.desktop
+usr/share/kde4/services/kontact/kmailplugin.desktop
 usr/share/kde4/services/kontact/knodeplugin.desktop
 usr/share/kde4/services/kontact/knotesplugin.desktop
 usr/share/kde4/services/kontact/korganizerplugin.desktop

Modified: branches/kde4/packages/kdepim/debian/libkdepim4.install
===================================================================
--- branches/kde4/packages/kdepim/debian/libkdepim4.install	2008-05-04 22:15:44 UTC (rev 10468)
+++ branches/kde4/packages/kdepim/debian/libkdepim4.install	2008-05-04 22:58:30 UTC (rev 10469)
@@ -1,3 +1,5 @@
+usr/lib/kde4/kio_akonadi.so
+usr/lib/kde4/kio_scalix.so
 usr/lib/kde4/kpartsdesignerplugin.so
 usr/lib/libkdepim.so.4
 usr/lib/libkdepim.so.4.1.0
@@ -61,3 +63,5 @@
 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




More information about the pkg-kde-commits mailing list