720d150c48
I really wanted to try this out, instead of asking for an adjustment to the 'git merge' driver and waiting. For now the new strategy is called 'fredrik' and not in the list of default strategies to be tried. The script wants Python 2.4 so this commit also adjusts Debian and RPM build procecure files. Signed-off-by: Junio C Hamano <junkio@cox.net>
27 lines
1.0 KiB
Plaintext
27 lines
1.0 KiB
Plaintext
Source: git-core
|
|
Section: devel
|
|
Priority: optional
|
|
Maintainer: Junio C Hamano <junkio@cox.net>
|
|
Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev, asciidoc (>= 6.0.3), xmlto, debhelper (>= 4.0.0)
|
|
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)
|
|
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
|
|
with regard to their history. The top layer is a SCM-like tool which
|
|
enables human beings to work with the database in a manner to a degree
|
|
similar to other SCM tools.
|
|
|
|
Package: git-tk
|
|
Architecture: all
|
|
Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4
|
|
Description: The git content addressable filesystem, GUI add-on
|
|
This package contains 'gitk', the git revision tree visualizer.
|
|
|