-
Committer:
Package Import Robot
-
Author(s):
Michael Vogt
-
Date:
2014-06-03 21:29:13 UTC
-
mfrom:
(15.1.6 sid)
-
Revision ID:
package-import@ubuntu.com-20140603212913-bn64z737sz34w4p6
Tags: 0.46ubuntu1
* 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
- debian/patches/02_axi-pkgname-mangled-term.patch:
- add XPM term that contains a mangled version of the pkgname
- debian/patches/03_policykit_translations.patch:
- remove underscores from description
- debian/patches/CVE-2013-1064.patch:
+ pass system-bus-name as a subject
- debian/postinst:
- do not build the DB in the postinst
- debian/rules:
- quilt with dh --with python2
- plugins/app-install.py:
- ignore file not found errors due to a race condition (LP: #752195)
* Drop:
- debian/patches/04_catch_invalid_desktop_file.patch: no longer needed