diff options
| author | Joey Hess <joey@kitenet.net> | 2011-11-25 12:33:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-25 12:33:48 -0400 |
| commit | 3137b75b6b0d86096e66daa24c477d4e71d85d77 (patch) | |
| tree | 1a6184c1625cb6bd95bd98fd65adfc06d2389b52 /debian | |
| parent | 618123e77322ea002cde9b80cce269b1960b574d (diff) | |
| parent | 299dc44f1014404ca1367b72e2a22605ef22d127 (diff) | |
Merge branch 'master' into allperms
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 95b32c1..44d5466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ etckeeper (0.58) UNRELEASED; urgency=low 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. -- Joey Hess <joeyh@debian.org> Fri, 25 Nov 2011 12:00:55 -0400 diff --git a/debian/control b/debian/control index 350d9f8..71089d9 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Homepage: http://kitenet.net/~joey/code/etckeeper/ Package: etckeeper Architecture: all Section: admin -Depends: git-core (>= 1:1.5.4) | git (>= 1:1.7) | mercurial | bzr (>= 1.5~) | darcs, ${misc:Depends}, ${python:Depends} +Depends: git-core (>= 1:1.5.4) | git (>= 1:1.7) | mercurial | bzr (>= 1.5~) | darcs, ${misc:Depends} Recommends: cron Suggests: sudo (>= 1.7.4p4) Conflicts: bzr (<< 1.5~) diff --git a/debian/rules b/debian/rules index cd2906f..b6b9b90 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,7 @@ #!/usr/bin/make -f + +export PYTHON_INSTALL_OPTS=--install-layout=deb + %: dh --with python2 $@ |