From 420b272a715a4cc5d6430cda0aa2b9aaacb1fe95 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 19 Sep 2010 01:07:25 -0400 Subject: [PATCH] Deal with RelNotes being moved to a subdirectory Signed-off-by: Anders Kaseorg Signed-off-by: Jonathan Nieder --- debian/changelog | 6 ++++++ debian/git.docs | 2 +- debian/rules | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d21be26dbe..fdd1423c75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,12 @@ git (1:1.7.4~rc0-0.0.1) experimental; urgency=low running format-patch (closes: #607044). * log et al: accept un-sticked "git log -S needle" command-line syntax (closes: #606975). + + [ Anders Kaseorg ] + * debian/git.docs, debian/rules: deal with RelNotes being moved to + a subdirectory. + + [ Jonathan Nieder ] * update gitweb and instaweb to v1.7.2.x: - debian/diff/0002-Revert-Merge-branch-jn-gitweb...diff: remove, no longer needed. diff --git a/debian/git.docs b/debian/git.docs index f8725d1e06..bfb05b7c08 100644 --- a/debian/git.docs +++ b/debian/git.docs @@ -1,2 +1,2 @@ README -Documentation/RelNotes* +Documentation/RelNotes diff --git a/debian/rules b/debian/rules index 6e82bd279e..08f89dd7a1 100755 --- a/debian/rules +++ b/debian/rules @@ -126,7 +126,7 @@ install-indep: build-arch-stamp build-indep-stamp $(MAKE) -CDocumentation install-webdoc WEBDOC_DEST='$(TMP)'/html \ 2>/dev/null # RelNotes are shipped in git - rm -f '$(TMP)'/html/RelNotes* + rm -rf '$(TMP)'/html/RelNotes # git-doc rm -rf '$(GIT)'-doc install -d -m0755 '$(GIT)'-doc -- 2.11.4.GIT