summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTommi Virtanen <tv@debian.org>2005-08-26 11:00:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-26 19:52:23 (GMT)
commit579fbe598ddd9608bd2fbcf8411299dde06d1912 (patch)
treef8643bd29afe17ac3e9d0300be19988872a72d7c /debian
parent814be007dff08597f6f550f243916aae4bf1d0f8 (diff)
downloadgit-579fbe598ddd9608bd2fbcf8411299dde06d1912.zip
git-579fbe598ddd9608bd2fbcf8411299dde06d1912.tar.gz
git-579fbe598ddd9608bd2fbcf8411299dde06d1912.tar.bz2
[PATCH] git bugfixes and cleanups, mainly Debian things
Make the git deb conflict with cogito versions prior to 0.13, as those versions used to contain git. Suggest cogito. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'debian')
-rw-r--r--debian/control3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index a044535..6735a0d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Package: git-core
Architecture: any
Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, patch, rcs
Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl
-Conflicts: git
+Suggests: cogito
+Conflicts: git, cogito (<< 0.13)
Description: The git content addressable filesystem
GIT comes in two layers. The bottom layer is merely an extremely fast
and flexible filesystem-based database designed to store directory trees