From: Junio C Hamano Date: Tue, 15 Nov 2005 02:39:18 +0000 (-0800) Subject: GIT 0.99.9i aka 1.0rc2 X-Git-Tag: v0.99.9i^0 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60d64db4614b1007ca37c228923ec1964d5ad394?hp=-c GIT 0.99.9i aka 1.0rc2 Signed-off-by: Junio C Hamano --- 60d64db4614b1007ca37c228923ec1964d5ad394 diff --combined Makefile index e84acdc31f,63cb99847f..f4a3a332bb --- a/Makefile +++ b/Makefile @@@ -50,12 -50,14 +50,14 @@@ # 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.9h -GIT_VERSION = 0.99.9.GIT ++GIT_VERSION = 0.99.9i - # CFLAGS is for the users to override from the command line. + # CFLAGS and LDFLAGS are for the users to override from the command line. CFLAGS = -g -O2 -Wall + LDFLAGS = ALL_CFLAGS = $(CFLAGS) + ALL_LDFLAGS = $(LDFLAGS) prefix = $(HOME) bindir = $(prefix)/bin @@@ -90,11 -92,11 +92,11 @@@ SCRIPT_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-merge-ours.sh git-grep.sh \ - git-lost+found.sh + git-lost-found.sh SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ - git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \ + git-shortlog.perl git-fmt-merge-msg.perl \ git-svnimport.perl git-mv.perl git-cvsexportcommit.perl SCRIPT_PYTHON = \ @@@ -187,9 -189,11 +189,11 @@@ ifeq ($(uname_S),Darwin NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease ## fink - ALL_CFLAGS += -I/sw/include -L/sw/lib + ALL_CFLAGS += -I/sw/include + ALL_LDFLAGS += -L/sw/lib ## darwinports - ALL_CFLAGS += -I/opt/local/include -L/opt/local/lib + ALL_CFLAGS += -I/opt/local/include + ALL_LDFLAGS += -L/opt/local/lib endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease @@@ -211,7 -215,13 +215,13 @@@ endi ifeq ($(uname_S),OpenBSD) NO_STRCASESTR = YesPlease NEEDS_LIBICONV = YesPlease - ALL_CFLAGS += -I/usr/local/include -L/usr/local/lib + ALL_CFLAGS += -I/usr/local/include + ALL_LDFLAGS += -L/usr/local/lib + endif + ifeq ($(uname_S),NetBSD) + NEEDS_LIBICONV = YesPlease + ALL_CFLAGS += -I/usr/pkg/include + ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib endif ifneq (,$(findstring arm,$(uname_M))) ARM_SHA1 = YesPlease @@@ -221,7 -231,7 +231,7 @@@ endi ifndef NO_CURL ifdef CURLDIR - # This is still problematic -- gcc does not want -R. + # This is still problematic -- gcc does not always want -R. ALL_CFLAGS += -I$(CURLDIR)/include CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl else @@@ -369,12 -379,13 +379,13 @@@ git-cherry-pick: git-rever $(CC) -o $*.o -c $(ALL_CFLAGS) $< git-%$X: %.o $(LIB_FILE) - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) + $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) git-mailinfo$X : SIMPLE_LIB += $(LIB_4_ICONV) $(SIMPLE_PROGRAMS) : $(LIB_FILE) $(SIMPLE_PROGRAMS) : git-%$X : %.o - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIB_FILE) $(SIMPLE_LIB) + $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ + $(LIB_FILE) $(SIMPLE_LIB) git-http-fetch$X: fetch.o git-local-fetch$X: fetch.o @@@ -408,10 -419,10 +419,10 @@@ test: al $(MAKE) -C t/ all test-date$X: test-date.c date.o ctype.o - $(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o ctype.o + $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o test-delta$X: test-delta.c diff-delta.o patch-delta.o - $(CC) $(ALL_CFLAGS) -o $@ $^ + $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ check: for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i; done diff --combined debian/changelog index 5ea556a72c,376f0fa5a3..3d90d93f01 --- a/debian/changelog +++ b/debian/changelog @@@ -1,51 -1,9 +1,63 @@@ ++git-core (0.99.9i-0) unstable; urgency=low ++ ++ * GIT 0.99.9i aka 1.0rc2 ++ ++ -- Junio C Hamano Mon, 14 Nov 2005 18:38:27 -0800 ++ +git-core (0.99.9h-0) unstable; urgency=low + + * GIT 0.99.9h + + -- Junio C Hamano Fri, 11 Nov 2005 22:33:18 -0800 + +git-core (0.99.9g-0) unstable; urgency=low + + * GIT 0.99.9g + + -- Junio C Hamano Wed, 9 Nov 2005 21:01:55 -0800 + +git-core (0.99.9f-0) unstable; urgency=low + + * GIT 0.99.9f + + -- Junio C Hamano Tue, 8 Nov 2005 01:21:52 -0800 + +git-core (0.99.9e-0) unstable; urgency=low + + * GIT 0.99.9e + + -- Junio C Hamano Sun, 6 Nov 2005 18:37:18 -0800 + +git-core (0.99.9d-0) unstable; urgency=low + + * GIT 0.99.9d + + -- Junio C Hamano Sat, 5 Nov 2005 11:46:37 -0800 + +git-core (0.99.9c-0) unstable; urgency=low + + * GIT 0.99.9c + + -- Junio C Hamano Thu, 3 Nov 2005 15:44:54 -0800 + +git-core (0.99.9b-0) unstable; urgency=low + + * GIT 0.99.9b + + -- Junio C Hamano Tue, 1 Nov 2005 21:39:39 -0800 + +git-core (0.99.9a-0) unstable; urgency=low + + * GIT 0.99.9a + + -- Junio C Hamano 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. + + -- Junio C Hamano Sun, 13 Nov 2005 01:55:34 -0800 + git-core (0.99.9.GIT-1) unstable; urgency=low * Do not scatter txt and html documentation into feature