-
Committer:
Steve Beattie
-
Date:
2011-07-18 05:46:37 UTC
-
mfrom:
(5.1.2 sid)
-
Revision ID:
sbeattie@ubuntu.com-20110718054637-ajfznfyo74wrqmsv
* Merge from debian unstable (LP: #812121). Remaining changes:
- debian/patches/tpm-engine.patch: implement TPM entropy source
(Debian bug 542599).
- debian/control: add build-deps for TPM interface.
- debian/rng-tools.default: add example for TPM devices.
- debian/{rules,rng-tools.postinst}: adjust rc start/stop location to
start later then trousers.
* New upstream version:
+ Work around VIA Nano xstore bug (closes: #609289)
+ Add support for Linux 3.0 (closes: #630771)