GIT 0.99.9m aka 1.0rc5

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

diff --combined Makefile
index ba05986,01b6643..8b433d1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -55,7 -55,7 +55,7 @@@ all
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-cache perspective.
  
- GIT_VERSION = 0.99.9l
 -GIT_VERSION = 0.99.9.GIT
++GIT_VERSION = 0.99.9m
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@@ -162,7 -162,7 +162,7 @@@ LIB_FILE=libgit.
  LIB_H = \
        blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
        diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \
-       run-command.h strbuf.h tag.h tree.h
+       run-command.h strbuf.h tag.h tree.h git-compat-util.h
  
  DIFF_OBJS = \
        diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
@@@ -243,6 -243,10 +243,10 @@@ ifeq ($(uname_S),NetBSD
        ALL_CFLAGS += -I/usr/pkg/include
        ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
  endif
+ ifeq ($(uname_S),AIX)
+       NO_STRCASESTR=YesPlease
+       NEEDS_LIBICONV=YesPlease
+ endif
  ifneq (,$(findstring arm,$(uname_M)))
        ARM_SHA1 = YesPlease
  endif
@@@ -320,15 -324,15 +324,15 @@@ ifdef NEEDS_NS
        SIMPLE_LIB += -lnsl
  endif
  ifdef NO_STRCASESTR
-       COMPAT_CFLAGS += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
+       COMPAT_CFLAGS += -DNO_STRCASESTR
        COMPAT_OBJS += compat/strcasestr.o
  endif
  ifdef NO_SETENV
-       COMPAT_CFLAGS += -Dsetenv=gitsetenv -DNO_SETENV=1
+       COMPAT_CFLAGS += -DNO_SETENV
        COMPAT_OBJS += compat/setenv.o
  endif
  ifdef NO_MMAP
-       COMPAT_CFLAGS += -Dmmap=gitfakemmap -Dmunmap=gitfakemunmap -DNO_MMAP
+       COMPAT_CFLAGS += -DNO_MMAP
        COMPAT_OBJS += compat/mmap.o
  endif
  ifdef NO_IPV6
@@@ -363,9 -367,9 +367,9 @@@ all: $(ALL_PROGRAMS
  all:
        $(MAKE) -C templates
  
- git$(X): git.c $(COMPAT_OBJS) Makefile
+ git$X: git.c $(LIB_FILE) Makefile
        $(CC) -DGIT_EXEC_PATH='"$(bindir)"' -DGIT_VERSION='"$(GIT_VERSION)"' \
-               $(CFLAGS) $(COMPAT_CFLAGS) -o $@ $(filter %.c,$^) $(filter %.o,$^)
+               $(CFLAGS) $(COMPAT_CFLAGS) -o $@ $(filter %.c,$^) $(LIB_FILE)
  
  $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
        rm -f $@

diff --combined debian/changelog
index 7e5d1ac,376f0fa..3a98210
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,75 -1,3 +1,81 @@@
++git-core (0.99.9m-0) unstable; urgency=low
++
++  * GIT 0.99.9m aka 1.0rc5
++
++ -- Junio C Hamano <junkio@cox.net>  Sun, 11 Dec 2005 16:48:06 -0800
++
 +git-core (0.99.9l-0) unstable; urgency=low
 +
 +  * GIT 0.99.9l aka 1.0rc4
 +
 + -- Junio C Hamano <junkio@cox.net>  Sat,  3 Dec 2005 23:45:23 -0800
 +
 +git-core (0.99.9k-0) unstable; urgency=low
 +
 +  * GIT 0.99.9k but not 1.0rc yet.
 +
 + -- Junio C Hamano <junkio@cox.net>  Fri, 25 Nov 2005 16:33:11 -0800
 +
 +git-core (0.99.9j-0) unstable; urgency=low
 +
 +  * GIT 0.99.9j aka 1.0rc3
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 16 Nov 2005 20:39:55 -0800
 +
 +git-core (0.99.9i-0) unstable; urgency=low
 +
 +  * GIT 0.99.9i aka 1.0rc2
 +
 + -- Junio C Hamano <junkio@cox.net>  Mon, 14 Nov 2005 18:38:27 -0800
 +
 +git-core (0.99.9h-0) unstable; urgency=low
 +
 +  * GIT 0.99.9h
 +
 + -- Junio C Hamano <junkio@cox.net>  Fri, 11 Nov 2005 22:33:18 -0800
 +
 +git-core (0.99.9g-0) unstable; urgency=low
 +
 +  * GIT 0.99.9g
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed,  9 Nov 2005 21:01:55 -0800
 +
 +git-core (0.99.9f-0) unstable; urgency=low
 +
 +  * GIT 0.99.9f
 +
 + -- Junio C Hamano <junkio@cox.net>  Tue,  8 Nov 2005 01:21:52 -0800
 +
 +git-core (0.99.9e-0) unstable; urgency=low
 +
 +  * GIT 0.99.9e
 +
 + -- Junio C Hamano <junkio@cox.net>  Sun,  6 Nov 2005 18:37:18 -0800
 +
 +git-core (0.99.9d-0) unstable; urgency=low
 +
 +  * GIT 0.99.9d
 +
 + -- Junio C Hamano <junkio@cox.net>  Sat,  5 Nov 2005 11:46:37 -0800
 +
 +git-core (0.99.9c-0) unstable; urgency=low
 +
 +  * GIT 0.99.9c
 +
 + -- Junio C Hamano <junkio@cox.net>  Thu,  3 Nov 2005 15:44:54 -0800
 +
 +git-core (0.99.9b-0) unstable; urgency=low
 +
 +  * GIT 0.99.9b
 +
 + -- Junio C Hamano <junkio@cox.net>  Tue,  1 Nov 2005 21:39:39 -0800
 +
 +git-core (0.99.9a-0) unstable; urgency=low
 +
 +  * GIT 0.99.9a
 +
 + -- Junio C Hamano <junkio@cox.net>  Sun, 30 Oct 2005 15:03:32 -0800
 +
  git-core (0.99.9.GIT-2) unstable; urgency=low
  
    * Build Dependency did not include libexpat-dev.