diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 137ef986..171999ea 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -10,7 +10,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-cl usr/lib/llvm-@LLVM_VERSION@/bin/sancov usr/lib/llvm-@LLVM_VERSION@/share/scan-view/ usr/lib/llvm-@LLVM_VERSION@/share/scan-build/ -usr/lib/llvm-@LLVM_VERSION@/share/scan-build-py/ usr/lib/llvm-@LLVM_VERSION@/share/man/man1/scan-build.1 usr/lib/llvm-@LLVM_VERSION@/libexec/ccc-analyzer usr/lib/llvm-@LLVM_VERSION@/libexec/c++-analyzer @@ -19,6 +18,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/modularize usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ +tools/clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ usr/lib/llvm-@LLVM_VERSION@/lib/cmake/clang/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ diff --git a/debian/clang-X.Y.links.in b/debian/clang-X.Y.links.in index 6340f7d4..04ccd25c 100644 --- a/debian/clang-X.Y.links.in +++ b/debian/clang-X.Y.links.in @@ -1,3 +1,4 @@ usr/share/clang/scan-build-@LLVM_VERSION@/bin/scan-build usr/bin/scan-build-@LLVM_VERSION@ +usr/share/clang/scan-build-@LLVM_VERSION@/bin/scan-build-py usr/bin/scan-build-@LLVM_VERSION@-py usr/share/clang/scan-view-@LLVM_VERSION@/bin/scan-view usr/bin/scan-view-@LLVM_VERSION@ diff --git a/debian/liblld-X.Y.install.in b/debian/liblld-X.Y.install.in index b6294fae..aab1ecd5 100644 --- a/debian/liblld-X.Y.install.in +++ b/debian/liblld-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/liblld-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +#usr/lib/llvm-@LLVM_VERSION@/lib/liblld-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/liblldb-X.Y-dev.install.in b/debian/liblldb-X.Y-dev.install.in index fc4f34b0..df19941b 100644 --- a/debian/liblldb-X.Y-dev.install.in +++ b/debian/liblldb-X.Y-dev.install.in @@ -1,5 +1,4 @@ /usr/lib/llvm-@LLVM_VERSION@/include/lldb /usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*a /usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*so - - +/usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*so.@LLVM_VERSION_FULL@ diff --git a/debian/rules b/debian/rules index feac0369..e5174133 100755 --- a/debian/rules +++ b/debian/rules @@ -356,6 +356,9 @@ override_dh_auto_install: rm -rf clang/tools/scan-build-$(LLVM_VERSION) cp -fR $(CURDIR)/clang/tools/scan-build clang/tools/scan-build-$(LLVM_VERSION) + rm -rf clang/tools/scan-build-py-$(LLVM_VERSION) + cp -fR $(CURDIR)/clang/tools/scan-build-py clang/tools/scan-build-py-$(LLVM_VERSION) + rm -rf clang/tools/scan-view-$(LLVM_VERSION) cp -fR $(CURDIR)/clang/tools/scan-view clang/tools/scan-view-$(LLVM_VERSION)