Merge master changes into release candidate branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --cc Makefile
index 6bc3ed79775f12be1abffbd334127b8a9814b07e,76f36cd3608b290707a7ad4c4e20d93951a6724c..ff3d7e3fadd5b0eb8e41e59462e0542f1e162ee1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,20 -32,20 +32,20 @@@
  
  # DEFINES += -DUSE_STDEV
  
- GIT_VERSION=0.99.5
 -GIT_VERSION = 0.99.4
++GIT_VERSION = 0.99.5
  
- COPTS?=-g -O2
- CFLAGS+=$(COPTS) -Wall $(DEFINES)
+ CFLAGS = -g -O2 -Wall
+ ALL_CFLAGS = $(CFLAGS) $(DEFINES)
  
- prefix=$(HOME)
- bindir=$(prefix)/bin
- template_dir=$(prefix)/share/git-core/templates/
- # dest=
+ prefix = $(HOME)
+ bindir = $(prefix)/bin
+ template_dir = $(prefix)/share/git-core/templates/
+ # DESTDIR=
  
- CC?=gcc
- AR?=ar
- INSTALL?=install
- RPMBUILD?=rpmbuild
+ CC = gcc
+ AR = ar
+ INSTALL = install
+ RPMBUILD = rpmbuild
  
  # sparse is architecture-neutral, which means that we need to tell it
  # explicitly what architecture to check for. Fix this up for yours..

diff --cc debian/changelog
index 28cfb0f84fb497596e27a554a5b166a301104f70,2788cdd9095fee149ed7c11f4bf1d350462cd46e..da7526e2cbaf6cf737515032b916d5e2e54d677e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +git-core (0.99.5-0) unstable; urgency=low
 +
 +  * GIT 0.99.5
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 10 Aug 2005 22:05:00 -0700
 +
+ git-core (0.99.4-4) unstable; urgency=low
+ 
+   * Mark git-tk as architecture neutral.
+ 
+  -- Junio C Hamano <junkio@cox.net>  Fri, 12 Aug 2005 13:25:00 -0700
+ 
  git-core (0.99.4-3) unstable; urgency=low
  
    * Split off gitk.