kdepim 4.1.2: New changes from Debian require merge

[Jonathan Thomas]

Binary package hint: kdepim

New changes from Debian require merging in Ubuntu.

[Launchpad Janitor (janitor)]

This bug was fixed in the package kdepim - 4:4.1.2-1ubuntu1

---------------
kdepim (4:4.1.2-1ubuntu1) jaunty; urgency=low

  * Merge with Debian, remaining changes:
    - Use our custom kde4.mk rather than built-in cdbs
    - Keep our conflicts/replaces on -kde4 packages
    - No gnokii build-dep
    - No gnokii in kaddressbook.install
    - kontact suggests not recommends kitchensync, 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
    - No kitchensync package
    - kmail suggests not recommends procmail
    - Do not use Debian patches that don't apply to us/will be fixed next
      upstream (pre)release we package:
        - 01_branch_imap_duplication_fix.diff
        - 30_debianize_akregator_default.diff
        - 97_fix_target_link_libraries.diff
    - Keep kubuntu02_fix_karm_desktop.diff
    - .orig md5sum different
  * Update KUBUNTU-DEBIAN-DIFFERENCES
  * Closes LP: #295388

kdepim (4:4.1.2-1) experimental; urgency=low

  * New upstream release.
  * Update installed files (and not-installed files too).

 -- Jonathan Thomas <email address hidden> Fri, 07 Nov 2008 18:53:04 -0500