-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2011-02-08 00:28:43 UTC
-
mfrom:
(1.1.22 upstream)
(3.1.19 sid)
-
Revision ID:
james.westby@ubuntu.com-20110208002843-1xrv7w3vqblrn15m
Tags: 2.6.4-2ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
set the location of the CRL in apache2 configuration. Fix apache2
configuration on upgrade as well (LP: #641001)
- move all puppet dependencies to puppet-common since all the code
actually located in puppet-common.
- move libagueas from a recommend to a dependency.