Add a new merge strategy by Fredrik Kuivinen.
[git/git.git] / debian / control
CommitLineData
7421abfd
EB
1Source: git-core
2Section: devel
3Priority: optional
b1d096f2 4Maintainer: Junio C Hamano <junkio@cox.net>
814be007 5Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev, asciidoc (>= 6.0.3), xmlto, debhelper (>= 4.0.0)
7421abfd
EB
6Standards-Version: 3.6.1
7
8Package: git-core
9Architecture: any
af36b70e 10Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, patch, rcs
720d150c 11Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl, python (>= 2.4.0)
579fbe59
TV
12Suggests: cogito
13Conflicts: git, cogito (<< 0.13)
7421abfd
EB
14Description: The git content addressable filesystem
15 GIT comes in two layers. The bottom layer is merely an extremely fast
16 and flexible filesystem-based database designed to store directory trees
17 with regard to their history. The top layer is a SCM-like tool which
18 enables human beings to work with the database in a manner to a degree
5acc5bfd
MU
19 similar to other SCM tools.
20
21Package: git-tk
b8c20680 22Architecture: all
5acc5bfd
MU
23Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4
24Description: The git content addressable filesystem, GUI add-on
25 This package contains 'gitk', the git revision tree visualizer.
7421abfd 26