From 579fbe598ddd9608bd2fbcf8411299dde06d1912 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 26 Aug 2005 14:00:04 +0300 Subject: [PATCH] [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 Signed-off-by: Junio C Hamano --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a04453506..6735a0da0 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 -- 2.30.2