-
Committer:
Package Import Robot
-
Author(s):
Andres Rodriguez
-
Date:
2013-05-10 08:30:27 UTC
-
mfrom:
(6.1.31 sid)
-
Revision ID:
package-import@ubuntu.com-20130510083027-r9uxtmyiml32zz6k
Tags: 1.3ubuntu1
* Merge from Debian unstable (LP: #1178739). Remaining changes:
- etckeeper.conf, debian/control: default to bzr.
- commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper is
not installed from a tty (like early during installation).
- etckeeper: Ensure that LANG is set, default to UTF8, necessary for bzr
to function properly in non-interactive shells (eg, cron); user's local
LANG will override if set.
- debian/control: Added dependency on hostname.
- README: Update tutorial to use bzr.
- Makefile: Do not call the etckeeper.spec target in clean because it
modifies the spec file instead of cleaning it.