From 0ee688cf909d8fc542deab5f1bd54bd70ee034d9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 25 Nov 2017 14:19:02 +0000 Subject: [PATCH] Fix the fix-scan-view-path.diff path --- debian/changelog | 1 + debian/patches/fix-scan-view-path.diff | 2 +- debian/prepare-new-release.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5721035a..1e2a8c74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium * Remove the hardcoded declarations of llvm version in debian/rules * add /usr/lib/cuda to the CUDA toolkit search paths Thanks to Andreas Beckmann for the patch (Closes: #882505) (LP: #1706326) + * Fix the fix-scan-view-path.diff path -- Sylvestre Ledru Mon, 30 Oct 2017 19:41:20 +0100 diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff index d9fa6c81..3f722a6d 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -6,7 +6,7 @@ Index: llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-3.9' ++BASE_DIR = '/usr/share/clang/scan-view-5.0' def url_is_up(url): diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index d1402c35..e52e8085 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -4,7 +4,7 @@ TARGET_VERSION=5.0 ORIG_VERSION_2=4_0 TARGET_VERSION_2=5_0 -LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff` +LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff` for F in $LIST; do sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F