Skip to content

Commit

Permalink
Deb Packaging fixes: Build against Mozilla libs for Debian, conflict …
Browse files Browse the repository at this point in the history
…with "git"

This patch includes two fixes to the git-core Debian package:

    * Conflict with the GNU Interactive Tools package, which _also_
      wants to install /usr/bin/git.

    * Compile against the unencumbered Mozilla SHA1 code, instead of
      the iffy OpenSSL code, as much as possible.  This makes it easier to get
      the package included for distribution with Debian.

This has been based upon the original patch by Sebastian Kuzminsky
<seb@highlab.com>, but has been fixed up based upon feedback.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Ryan Anderson authored and Junio C Hamano committed Jul 27, 2005
1 parent bdf2514 commit a977d2c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
10 changes: 10 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 3 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down

0 comments on commit a977d2c

Please sign in to comment.