-
Committer:
Bazaar Package Importer
-
Author(s):
Alessandro Ghersi
-
Date:
2010-10-17 05:49:29 UTC
-
mfrom:
(0.1.10 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20101017054929-2sxs7qw2fzu7d6k4
Tags: 4:4.4.6-0ubuntu2
* Merge with Debian unstable remaining changes:
- Keep kdepim-doc.install where we ship docs for all packages which are in
kdepim metapackage
- Keep debian/kalarm-icons
- Keep our patch
- Build against libboost1.42-dev and libboost-graph1.42-dev
- No libgnokii build-dep
- Add libindicate-qt-dev, kdepim-runtime-dev, libxml2-dev, sharutils to build-deps
- Add kdepim-runtime do depends in kdepim metapackage
- No kleopatra and akonadiconsole to depends in kdepim metapackage (Universe)
- Keep our kdepim-dev package and add kdepim-dev.install
- Add kdepim-runtime in kdepim-groupware and kmail depends
- Kleopatra depends only on pinentry-qt4, pinentry-x11 is not in archive
- Kmail recommends pinentry-qt4, pinentry-x11 is not in archive and
pinentry-qt is build against qt3
- kmail suggests not recommends procmail
- In kmail suggests don't add f-prot-installer and annoyance-filter are
not in archive
- knode, knotes, konsolekalendar, kontact, korganizer depends on
kdepim-runtime
- kjots depends on akonadi-server
- In kontact don't add ktimeticker,it's not in archive
- debian/akregator,kaddressbook,kalarm,kjots,kmail,knode,knotes,kontact,
ktimetracker,korganizer{.install}:
- Don't add docs which are in kdepim-doc.install
- debian/rules:
- Keep rules for binary-install/kalarm
- Build against kdelibs5-dev 4.5.2-0ubuntu1 for libkutils4 transition