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/control | |
| parent | 618123e77322ea002cde9b80cce269b1960b574d (diff) | |
| parent | 299dc44f1014404ca1367b72e2a22605ef22d127 (diff) | |
Merge branch 'master' into allperms
Conflicts:
debian/changelog
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
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~) |