lp:~jelmer/ubuntu/quantal/etckeeper/merge-0.64

Created by Jelmer Vernooij on 2012-12-08 and last modified on 2012-12-08
Get this branch:
bzr branch lp:~jelmer/ubuntu/quantal/etckeeper/merge-0.64
Only Jelmer Vernooij can upload to this branch. If you are Jelmer Vernooij please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Jelmer Vernooij
Status:
Development

Recent revisions

42. By Jelmer Vernooij on 2012-12-08

* 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

41. By Colin Watson on 2012-03-26

releasing version 0.61ubuntu2

39. By Chuck Short on 2012-02-06

[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 on 2012-01-06

* 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.

37. By Barry Warsaw on 2011-12-06

add LP bug number

36. By Barry Warsaw on 2011-12-06

* 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.

35. By Dustin Kirkland  on 2011-10-12

* etckeeper: LP: #872553, #791839
  - 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

34. By Marc Cluet on 2011-08-19

Added dependency on hostname (LP: #822613)

33. By Angel Abad on 2011-07-27

* Merge from debian unstable. (LP: #817074) 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)
* Dropped change, fixed in Debian:
  - Convert from python-central to dh_python2

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
This branch contains Public information 
Everyone can see this information.

Subscribers