Hi, Gilles Filippini a écrit , Le 01/03/2014 17:58: > Jonathan Nieder a écrit , Le 28/02/2014 01:14: >> The prefix= bit points to an upstream bug --- if you have time, it >> would be nice to get that fixed (but of course that wouldn't block the >> upload). > > I've submitted a patch to upstream: > <http://thread.gmane.org/gmane.comp.version-control.git/243103>
I've had no answer at all from upstream about my patch proposal, and I don't want to stay subscribed any longer to their list (way to much traffic). Hence I've just re-submitted the problem as a bug report [1] and I'll stop there. [1] <http://thread.gmane.org/gmane.comp.version-control.git/244248> New patch attached. Thanks, _g.
From 0dfbeebb44c5b4d0f9b24d0ada4c0d9f43132c41 Mon Sep 17 00:00:00 2001 From: Gilles Filippini <p...@debian.org> Date: Sat, 1 Mar 2014 16:48:08 +0100 Subject: [PATCH] Install git-subtree from contrib. --- debian/changelog | 9 +++++++++ ...ib-subtree-unset-prefix-before-proceeding.patch | 23 ++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 12 +++++++++++ 4 files changed, 45 insertions(+) create mode 100644 debian/patches/0001-contrib-subtree-unset-prefix-before-proceeding.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 943612d..e085af3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +git (1:1.9.0-1.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install git-subtree from contrib. + * new patch 0001-contrib-subtree-unset-prefix.patch: + unset the 'prefix' environement variable before proceeding. + + -- Gilles Filippini <p...@debian.org> Sat, 01 Mar 2014 16:12:24 +0100 + git (1:1.9.0-1.1) unstable; urgency=low * git-email: Recommends: libio-socket-ssl-perl (>= 1.951) since diff --git a/debian/patches/0001-contrib-subtree-unset-prefix-before-proceeding.patch b/debian/patches/0001-contrib-subtree-unset-prefix-before-proceeding.patch new file mode 100644 index 0000000..080dc6d --- /dev/null +++ b/debian/patches/0001-contrib-subtree-unset-prefix-before-proceeding.patch @@ -0,0 +1,23 @@ +Description: This is to prevent unwanted prefix when such an environement + variable exists. The case occurs for example during the Debian package + build where the git-subtree test suite is called with 'prefix=/usr', which + makes test 21 from contrib/subtree test suite fail: + not ok 21 - Check that prefix argument is required for split +Author: Gilles Filippini <p...@debian.org> +Bug: http://thread.gmane.org/gmane.comp.version-control.git/244248 + +diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh +index dc59a91..db925ca 100755 +--- a/contrib/subtree/git-subtree.sh ++++ b/contrib/subtree/git-subtree.sh +@@ -46,6 +46,7 @@ ignore_joins= + annotate= + squash= + message= ++prefix= + + debug() + { +-- +1.8.5.3 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0e6150f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-contrib-subtree-unset-prefix-before-proceeding.patch diff --git a/debian/rules b/debian/rules index 69cb7a8..0533779 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) || \ + GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree $(TEST) $(OPTS) 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.9.0
signature.asc
Description: OpenPGP digital signature
