lp:~jelmer/ubuntu/raring/etckeeper/merge-debian
- Get this branch:
- bzr branch lp:~jelmer/ubuntu/raring/etckeeper/merge-debian
Branch merges
- Didier Roche-Tolomelli: Approve
- Ubuntu Sponsors: Pending requested
- Ubuntu branches: Pending requested
-
Diff: 592 lines (+257/-61)16 files modifiedMakefile (+3/-0)
README (+44/-37)
debian/changelog (+42/-0)
debian/control (+2/-2)
debian/copyright (+1/-1)
debian/po/pt_BR.po (+59/-0)
etckeeper (+17/-7)
etckeeper.8 (+3/-2)
etckeeper.conf (+3/-3)
etckeeper.spec (+1/-1)
init.d/50vcs-ignore (+1/-1)
unclean.d/50test (+2/-2)
uninit.d/01prompt (+1/-1)
uninit.d/50vcs-uninit (+32/-2)
update-ignore.d/01update-ignore (+8/-2)
zypper-etckeeper.py (+38/-0)
Related bugs
Related blueprints
Branch information
- Owner:
- Jelmer Vernooij
- Status:
- Development
Recent revisions
- 43. By Jelmer Vernooij
-
Cherry-pick support for detecting the VCS in use from upstream.
(git commits e5742f7ae353f9a675e13fc0b951da eeff82bdae and
9f613899512e2091d2699c7f64b60c 0dbdad71a2) . LP: #909558 - 42. By Jelmer Vernooij
-
* Merge from Debian. Remaining changes:
- 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.
* Drop patch to default to bzr as VCS, switching back to upstream default of
git.
* Added support for openSUSE's zypper package manager.
Thanks, Catalin Iacob
* Add Brazilian Portuguese debconf translation.
Closes: #685771 Thanks, Adriano Rafael Gomes
* bzr: Improve detection of unclean repos, to work when there are shelved
changes.
* uninit: Now preserves parts of the gitignore and similar files that
are outside the managed by etckeeper block. Closes: #673996
Thanks, David De La Harpe Golden (Squared Financial)
* Autocommit git staged files. Closes: #662614 - 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. - 36. By Barry Warsaw
-
* Merge from Debian testing. Remaining Ubuntu changes:
- 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. (LP: #872553 LP: #791839)
* Changed to store all permissions of files and directories, even those
with standard permissions of 644 and 755. This is unfortunately necessary
in order to support etckeeper init on a checkout that was made with a
nonstandard umask, in which case the files that were expected to be
644 and 755, won't be. Closes: #649701
Thanks to Дмитрий Матросов for reporting the bug and developing
a fixup script (attached to the bug) which could be used if you've
already encountered this problem.
* Bugfix for filenames containing single quotes.
* Use git add -A, which automatically removes deleted files,
and avoids a separate call to git add -u.
Thanks to Miklos Vajna, whose patch in 2008 was deferred
because -A was then too new, and languished in a branch until found today.
* Optimised metadata storage.
* cron.daily: Don't stop committing when a stale packagelist.pre-install
file exists.
Thanks to gulikoza for noticing this bug.
* Use find -path instead of less portable find -wholename.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/raring/etckeeper