Merge with master.
This merges commit
e8c80638abc99928dba9ac832589749a531e2e21
from master into our head commit
bdb71a41caa9ffed2e3207736c21fffbc2007670
Sincerely,
jit-merge command.
diff --git a/Makefile b/Makefile
index 5efb626..e0ea88f 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
# DEFINES += -DUSE_STDEV
-GIT_VERSION=0.99.3
+GIT_VERSION=0.99.4
COPTS?=-g -O2
CFLAGS+=$(COPTS) -Wall $(DEFINES)
@@ -157,7 +157,9 @@
all:
$(MAKE) -C templates
-.PRECIOUS: %.o
+.SECONDARY: %.o
+.c.o:
+ $(CC) $(CFLAGS) -o $*.o -c $*.c
git-%: %.o $(LIB_FILE)
$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
@@ -233,17 +235,17 @@
rpm: dist
$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
-
-backup: clean
- cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
+deb: dist
+ rm -rf $(GIT_TARNAME)
+ tar zxf $(GIT_TARNAME).tar.gz
+ cd $(GIT_TARNAME) && fakeroot debian/rules binary
### Cleaning rules
clean:
rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
- rm -f git-core-*.tar.gz git-core.spec
+ rm -f $(GIT_TARNAME).tar.gz git-core.spec git-core_$(GIT_VERSION)-*.deb
+ rm -rf $(GIT_TARNAME)
$(MAKE) -C tools/ clean
$(MAKE) -C Documentation/ clean
$(MAKE) -C templates/ clean
diff --git a/debian/changelog b/debian/changelog
index 1e62b78..5e86a86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (0.99.4-1) unstable; urgency=low
+
+ * Pass prefix down to the submake when building.
+
+ -- Junio C Hamano <junkio@cox.net> Sat, 6 Aug 2005 13:00:00 -0700
+
git-core (0.99-2) unstable; urgency=low
* Conflict with the GNU Interactive Tools package, which also installs
diff --git a/debian/control b/debian/control
index ae1912c..8bdbd73 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: git-core
Section: devel
Priority: optional
-Maintainer: Linus Torvalds <torvalds@osdl.org>
+Maintainer: Junio C Hamano <junkio@cox.net>
Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev, asciidoc > 6.0.3, xmlto, debhelper (>= 4.0.0)
Standards-Version: 3.6.1
diff --git a/debian/rules b/debian/rules
index 67830b0..2c575ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@
build: debian/build-stamp
debian/build-stamp:
dh_testdir
- $(MAKE) all doc
+ $(MAKE) prefix=$(PREFIX) all doc
touch debian/build-stamp
debian-clean:
@@ -56,7 +56,7 @@
dh_clean -k
dh_installdirs
- make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-doc
+ make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-tools install-doc
mkdir -p $(DOC_DESTDIR)
find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'
diff --git a/git-core.spec.in b/git-core.spec.in
index 5d1ffa3..8f079db 100644
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -2,7 +2,7 @@
Name: git-core
Version: @@VERSION@@
Release: 1
-Vendor: Linus Torvalds <torvalds@osdl.org>
+Vendor: Junio C Hamano <junkio@cox.net>
Summary: Git core and tools
License: GPL
Group: Development/Tools
@@ -10,25 +10,26 @@
Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Prereq: sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
+Requires: sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
%description
-GIT comes in two layers. The bottom layer is merely an extremely fast
-and flexible filesystem-based database designed to store directory trees
-with regard to their history. The top layer is a SCM-like tool which
-enables human beings to work with the database in a manner to a degree
-similar to other SCM tools (like CVS, BitKeeper or Monotone).
+This is a stupid (but extremely fast) directory content manager. It
+doesn't do a whole lot, but what it _does_ do is track directory
+contents efficiently. It is intended to be the base of an efficient,
+distributed source code management system. This package includes
+rudimentary tools that can be used as a SCM, but you should look
+elsewhere for tools for ordinary humans layered on top of this.
%prep
%setup -q
%build
-
-make all %{!?_without_docs: doc}
+make prefix=%{_prefix} all %{!?_without_docs: doc}
%install
rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} install %{!?_without_docs: install-doc}
+make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+ install install-tools %{!?_without_docs: install-doc}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -36,13 +37,20 @@
%files
%defattr(-,root,root)
%{_bindir}/*
+%{_datadir}/git-core/templates/*
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }
%{!?_without_docs: %{_mandir}/man1/*.1.gz}
%{!?_without_docs: %{_mandir}/man7/*.7.gz}
%changelog
+* Sun Aug 07 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
+- Redid the description
+- Cut overlong make line, loosened changelog a bit
+- I think Junio (or perhaps OSDL?) should be vendor...
+
* Thu Jul 14 2005 Eric Biederman <ebiederm@xmission.com>
- Add the man pages, and the --without docs build option
+
* Wed Jul 7 2005 Chris Wright <chris@osdl.org>
- initial git spec file
