From: Junio C Hamano <junkio@cox.net>
Date: Sat, 13 Aug 2005 07:12:51 +0000 (-0700)
Subject: Merge master changes into release candidate branch.
X-Git-Tag: v0.99.5~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=755d62788f0507781dbbf0ed1278b65ff4829185;p=git.git

Merge master changes into release candidate branch.

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

755d62788f0507781dbbf0ed1278b65ff4829185
diff --cc Makefile
index 6bc3ed797,76f36cd36..ff3d7e3fa
--- a/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 28cfb0f84,2788cdd90..da7526e2c
--- a/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.