From a7a1c30a588fc4aef39ea330615ed6e45c70ad41 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 8 Aug 2016 09:06:17 +0000 Subject: [PATCH] * Generate manpages for lli, lldb-mi & git-clang-format * Fix some lintian overrides --- debian/changelog | 6 ++---- debian/clang-X.Y.manpages.in | 2 +- debian/clang-format-X.Y.manpages.in | 1 + debian/libclang1-X.Y.lintian-overrides.in | 2 +- debian/liblldb-X.Y.lintian-overrides.in | 3 ++- debian/lldb-X.Y.manpages.in | 2 +- debian/llvm-X.Y-runtime.manpages.in | 3 +-- debian/rules | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 006bfaf5..1139924e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ llvm-toolchain-snapshot (1:4.0~svn275970-1~exp2) experimental; urgency=medium * Disable lldb on sparc64 (Closes: #832371) * Also install clang-rename.el & clang-rename.py in clang-4.0 * scan-build llvm results are built using --show-description + * Generate manpages for lli, lldb-mi & git-clang-format + * Fix some lintian overrides -- Sylvestre Ledru Mon, 25 Jul 2016 12:19:52 +0200 @@ -22,10 +24,6 @@ llvm-toolchain-snapshot (1:4.0~svn275970-1~exp1) experimental; urgency=medium * amd64 llvm testsuite is green, bring back the failure in case of error * Fix the cmake paths in llvm-3.9-dev deb package. Thanks to Brad King for the patch (Closes: #819072) - * LLVMConfig.cmake is now installed to /lib/cmake/llvm instead of - /share/llvm/cmake - Thanks to Brad King of the fix - * Disable lldb on sparc64 (Closes: #832371) -- Sylvestre Ledru Mon, 25 Jul 2016 12:18:52 +0200 diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index 7be800ef..737fbd47 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -1,4 +1,4 @@ -clang/docs/_build/man/clang-@LLVM_VERSION@.1 +debian/man/clang-@LLVM_VERSION@.1 clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1 debian/man/clang-check-@LLVM_VERSION@.1 debian/man/scan-view-@LLVM_VERSION@.1 diff --git a/debian/clang-format-X.Y.manpages.in b/debian/clang-format-X.Y.manpages.in index 486b909d..27cf9348 100644 --- a/debian/clang-format-X.Y.manpages.in +++ b/debian/clang-format-X.Y.manpages.in @@ -1,2 +1,3 @@ debian/man/clang-format-diff-@LLVM_VERSION@.1 debian/man/clang-format-@LLVM_VERSION@.1 +debian/man/git-clang-format-@LLVM_VERSION@.1 diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in index aa7ef217..9fc47a74 100644 --- a/debian/libclang1-X.Y.lintian-overrides.in +++ b/debian/libclang1-X.Y.lintian-overrides.in @@ -1,5 +1,5 @@ # I know and I am not planning to change that yet. -libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@ +libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@-1 # Provided as transition libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so diff --git a/debian/liblldb-X.Y.lintian-overrides.in b/debian/liblldb-X.Y.lintian-overrides.in index b045ee27..180aec35 100644 --- a/debian/liblldb-X.Y.lintian-overrides.in +++ b/debian/liblldb-X.Y.lintian-overrides.in @@ -1,4 +1,5 @@ # That is normal. The lib is not (yet?) shipped as a new package -liblldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb +liblldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@-1 # For now, override this warning. We might create a -dev at some point liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so +liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@.so.1 usr/lib/*/liblldb-@LLVM_VERSION@.so diff --git a/debian/lldb-X.Y.manpages.in b/debian/lldb-X.Y.manpages.in index 22dbbbcb..36a62aea 100644 --- a/debian/lldb-X.Y.manpages.in +++ b/debian/lldb-X.Y.manpages.in @@ -1,2 +1,2 @@ debian/man/lldb-@LLVM_VERSION@.1 - +debian/man/lldb-mi-@LLVM_VERSION@.1 diff --git a/debian/llvm-X.Y-runtime.manpages.in b/debian/llvm-X.Y-runtime.manpages.in index 0f0bf921..839952d0 100644 --- a/debian/llvm-X.Y-runtime.manpages.in +++ b/debian/llvm-X.Y-runtime.manpages.in @@ -1,2 +1 @@ -docs/_build/man/lli* - +debian/man/lli* diff --git a/debian/rules b/debian/rules index 14707ec6..83a58dd1 100755 --- a/debian/rules +++ b/debian/rules @@ -264,7 +264,7 @@ build_doc: 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 - CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements pp-trace sancov"; \ + CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements git-clang-format pp-trace sancov lli"; \ for f in $$CMDS; do \ echo "Generating manpage of $$f"; \ LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-discard-stderr --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \