* Merge from Debian unstable. Remaining changes: - prefer native packages over foreign packages - do not crash if the DB is already locked (LP: #590998) - do not modify the DB "in-place" with --update - debian/patches/01_axi_cjk_support.patch: - Activate the CJK support when indexing the database - Don't call update-python-modules in the postinst. LP: #856627. - fix spelling errors - add XPM term that contains a mangled version of the pkgname - debian/patches/03_policykit_translations.patch: - remove underscores from description