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. This makes it easier to get the package
included for distribution with Debian.
Note: Assumes that Ryan Anderson's patch "Deb packages should include
the binaries" has been applied.
(Note - I fixed up the conflicts against my earlier packaging fixes -- Ryan)
Signed-off-by: Sebastian Kuzminsky <[EMAIL PROTECTED]>
Signed-off-by: Ryan Anderson <[EMAIL PROTECTED]>
---
debian/changelog | 11 +++++++++++
debian/control | 3 ++-
debian/rules | 14 ++++++++++++++
3 files changed, 27 insertions(+), 1 deletions(-)
c651cdc175712c26d4b9c8b75b44a89eb1b74752
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+git-core (0.99.1-1) unstable; urgency=low
+
+ * Conflict with the GNU Interactive Tools package, which also installs
+ /usr/bin/git.
+ * Dont compile against the OpenSSL SHA1 code, it's problematically
+ licensed. Instead use the PPC assembly on PPC, and the code ripped
+ from Mozilla everywhere else.
+ * Minor tweaks to the Build-Depends.
+
+ -- Sebastian Kuzminsky <[EMAIL PROTECTED]> Thu, 21 Jul 2005 01:28:35 -0600
+
git-core (0.99-1) unstable; urgency=low
* Update deb package support to build correctly.
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Standards-Version: 3.6.1
Package: git-core
Architecture: any
-Depends: ${misc:Depends}, shellutils, diff, rsync, rcs
+Depends: ${misc:Depends}, patch, diff, rsync, rcs, wget, rsh-client
+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
--- 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/
--
Ryan Anderson
sometimes Pug Majere
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
