From 3f37321c3ba154a1d315c47d36d52a9df19d25c5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 2 Sep 2016 09:39:32 +0000 Subject: [PATCH] * Merge clang-include-fixer-4.0 into clang-4.0. Don't think it deserves it own package * clang_getAllSkippedRanges in the list of libclang1 symbols --- debian/changelog | 4 +++- debian/clang-X.Y.install.in | 7 +++++++ debian/clang-X.Y.manpages.in | 2 ++ debian/clang-include-fixer-X.Y.install.in | 7 ------- debian/clang-include-fixer-X.Y.manpages.in | 2 -- debian/control | 14 ++++---------- debian/orig-tar.sh | 2 +- 7 files changed, 17 insertions(+), 21 deletions(-) delete mode 100644 debian/clang-include-fixer-X.Y.install.in delete mode 100644 debian/clang-include-fixer-X.Y.manpages.in diff --git a/debian/changelog b/debian/changelog index b8b57d85..db0bc5e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ llvm-toolchain-snapshot (1:4.0~svn279916-2) UNRELEASED; urgency=medium - * clang_getAllSkippedRanges in the list of libclang1 symbols + * Merge clang-include-fixer-4.0 into clang-4.0. Don't think + it deserves it own package * Port to kfreebsd. Many thanks to Pino Toscano (Closes: #835665) + * clang_getAllSkippedRanges in the list of libclang1 symbols * Try to disable the execution of the testsuite for scan-build & coverity for real * Also ship clang-reorder-fields as part of the clang-4.0 package diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 9a08afa6..63f4d894 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -20,12 +20,16 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-reorder-fields 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/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ @@ -41,3 +45,6 @@ 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@ + diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index d0d85502..5e6881ff 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -7,3 +7,5 @@ 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 diff --git a/debian/clang-include-fixer-X.Y.install.in b/debian/clang-include-fixer-X.Y.install.in deleted file mode 100644 index c39889ca..00000000 --- a/debian/clang-include-fixer-X.Y.install.in +++ /dev/null @@ -1,7 +0,0 @@ -usr/bin/find-all-symbols-@LLVM_VERSION@ -usr/bin/clang-include-fixer-@LLVM_VERSION@ -usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-fixer -usr/lib/llvm-@LLVM_VERSION@/bin/find-all-symbols -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.el -usr/lib/llvm-@LLVM_VERSION@/share/clang/run-find-all-symbols.py -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py diff --git a/debian/clang-include-fixer-X.Y.manpages.in b/debian/clang-include-fixer-X.Y.manpages.in deleted file mode 100644 index 743c7c59..00000000 --- a/debian/clang-include-fixer-X.Y.manpages.in +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/find-all-symbols-@LLVM_VERSION@.1 -debian/man/clang-include-fixer-@LLVM_VERSION@.1 diff --git a/debian/control b/debian/control index 3ab0d4db..3fee0f11 100644 --- a/debian/control +++ b/debian/control @@ -27,9 +27,11 @@ Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-4.0-dev, python Suggests: gnustep, gnustep-devel, clang-4.0-doc Replaces: clang-3.1, clang-3.2, clang-3.3, - clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt + clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt, + clang-include-fixer-4.0 Breaks: clang-3.1, clang-3.2, clang-3.3, - clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt + clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt, + clang-include-fixer-4.0 Description: C, C++ and Objective-C compiler (LLVM based) Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -67,14 +69,6 @@ Description: clang-based C++ linter tool via static analysis. clang-tidy is modular and provides a convenient interface for writing new checks. -Package: clang-include-fixer-4.0 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python -Description: clang-based C/C++ include fixer - Provide automated way of adding #include directives for missing symbols in one - translation unit. - - Package: clang-4.0-doc Architecture: all Section: doc diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index ab260ebd..969df2c4 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -106,7 +106,7 @@ fi if test -n "$RCRELEASE"; then if test "$TAG" = "final"; then - VERSION=$MAJOR_VERSION + VERSION=$MAJOR_VERSION else VERSION=$MAJOR_VERSION"~+"$TAG fi