From: Junio C Hamano Date: Mon, 14 Nov 2005 21:50:05 +0000 (-0800) Subject: Merge branch 'svnup' of http://netz.smurf.noris.de/git/git X-Git-Tag: v0.99.9i^2~8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b6ebac9e4316cd5d35c2c24f83f1eb51ce17beb9;p=git.git Merge branch 'svnup' of netz.smurf.noris.de/git/git Signed-off-by: Junio C Hamano --- b6ebac9e4316cd5d35c2c24f83f1eb51ce17beb9 diff --cc debian/control index 3935e33f4,965fb6281..ded0a576d --- a/debian/control +++ b/debian/control @@@ -2,7 -2,7 +2,7 @@@ Source: git-cor Section: devel Priority: optional Maintainer: Junio C Hamano - Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 6.0.3), xmlto, debhelper (>= 4.0.0), bc, libexpat1-dev -Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 7), xmlto, debhelper (>= 4.0.0), bc ++Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 7), xmlto, debhelper (>= 4.0.0), bc, libexpat-dev Standards-Version: 3.6.1 Package: git-core