Gilles Filippini a écrit , Le 08/02/2014 13:47: > I'll update the patch to install the doc.
Here it is. $ debc ../git_1.9.0~rc3-1.1_i386.changes git-doc | grep 'git-subtree' -rw-r--r-- root/root 36053 2014-02-08 16:16 ./usr/share/doc/git-doc/git-subtree.html -rw-r--r-- root/root 12776 2014-02-08 16:16 ./usr/share/doc/git-doc/git-subtree.txt Thanks, _g.
From f680b7c66e62c0ae9ff12d9acda264c1f936aa86 Mon Sep 17 00:00:00 2001 From: Gilles Filippini <p...@debian.org> Date: Sat, 8 Feb 2014 16:18:40 +0100 Subject: [PATCH] Install git-subtree from contrib. --- debian/changelog | 7 +++++++ debian/rules | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index 69356a5..9888ac8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git (1:1.9.0~rc3-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install git-subtree from contrib. + + -- Gilles Filippini <p...@debian.org> Sat, 08 Feb 2014 11:31:43 +0100 + git (1:1.9.0~rc3-1) unstable; urgency=low * new upstream release candidate. diff --git a/debian/rules b/debian/rules index 69cb7a8..74af09e 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS) STRIP =strip TEST =test OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core \ + libexecdir=/usr/lib/git-core \ mandir=/usr/share/man htmldir=/usr/share/doc/git/html \ INSTALLDIRS=vendor \ NO_PYTHON=1 \ @@ -66,9 +67,14 @@ build-arch: deb-checkdir build-arch-stamp build-arch-stamp: patch-stamp -$(CC) -v DESTDIR='$(GIT)' $(MAKE) all $(OPTS) + DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree all $(OPTS) + ln -s contrib/subtree/git-subtree test -z '$(TEST)' || \ DESTDIR='$(GIT)' $(MAKE) $(TEST) $(OPTS) || \ GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)' $(MAKE) $(TEST) $(OPTS) + test -z '$(TEST)' || \ + DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree $(TEST) $(OPTS) prefix= || \ + GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree $(TEST) $(OPTS) prefix= touch build-arch-stamp build-indep: deb-checkdir build-indep-stamp @@ -115,6 +121,7 @@ clean: deb-checkdir rm -rf '$(GIT)'$$i; \ done rm -f debian/files debian/substvars + rm -f git-subtree install: install-arch install-indep git.install: install-arch @@ -123,6 +130,7 @@ install-arch: deb-checkdir deb-checkuid build-arch-stamp rm -rf '$(GIT)' install -d -m0755 '$(GIT)'/usr/bin DESTDIR='$(GIT)' $(MAKE) install $(OPTS) + DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree install $(OPTS) install -d -m0755 '$(GIT)'/var/lib/git rm -f '$(GIT)'/usr/share/perl5/Error.pm rm -rf '$(GIT)'/usr/share/man @@ -197,12 +205,16 @@ install-indep: build-arch-stamp build-indep-stamp INSTLIBDIR=/usr/share/perl5 $(MAKE) -CDocumentation install-webdoc WEBDOC_DEST='$(TMP)'/html \ 2>/dev/null + $(MAKE) -C contrib/subtree doc $(OPTS) + install -m 0644 contrib/subtree/git-subtree.txt '$(TMP)'/html + install -m 0644 contrib/subtree/git-subtree.html '$(TMP)'/html # RelNotes are shipped in git rm -rf '$(TMP)'/html/RelNotes # git-man rm -rf '$(GIT)'-man install -d -m0755 '$(GIT)'-man/usr/share/man/man3 DESTDIR='$(GIT)'-man $(MAKE) install-doc $(OPTS) + PATH=$$PATH:$(CURDIR) DESTDIR='$(GIT)'-man $(MAKE) -C contrib/subtree install-doc $(OPTS) install -m 0644 '$(TMP)'/usr/share/man/man3/Git* \ '$(GIT)'-man/usr/share/man/man3/ # don't include arch, cvs, svn, email, gui, and gitk man pages -- 1.8.5.3
signature.asc
Description: OpenPGP digital signature
