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

[Armin Berres]

Author: trigger-guest
Date: 2007-11-20 12:06:30 +0000 (Tue, 20 Nov 2007)
New Revision: 7988

Modified:
   branches/kde4/packages/kdepim/debian/control
   branches/kde4/packages/kdepim/debian/kaddressbook.install
Log:
merge kabcclient with kaddressbook and kmailcvt with kmail

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2007-11-20 00:58:21 UTC (rev 7987)
+++ branches/kde4/packages/kdepim/debian/control	2007-11-20 12:06:30 UTC (rev 7988)
@@ -72,11 +72,6 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
-Package: kabcclient
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends}
-
 Package: kaddressbook
 Section: utils
 Architecture: any
@@ -195,8 +190,9 @@
 Depends: ${shlibs:Depends}, ${perl:Depends}, kdepim-kio-plugins, kdebase-kio-plugins
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
-Replaces: kdepim-dev (<< 4:3.4.0), kdebase-data (<< 4:3.4.0)
+Replaces: kmailcvt (<< 4:3.90.0)
 Provides: imap-client, mail-reader
+Homepage: http://kmail.kde.org/
 Description: KDE Email client
  KMail is a fully-featured email client that fits nicely into the KDE
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
@@ -207,20 +203,7 @@
  .
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
- .
-  Homepage: http://kmail.kde.org/
 
-Package: kmailcvt
-Section: mail
-Architecture: any
-Depends: ${shlibs:Depends}, kmail
-Description: KDE KMail mail folder converter
- Converts mail folders to KMail format.  Formats supported for import
- include Outlook Express, Evolution, and plain 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: kmobiletools
 Section: 
 Architecture: any

Modified: branches/kde4/packages/kdepim/debian/kaddressbook.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kaddressbook.install	2007-11-20 00:58:21 UTC (rev 7987)
+++ branches/kde4/packages/kdepim/debian/kaddressbook.install	2007-11-20 12:06:30 UTC (rev 7988)
@@ -105,3 +105,5 @@
 usr/share/kde4/servicetypes/kaddressbookimprotocol.desktop
 usr/share/kde4/servicetypes/kaddressbook_view.desktop
 usr/share/kde4/servicetypes/kaddressbook_xxport.desktop
+usr/bin/kabc2mutt
+usr/bin/kabcclient