lp:~yolanda.robla/ubuntu/saucy/etckeeper/debian_merge
- Get this branch:
- bzr branch lp:~yolanda.robla/ubuntu/saucy/etckeeper/debian_merge
Branch merges
- Martin Pitt: Approve
-
Diff: 84 lines (+27/-6)5 files modifieddebian/changelog (+21/-0)
debian/control (+1/-1)
etckeeper.spec (+1/-1)
uninit.d/50vcs-uninit (+2/-2)
update-ignore.d/01update-ignore (+2/-2)
Related bugs
Bug #1200508: Please merge etckeeper 1.4 (main) from Debian unstable (main) | Wishlist | Fix Released |
|
Related blueprints
Branch information
- Owner:
- Yolanda Robla
- Status:
- Development
Recent 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. - 46. By Andres Rodriguez
-
* 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. - 45. By Colin Watson
-
* Resynchronise with Debian (bzr change in 0.63 fixes LP: #979223).
Remaining changes:
- etckeeper.conf, debian/control: default to bzr.
- etckeeper.spec: Change version to match Ubuntu version
- commit.d/50vcs- commit: Avoid failure in initial commit if etckeeper is
not installed from a tty (like early during installation).
- debian/control: Added dependency on hostname.
- 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.
- README: Update tutorial to use bzr. - 39. By Chuck Short
-
[Chuck Short]
* Merge from Debian testing. Remaining changes:
- etckeeper.conf, debian/control: default to bzr.
- etckeeper.spec: Change version to match Ubuntu version
- commit.d/50vcs- commit: Avoid failure in initial commit if etckeeper
is not installed from a tty (like early during installation)
- debian/control: Added dependency on hostname.
- 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. - 38. By Andrew Starr-Bochicchio
-
* Merge from Debian Testing. Remaining Ubuntu changes:
- etckeeper.conf, debian/control: default to bzr.
- etckeeper.spec: Change version to match Ubuntu version
- commit.d/50vcs- commit: Avoid failure in initial commit if etckeeper
is not installed from a tty (like early during installation)
- debian/control: Added dependency on hostname.
- 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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/saucy/etckeeper