* 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