diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-04-05 14:31:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-04-05 14:31:58 -0400 |
| commit | 283398c871cc2924909d5c6ceb47d25951f9e0e0 (patch) | |
| tree | ed38e5505698fab3c333ef9ba0473e936a247ad7 | |
| parent | 118f0016d2f1ecece4d282a257049a86bc4c9ca6 (diff) | |
Conflict with older versions of bzr.
This combination causes the bzr etckeeper plugin to be unloadable.
Conflicts:
debian/control
| -rw-r--r-- | debian/control | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/control b/debian/control index df3e58c..79bd28b 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Package: etckeeper Architecture: all Section: admin Depends: git-core (>= 1:1.5.4) | mercurial | bzr (>= 1.4~), ${misc:Depends} +Conflicts: bzr (<< 1.4~) Description: store /etc in git, mercurial, or bzr The etckeeper program is a tool to let /etc be stored in a git, mercurial, or bzr repository. It hooks into APT to automatically commit changes made to |