diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 14 |
3 files changed, 27 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7cbf2f4..1e62b78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +git-core (0.99-2) unstable; urgency=low + + * Conflict with the GNU Interactive Tools package, which also installs + /usr/bin/git. + * Use the Mozilla SHA1 code and/or the PPC assembly in preference to + OpenSSL. This is only a partial fix for the license issues with OpenSSL. + * Minor tweaks to the Depends. + + -- Ryan Anderson <ryan@michonline.com> Sat, 23 Jul 2005 14:15:00 -0400 + git-core (0.99-1) unstable; urgency=low * Update deb package support to build correctly. diff --git a/debian/control b/debian/control index a774a62..98c81c7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,9 @@ Standards-Version: 3.6.1 Package: git-core Architecture: any -Depends: ${misc:Depends}, shellutils, diff, rsync, rcs +Depends: ${shlibs:Depends}, ${misc:Depends}, patch, diff, rcs +Recommends: rsync, curl, ssh +Conflicts: git 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 diff --git a/debian/rules b/debian/rules index aff43b8..67830b0 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,20 @@ else endif export CFLAGS +# +# On PowerPC we compile against the hand-crafted assembly, on all +# other architectures we compile against GPL'ed sha1 code lifted +# from Mozilla. OpenSSL is strangely licensed and best avoided +# in Debian. +# +HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) +ifeq (${HOST_ARCH},powerpc) + export PPC_SHA1=YesPlease +else + export MOZILLA_SHA1=YesPlease +endif + + PREFIX := /usr MANDIR := /usr/share/man/ |