From: Junio C Hamano Date: Sun, 4 Dec 2005 07:46:02 +0000 (-0800) Subject: GIT 0.99.9l aka 1.0rc4 X-Git-Tag: v0.99.9l^0 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/423325a2d24638ddcc82ce47be5e40be550f4507?ds=inline;hp=-c GIT 0.99.9l aka 1.0rc4 --- 423325a2d24638ddcc82ce47be5e40be550f4507 diff --combined Makefile index adff025a8a,df3c6eb81e..ba05986c40 --- a/Makefile +++ b/Makefile @@@ -1,3 -1,6 +1,6 @@@ + # The default target of this Makefile is... + all: + # Define MOZILLA_SHA1 environment variable when running make to make use of # a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast # on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default @@@ -18,6 -21,8 +21,8 @@@ # # Define NO_STRCASESTR if you don't have strcasestr. # + # Define NO_SETENV if you don't have setenv in the C library. + # # Define PPC_SHA1 environment variable when running make to make use of # a bundled SHA1 routine optimized for PowerPC. # @@@ -50,7 -55,7 +55,7 @@@ # 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.9k -GIT_VERSION = 0.99.9.GIT ++GIT_VERSION = 0.99.9l # CFLAGS and LDFLAGS are for the users to override from the command line. @@@ -138,8 -143,6 +143,6 @@@ ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PRO # Backward compatibility -- to be removed after 1.0 PROGRAMS += git-ssh-pull$X git-ssh-push$X - GIT_LIST_TWEAK = - # Set paths to tools early so that they can be used for version tests. ifndef SHELL_PATH SHELL_PATH = /bin/sh @@@ -154,20 -157,6 +157,6 @@@ endi PYMODULES = \ gitMergeCommon.py - ifdef WITH_OWN_SUBPROCESS_PY - PYMODULES += compat/subprocess.py - else - ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK) - PYMODULES += compat/subprocess.py - endif - endif - - ifdef WITH_SEND_EMAIL - SCRIPT_PERL += git-send-email.perl - else - GIT_LIST_TWEAK += -e '/^send-email$$/d' - endif - LIB_FILE=libgit.a LIB_H = \ @@@ -207,6 -196,7 +196,7 @@@ shellquote = '$(call shq,$(1)) uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') + uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') ifeq ($(uname_S),Darwin) NEEDS_SSL_WITH_CRYPTO = YesPlease @@@ -224,6 -214,9 +214,9 @@@ ifeq ($(uname_S),SunOS NEEDS_LIBICONV = YesPlease SHELL_PATH = /bin/bash NO_STRCASESTR = YesPlease + ifeq ($(uname_R),5.8) + NO_SETENV = YesPlease + endif INSTALL = ginstall TAR = gtar ALL_CFLAGS += -D__EXTENSIONS__ @@@ -256,6 -249,18 +249,18 @@@ endi -include config.mak + ifdef WITH_OWN_SUBPROCESS_PY + PYMODULES += compat/subprocess.py + else + ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK) + PYMODULES += compat/subprocess.py + endif + endif + + ifdef WITH_SEND_EMAIL + SCRIPT_PERL += git-send-email.perl + endif + ifndef NO_CURL ifdef CURLDIR # This is still problematic -- gcc does not always want -R. @@@ -315,12 -320,16 +320,16 @@@ ifdef NEEDS_NS SIMPLE_LIB += -lnsl endif ifdef NO_STRCASESTR - ALL_CFLAGS += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1 - LIB_OBJS += compat/strcasestr.o + COMPAT_CFLAGS += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1 + COMPAT_OBJS += compat/strcasestr.o + endif + ifdef NO_SETENV + COMPAT_CFLAGS += -Dsetenv=gitsetenv -DNO_SETENV=1 + COMPAT_OBJS += compat/setenv.o endif ifdef NO_MMAP - ALL_CFLAGS += -Dmmap=gitfakemmap -Dmunmap=gitfakemunmap -DNO_MMAP - LIB_OBJS += compat/mmap.o + COMPAT_CFLAGS += -Dmmap=gitfakemmap -Dmunmap=gitfakemunmap -DNO_MMAP + COMPAT_OBJS += compat/mmap.o endif ifdef NO_IPV6 ALL_CFLAGS += -DNO_IPV6 -Dsockaddr_storage=sockaddr_in @@@ -344,8 -353,8 +353,8 @@@ endi endif endif - ALL_CFLAGS += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER)) - + ALL_CFLAGS += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER)) $(COMPAT_CFLAGS) + LIB_OBJS += $(COMPAT_OBJS) export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir ### Build rules @@@ -354,10 -363,9 +363,9 @@@ all: $(ALL_PROGRAMS all: $(MAKE) -C templates - # Only use $(CFLAGS). We don't need anything else. - git$(X): git.c Makefile + git$(X): git.c $(COMPAT_OBJS) Makefile $(CC) -DGIT_EXEC_PATH='"$(bindir)"' -DGIT_VERSION='"$(GIT_VERSION)"' \ - $(CFLAGS) $< -o $@ + $(CFLAGS) $(COMPAT_CFLAGS) -o $@ $(filter %.c,$^) $(filter %.o,$^) $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh rm -f $@ diff --combined debian/changelog index 7356fe7780,376f0fa5a3..7e5d1ac880 --- a/debian/changelog +++ b/debian/changelog @@@ -1,69 -1,3 +1,75 @@@ ++git-core (0.99.9l-0) unstable; urgency=low ++ ++ * GIT 0.99.9l aka 1.0rc4 ++ ++ -- Junio C Hamano 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 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 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 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.