From: Peter Michael Green Date: Thu, 29 Mar 2018 15:40:11 +0000 (+0000) Subject: Backport debian/man change from 6.0 series X-Git-Tag: archive/raspbian/1%5.0.1-4+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1bacab082ac5aae01f92206b03ce4b2e756a693d;p=llvm-toolchain-5.0.git Backport debian/man change from 6.0 series Clean up further crap in clean target. --- diff --git a/debian/changelog b/debian/changelog index f98dbe45d..87193baac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,13 @@ llvm-toolchain-5.0 (1:5.0.1-4+rpi1) buster-staging; urgency=medium * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc * Clean up debian/*.install - -- Raspbian forward porter Thu, 29 Mar 2018 00:19:04 +0000 + [changes backported from llvm-toolchain-6.0 1:6.0-1+rpi1 to llvm-toolchain-5.0 1:5.0.1-4+rpi1 by Peter michael green] + * add -p flag to mkdir debian/man to avoid "file exists" error. + + [changes introduced in llvm-toolchain-5.0 1:5.0.1-4+rpi1 by Peter michael green] + * Further fixes to clean target. + + -- Peter Michael Green Thu, 29 Mar 2018 00:19:04 +0000 llvm-toolchain-5.0 (1:5.0.1-4) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 4950686c4..f6fbcb6fa 100755 --- a/debian/rules +++ b/debian/rules @@ -344,7 +344,7 @@ build_doc: cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js && cd -; \ done - mkdir debian/man/ + mkdir -p debian/man/ help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 @@ -624,6 +624,7 @@ override_dh_auto_clean: rm -rf clang/tools/*-3.9 rm -f `find . -name '*3.9.vim'` rm -f clang/tools/scan-build/man/scan-build-3.9.1 utils/vim/llvm-3.9-vimrc - rm -f debian/*.install + rm -f debian/*3.9* + rm -rf debian/man .PHONY: override_dh_strip preconfigure