diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-10 17:46:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-10 19:46:53 -0700 |
| commit | 720d150c48fc35fca13c6dfb3c76d60e4ee83b87 (patch) | |
| tree | 7b6a98c985a6bc2f5e0a66c3ea15ac0a0e081269 /debian | |
| parent | 0f69be537618036c45bc07919248b88afbf7af3e (diff) | |
| download | git-720d150c48fc35fca13c6dfb3c76d60e4ee83b87.tar.gz git-720d150c48fc35fca13c6dfb3c76d60e4ee83b87.tar.xz | |
Add a new merge strategy by Fredrik Kuivinen.
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>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 6735a0da0..33a8f852b 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 +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 diff --git a/debian/rules b/debian/rules index 86464bf30..1a53ca239 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,7 @@ MAN_DESTDIR := $(DESTDIR)/$(MANDIR) build: debian/build-stamp debian/build-stamp: dh_testdir - $(MAKE) prefix=$(PREFIX) all doc + $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all doc touch debian/build-stamp debian-clean: |