Merge changes in the master branch into 0.99.5 preparation branch.

diff --combined Makefile
index f8d74e08a802f96fe0345d32d54b05be1f8b5a6a,e8441af577cca50ba13369a8e3cb98b3a7ea0268..6bc3ed79775f12be1abffbd334127b8a9814b07e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION=0.99.4
 +GIT_VERSION=0.99.5
  
  COPTS?=-g -O2
  CFLAGS+=$(COPTS) -Wall $(DEFINES)
@@@ -244,7 -244,8 +244,8 @@@ deb: dis
  
  clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
-       rm -f $(GIT_TARNAME).tar.gz git-core.spec git-core_$(GIT_VERSION)-*.deb
+       rm -f $(GIT_TARNAME).tar.gz git-core.spec
+       rm -f git-core_$(GIT_VERSION)-*.deb git-tk_$(GIT_VERSION)-*.deb
        rm -rf $(GIT_TARNAME)
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean

diff --combined debian/changelog
index dd86f82d8b3fba7974b7d6276a843b8afa31861e,85d4d0094f01b9849de562c35ae54e1be7c870f1..28cfb0f84fb497596e27a554a5b166a301104f70
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +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-3) unstable; urgency=low
+ 
+   * Split off gitk.
+   * Do not depend on diff which is an essential package.
+   * Use dh_movefiles, not dh_install, to stage two subpackages.
+ 
+  -- Matthias Urlichs <smurf@debian.org>  Thu, 11 Aug 2005 01:43:24 +0200
+ 
  git-core (0.99.4-2) unstable; urgency=low
  
    * Git 0.99.4 official release.