diff options
author | Junio C Hamano <junkio@cox.net> | 2005-10-16 11:55:35 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-10-16 11:55:35 -0700 |
commit | 29504118f8528f658fd0bfc02d8d78d4c01dc2cc (patch) | |
tree | 0412494891ef327fa7070c9fca192ae418e5fe2b /debian | |
parent | 6abf5c0c6fb2ad9bb24444171d306262a8c8f4a2 (diff) | |
parent | 40dad96e41fcb96e31bdf11deec3c7bf6261adbe (diff) | |
download | git-29504118f8528f658fd0bfc02d8d78d4c01dc2cc.tar.gz git-29504118f8528f658fd0bfc02d8d78d4c01dc2cc.tar.xz |
Merge branch 'svn' of http://netz.smurf.noris.de/git/git
[jc: I have my pre-commit hook enabled to catch trailing whitespaces,
and fixed them up while merging.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 2ae4ee9e7..ff33827c1 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.1 Package: git-core Architecture: any Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, patch, rcs -Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl, python (>= 2.4.0), less +Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl, libsvn-core-perl (>= 1.2.1), python (>= 2.4.0), less Suggests: cogito Conflicts: git, cogito (<< 0.13) Description: The git content addressable filesystem |