From: Matthias Urlichs Date: Fri, 16 Sep 2005 11:54:10 GMT Subject: [PATCH] Debian: build-depend on "bc", conflict with "git-scm" Message-ID: Build systems should run tests. This patch adds the necessary debian/control and debian/rules bits ("bc" was missing, t/t4002-diff-basic.sh wants it). It also makes the new Debian package conflict with the "git-scm" package that somebody else seems to have built independently. Signed-Off-By: Matthias Urlichs --- diff --git a/debian/rules b/debian/rules --- a/debian/rules +++ b/debian/rules @@ -41,7 +44,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: diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: git-core Section: devel Priority: optional Maintainer: Junio C Hamano -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 @@ -10,7 +10,8 @@ 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 Suggests: cogito -Conflicts: git, cogito (<< 0.13) +Conflicts: git, cogito (<< 0.13), git-scm +Replaces: git-scm 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 -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de - - "You and I as individuals can, by borrowing, live beyond our means, but only for a limited period of time. Why should we think that collectively, as a nation, we are not bound by that same limitation?" -- Ronald Reagan