Merge with gitk.

[git.git] / debian / control

diff --git a/debian/control b/debian/control
index a774a62..ae1912c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,9 @@ Standards-Version: 3.6.1
 
 Package: git-core
 Architecture: any
-Depends: ${misc:Depends}, shellutils, diff, rsync, rcs
+Depends: ${shlibs:Depends}, ${misc:Depends}, patch, diff, rcs
+Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl
+Conflicts: git
 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