-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Thomas
-
Date:
2009-05-08 13:42:07 UTC
-
mfrom:
(0.1.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090508134207-e0g1x9zsy39d8e5m
Tags: 4:4.2.2-1ubuntu1
* Merge from Debian Unstable, remaining changes:
- Keep our conflicts/replaces on -kde4 packages
- No gnokii build-dep
- No gnokii in kaddressbook.install
- kontact suggests not recommends knode
- Keep our kdepim-dev package
- akonadi-kde ships akonaditray, which is a starter application for Akonadi
itself, therefore akonadi-kde needs to depend on akonadi-server
- DCOP => DBus in Kalarm package description
- kmail suggests not recommends procmail
- kubuntu_01_fix_sieve_hang_svn_915286.diff
- Install akonadiconsole to kdepim-dev
- .orig md5sum different