From ff5da0e6a2adf284c86808840dcc4dc2bc5ff0ff Mon Sep 17 00:00:00 2001 From: sylvestre Date: Sat, 2 Aug 2014 11:45:38 +0000 Subject: * Co installation of clang (Closes: #736057) - scan-build => scan-build-3.5 - scan-view => scan-view-3.5 - asan_symbolize => asan_symbolize-3.5 * Remove of pollycc git-svn-id: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.5@1295 670adf90-79fe-46c2-b027-9eb1e76e7c7d --- debian/NEWS | 5 +++++ debian/changelog | 8 ++++++-- debian/clang-X.Y.install.in | 5 ++--- debian/clang-X.Y.links.in | 16 ++-------------- debian/control | 6 ++++-- debian/rules | 6 +++++- 6 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..5975ba3 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,5 @@ +llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium + + * clang is now co-instalable. Available on version 3.4, 3.5 and 3.6 + + -- Sylvestre Ledru Sat, 02 Aug 2014 12:57:41 +0200 diff --git a/debian/changelog b/debian/changelog index 4c5d1f9..da252c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ -llvm-toolchain-3.5 (1:3.5~+rc1-4) UNRELEASED; urgency=medium +llvm-toolchain-3.5 (1:3.5~+rc1-3~exp1) experimental; urgency=medium * SVN branched. Update the Vcs- flags. - * clang-3.5 Breaks & Replaces clang (<< 1:3.5). Just like 3.4 + * Co installation of clang (Closes: #736057) + - scan-build => scan-build-3.5 + - scan-view => scan-view-3.5 + - asan_symbolize => asan_symbolize-3.5 + * Remove of pollycc -- Sylvestre Ledru Thu, 31 Jul 2014 18:12:59 +0200 diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 3c9bce7..8e8d04b 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -9,10 +9,9 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-query usr/bin/c-index-test* -tools/clang/tools/scan-build /usr/share/clang/ -tools/clang/tools/scan-view /usr/share/clang/ +tools/clang/tools/scan-build-@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/ -debian/pollycc /usr/bin/ usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ diff --git a/debian/clang-X.Y.links.in b/debian/clang-X.Y.links.in index 2599ba3..da8de04 100644 --- a/debian/clang-X.Y.links.in +++ b/debian/clang-X.Y.links.in @@ -1,15 +1,3 @@ -usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/llvm-clang.1.gz -usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/clang++.1.gz -/usr/share/clang/scan-build/scan-build /usr/bin/scan-build -/usr/share/clang/scan-view/scan-view /usr/bin/scan-view -/usr/bin/clang /usr/bin/llvm-clang +usr/share/clang/scan-build-@LLVM_VERSION@/scan-build usr/bin/scan-build-@LLVM_VERSION@ +usr/share/clang/scan-view-@LLVM_VERSION@/scan-view usr/bin/scan-view-@LLVM_VERSION@ -usr/bin/clang-@LLVM_VERSION@ usr/bin/clang -usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang++ -usr/bin/clang-check-@LLVM_VERSION@ usr/bin/clang-check -usr/bin/clang-tblgen-@LLVM_VERSION@ usr/bin/clang-tblgen -usr/bin/c-index-test-@LLVM_VERSION@ usr/bin/c-index-test -usr/bin/clang-apply-replacements-@LLVM_VERSION@ usr/bin/clang-apply-replacements -usr/bin/clang-tidy-@LLVM_VERSION@ usr/bin/clang-tidy -usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/pp-trace -usr/bin/clang-query-@LLVM_VERSION@ usr/bin/clang-query diff --git a/debian/control b/debian/control index b5d4ab9..de198cc 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-3.5-dev, python Suggests: gnustep, gnustep-devel, clang-3.5-doc -Replaces: clang (<< 1:3.5), clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt -Breaks: clang (<< 1:3.5), clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt +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 +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 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 diff --git a/debian/rules b/debian/rules index 5a2a373..4cc187e 100755 --- a/debian/rules +++ b/debian/rules @@ -290,7 +290,7 @@ override_dh_auto_install: fi mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/ - cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize + cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize-$(LLVM_VERSION) # Create this fake directory to make the install libclang-common-dev happy # under the unsupported archs of compiler-rt @@ -320,6 +320,10 @@ override_dh_auto_install: cp -f $(CURDIR)/clang/tools/clang-format/clang-format.py clang/tools/clang-format/clang-format-$(LLVM_VERSION).py + cp -fR $(CURDIR)/clang/tools/scan-build clang/tools/scan-build-$(LLVM_VERSION) + + cp -fR $(CURDIR)/clang/tools/scan-view clang/tools/scan-view-$(LLVM_VERSION) + # Remove some license files rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT \ $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT -- cgit v1.2.3