From: Junio C Hamano Date: Fri, 12 Aug 2005 05:12:29 +0000 (-0700) Subject: Merge changes in the master branch into 0.99.5 preparation branch. X-Git-Tag: v0.99.5~24 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8eb14dc1882ade6f881ae93dfd7ecaa0dc0f0fdc?hp=-c Merge changes in the master branch into 0.99.5 preparation branch. --- 8eb14dc1882ade6f881ae93dfd7ecaa0dc0f0fdc diff --combined Makefile index f8d74e08a8,e8441af577..6bc3ed7977 --- a/Makefile +++ b/Makefile @@@ -32,7 -32,7 +32,7 @@@ # DEFINES += -DUSE_STDEV -GIT_VERSION=0.99.4 +GIT_VERSION=0.99.5 COPTS?=-g -O2 CFLAGS+=$(COPTS) -Wall $(DEFINES) @@@ -244,7 -244,8 +244,8 @@@ deb: dis clean: rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE) - rm -f $(GIT_TARNAME).tar.gz git-core.spec git-core_$(GIT_VERSION)-*.deb + rm -f $(GIT_TARNAME).tar.gz git-core.spec + rm -f git-core_$(GIT_VERSION)-*.deb git-tk_$(GIT_VERSION)-*.deb rm -rf $(GIT_TARNAME) $(MAKE) -C tools/ clean $(MAKE) -C Documentation/ clean diff --combined debian/changelog index dd86f82d8b,85d4d0094f..28cfb0f84f --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,11 +1,17 @@@ +git-core (0.99.5-0) unstable; urgency=low + + * GIT 0.99.5 + + -- Junio C Hamano Wed, 10 Aug 2005 22:05:00 -0700 + + git-core (0.99.4-3) unstable; urgency=low + + * Split off gitk. + * Do not depend on diff which is an essential package. + * Use dh_movefiles, not dh_install, to stage two subpackages. + + -- Matthias Urlichs Thu, 11 Aug 2005 01:43:24 +0200 + git-core (0.99.4-2) unstable; urgency=low * Git 0.99.4 official release.