~jelmer/ubuntu/raring/etckeeper/merge-debian

« back to all changes in this revision

Viewing changes to debian/postinst

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short
  • Date: 2012-02-06 07:49:28 UTC
  • mfrom: (6.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120206074928-2co65ytlptwx2um3
Tags: 0.61ubuntu1
[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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
72
72
                        fi
73
73
                done
74
74
        fi
 
75
        if dpkg --compare-versions "$2" le "0.61"; then
 
76
                # may be left over from a botched conffile removal
 
77
                rm -f /etc/etckeeper/commit.d/40git-rm.dpkg-dist
 
78
        fi
75
79
 
76
80
        if [ "$2" = "" ] && [ -e "/etc/etckeeper/etckeeper.conf" ]; then
77
81
                # Fresh install.