diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-18 01:18:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-18 01:18:15 -0700 |
| commit | 8ac93bc98f5e868e890e1a740df9f0c6513189c8 (patch) | |
| tree | c1c1e3c93a3ca5adc86d67d4d55544bab09f2586 /debian | |
| parent | 4803c2802c11525b11d106247661ea13b2a9ce98 (diff) | |
| parent | 85d106c267ec26f398e0aaf352d8011f661c459a (diff) | |
| download | git-8ac93bc98f5e868e890e1a740df9f0c6513189c8.tar.gz | |
Merge branch 'master' of .
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 33a8f852b9..5d75c325e2 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ 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) +Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev, asciidoc (>= 6.0.3), xmlto, debhelper (>= 4.0.0), bc 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) +Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl, python (>= 2.4.0), less Suggests: cogito Conflicts: git, cogito (<< 0.13) Description: The git content addressable filesystem diff --git a/debian/rules b/debian/rules index 1a53ca2398..568d430932 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) PYTHON_PATH=/usr/bin/python2.4 all doc + $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all doc test touch debian/build-stamp debian-clean: |