diff --git a/debian/changelog b/debian/changelog index 63ff51e2..7f2d6a5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ llvm-toolchain-4.0 (1:4.0.1-9) unstable; urgency=medium + * Create clang-tools-4.0 and move the various clang tools into it + clang-tools-4.0 depends on clang-4.0. This might affect some packages. + (Closes: #836397) * Update of the copyright file (Closes: #878502) Thanks to Nicholas D Steeves for the work * Take a patch for a stack alignment on sparc64 for rust diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 86876462..dc145ec3 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -1,56 +1,10 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang usr/lib/llvm-@LLVM_VERSION@/bin/clang++ usr/lib/llvm-@LLVM_VERSION@/bin/clang-cpp -usr/lib/llvm-@LLVM_VERSION@/bin/clang-check -usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements -usr/lib/llvm-@LLVM_VERSION@/bin/clang-query -usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-rename.el -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-rename.py -usr/lib/llvm-@LLVM_VERSION@/bin/scan-view -usr/lib/llvm-@LLVM_VERSION@/bin/scan-build -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/man/man1/scan-build.1 -usr/lib/llvm-@LLVM_VERSION@/libexec/ccc-analyzer -usr/lib/llvm-@LLVM_VERSION@/libexec/c++-analyzer -usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-bundler -usr/lib/llvm-@LLVM_VERSION@/bin/clang-reorder-fields -usr/lib/llvm-@LLVM_VERSION@/bin/clang-change-namespace -usr/lib/llvm-@LLVM_VERSION@/bin/clang-import-test -usr/lib/llvm-@LLVM_VERSION@/bin/modularize -usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test -usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-fixer -usr/lib/llvm-@LLVM_VERSION@/bin/find-all-symbols - -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/ -usr/lib/llvm-@LLVM_VERSION@/share/clang/run-find-all-symbols.py -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.el usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang-cpp-@LLVM_VERSION@ -usr/bin/clang-check-@LLVM_VERSION@ -usr/bin/clang-apply-replacements-@LLVM_VERSION@ -usr/bin/clang-query-@LLVM_VERSION@ -usr/bin/clang-rename-@LLVM_VERSION@ -usr/bin/sancov-@LLVM_VERSION@ -usr/bin/clang-cl-@LLVM_VERSION@ -usr/bin/modularize-@LLVM_VERSION@ -usr/bin/scan-build-@LLVM_VERSION@ -usr/bin/scan-view-@LLVM_VERSION@ -usr/bin/c-index-test-@LLVM_VERSION@ -usr/bin/clang-offload-bundler-@LLVM_VERSION@ -usr/bin/clang-reorder-fields-@LLVM_VERSION@ -usr/bin/find-all-symbols-@LLVM_VERSION@ -usr/bin/clang-include-fixer-@LLVM_VERSION@ -usr/bin/clang-change-namespace-@LLVM_VERSION@ -usr/bin/clang-import-test-@LLVM_VERSION@ diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in index f7b9e876..a389e011 100644 --- a/debian/clang-X.Y.lintian-overrides.in +++ b/debian/clang-X.Y.lintian-overrides.in @@ -1,8 +1,2 @@ -# I know but well... -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz # Does not link otherwise clang-@LLVM_VERSION@: embedded-library usr/lib/llvm-@LLVM_VERSION@/bin/clang: libjsoncpp diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index 07c26616..b19400af 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -1,12 +1 @@ clang/docs/_build/man/clang-@LLVM_VERSION@.1 -clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1 -debian/man/clang-check-@LLVM_VERSION@.1 -debian/man/clang-rename-@LLVM_VERSION@.1 -debian/man/clang-query-@LLVM_VERSION@.1 -debian/man/clang-apply-replacements-@LLVM_VERSION@.1 -debian/man/sancov-@LLVM_VERSION@.1 -debian/man/scan-view-@LLVM_VERSION@.1 -debian/man/modularize-@LLVM_VERSION@.1 -debian/man/find-all-symbols-@LLVM_VERSION@.1 -debian/man/clang-include-fixer-@LLVM_VERSION@.1 -debian/man/clang-reorder-fields-@LLVM_VERSION@.1 diff --git a/debian/clang-X.Y.links.in b/debian/clang-tools-X.Y.links.in similarity index 100% rename from debian/clang-X.Y.links.in rename to debian/clang-tools-X.Y.links.in diff --git a/debian/clang-tools-X.Y.lintian-overrides.in b/debian/clang-tools-X.Y.lintian-overrides.in new file mode 100644 index 00000000..eb04eb71 --- /dev/null +++ b/debian/clang-tools-X.Y.lintian-overrides.in @@ -0,0 +1,6 @@ +# I know but well... +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz diff --git a/debian/clang-tools-X.Y.manpages.in b/debian/clang-tools-X.Y.manpages.in new file mode 100644 index 00000000..5cb7dbd0 --- /dev/null +++ b/debian/clang-tools-X.Y.manpages.in @@ -0,0 +1,11 @@ +clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1 +debian/man/clang-check-@LLVM_VERSION@.1 +debian/man/clang-rename-@LLVM_VERSION@.1 +debian/man/clang-query-@LLVM_VERSION@.1 +debian/man/clang-apply-replacements-@LLVM_VERSION@.1 +debian/man/sancov-@LLVM_VERSION@.1 +debian/man/scan-view-@LLVM_VERSION@.1 +debian/man/modularize-@LLVM_VERSION@.1 +debian/man/find-all-symbols-@LLVM_VERSION@.1 +debian/man/clang-include-fixer-@LLVM_VERSION@.1 +debian/man/clang-reorder-fields-@LLVM_VERSION@.1 diff --git a/debian/control b/debian/control index 205e2be2..4426243f 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,18 @@ Description: C, C++ and Objective-C compiler Clang implements all of the ISO C++ 1998, 11 and 14 standards and also provides most of the support of C++17. +Package: clang-tools-4.0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-4.0 (= ${binary:Version}) +Description: C, C++ and Objective-C compiler + Clang project is a C, C++, Objective C and Objective C++ front-end + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). + . + Clang implements all of the ISO C++ 1998, 11 and 14 standards and also + provides most of the support of C++17. + . + This package contains some clang-based tools. Package: clang-format-4.0 Architecture: any