-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Bienia
-
Date:
2010-01-04 20:06:01 UTC
-
mfrom:
(1.1.11 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100104200601-0rble341i2xns9xw
Tags: 1.4.10-2ubuntu1
* Merge from Debian testing (lp: #503064, #477818). Remaining changes:
- Add 'debian/patches/50_disable_mlock_test.dpatch': Disable mlock() test
since it fails with ulimit 0 (on buildds).
- Add 'debian/patches/61_use_agent_default.dpatch': Patch to set gpg
(or gpg2) and gpgsm to use a passphrase agent by default (lp: 15485)
- Fix udeb build failure on powerpc, building with -O2 instead of -Os.