Merge lp://qastaging/~yolanda.robla/ubuntu/saucy/etckeeper/debian_merge into lp://qastaging/ubuntu/saucy/etckeeper
Proposed by
Yolanda Robla
| Status: | Approved | ||||
|---|---|---|---|---|---|
| Approved by: | Martin Pitt | ||||
| Approved revision: | 47 | ||||
| Proposed branch: | lp://qastaging/~yolanda.robla/ubuntu/saucy/etckeeper/debian_merge | ||||
| Merge into: | lp://qastaging/ubuntu/saucy/etckeeper | ||||
| Diff against target: |
84 lines (+27/-6) 5 files modified
debian/changelog (+21/-0) debian/control (+1/-1) etckeeper.spec (+1/-1) uninit.d/50vcs-uninit (+2/-2) update-ignore.d/01update-ignore (+2/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~yolanda.robla/ubuntu/saucy/etckeeper/debian_merge | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
Merging last Debian version (LP: #1200508)
To post a comment you must log in.
Unmerged revisions
- 47. By Yolanda Robla
-
* Merge from Debian unstable (LP: #1200508). Remaining changes:
- commit.d/50vcs- commit: Avoid failure in initial commit if etckeeper is
not installed from a tty (like early during installation).
- etckeeper.conf, debian/control: default to bzr
- 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.
- Makefile: Do not call the etckeeper.spec target in clean because it
modifies the spec file instead of cleaning it.
- README: Update tutorial to use bzr.
* Deal with unix^wlinux portability nonsense.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks! Uploaded.