-
Committer:
Bazaar Package Importer
-
Author(s):
Thierry Carrez
-
Date:
2010-05-28 12:29:14 UTC
-
mfrom:
(6.1.9 sid)
-
Revision ID:
james.westby@ubuntu.com-20100528122914-9ifzk0bd8k2jldtt
Tags: 0.46ubuntu1
* Merge from debian unstable. Remaining changes:
- etckeeper.conf, debian/control: default to bzr.
- debian/cron.daily: Avoid cron emails with daily autocommits if VCS=hg
- commit.d/50vcs-commit: Do not use author so that bzr log --line shows
the right name (and hostname)
- etckeeper: Set HOME=~root if VCS=bzr, so that bzr doesn't create
root-owned .bazaar and .bzr.log in home directories when run under sudo
* etckeeper.spec: Change version to match Ubuntu version