GIT 0.99.9c

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

diff --combined Makefile
index 5606c83160b972edbd33399d6fd1f49255ae233d,6c01dc29537a7926f1e57c4fe115334c4cdc036c..f96da678226a117bba7d20e2054c5bbe5a84f997
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -52,7 -52,7 +52,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
- GIT_VERSION = 0.99.9b
 -GIT_VERSION = 0.99.9.GIT
++GIT_VERSION = 0.99.9c
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@@ -89,7 -89,7 +89,7 @@@ SCRIPT_SH = 
        git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
        git-applymbox.sh git-applypatch.sh git-am.sh \
        git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
-       git-merge-resolve.sh git-grep.sh
+       git-merge-resolve.sh git-merge-ours.sh git-grep.sh
  
  SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
@@@ -189,9 -189,9 +189,9 @@@ endi
  ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease
        NEEDS_NSL = YesPlease
+       NEEDS_LIBICONV = YesPlease
        SHELL_PATH = /bin/bash
        NO_STRCASESTR = YesPlease
-       CURLDIR = /opt/sfw
        INSTALL = ginstall
        TAR = gtar
        PLATFORM_DEFINES += -D__EXTENSIONS__
@@@ -397,8 -397,8 +397,8 @@@ doc
  test: all
        $(MAKE) -C t/ all
  
- test-date$X: test-date.c date.o
-       $(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o
+ test-date$X: test-date.c date.o ctype.o
+       $(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o ctype.o
  
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
        $(CC) $(ALL_CFLAGS) -o $@ $^

diff --combined debian/changelog
index ee68af5020ea889a27989ac9e429fed14dded35d,5fd31b7ef4ffb0854571d810ba85f81e2d998a77..cc9766018565b6b117774dce3395472290c5dd49
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,3 +1,21 @@@
++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-0) unstable; urgency=low
  
    * GIT 0.99.9