Updated git to version 1.6.3.3.

The fill-paragraph patch is obsolete; it's now part of the distribution.

svn path=/nixpkgs/trunk/; revision=16148

pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch

@@ -1,29 +1,25 @@
-This patch does two things: (1) use the right name for `docbook2texi',
-and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
-node names).
-
-diff --git a/Documentation/Makefile b/Documentation/Makefile
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -48,7 +48,7 @@ DOC_REF = origin/man
+diff -u -r -w git-1.6.3.3.orig/Documentation/Makefile git-1.6.3.3/Documentation/Makefile
+--- git-1.6.3.3.orig/Documentation/Makefile	2009-07-02 17:07:17.000000000 +0200
++++ git-1.6.3.3/Documentation/Makefile	2009-07-02 17:08:49.000000000 +0200
+@@ -51,7 +51,7 @@
  infodir?=$(prefix)/share/info
  MAKEINFO=makeinfo
  INSTALL_INFO=install-info
 -DOCBOOK2X_TEXI=docbook2x-texi
 +DOCBOOK2X_TEXI=docbook2texi
+ DBLATEX=dblatex
  ifndef PERL_PATH
  	PERL_PATH = /usr/bin/perl
- endif
-@@ -84,7 +84,7 @@ man1: $(DOC_MAN1)
+@@ -153,7 +153,7 @@
  man5: $(DOC_MAN5)
  man7: $(DOC_MAN7)
  
 -info: git.info gitman.info
 +info: git.info
  
- install: man
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
-@@ -96,10 +96,9 @@ install: man
+ pdf: user-manual.pdf
+ 
+@@ -169,10 +169,9 @@
  
  install-info: info
  	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
@@ -35,3 +31,5 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
  	else \
  	  echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
  	fi
+Only in git-1.6.3.3/Documentation: Makefile.orig
+Only in git-1.6.3.3/Documentation: Makefile.rej