From 7deef1bda30b5251964923bdac0645c44510c02c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 6 Apr 2018 17:27:13 +0200 Subject: [PATCH] Remove the fix-LLVM_VERSION_PATCH.diff patch (applied upstream) --- debian/changelog | 1 + debian/patches/fix-LLVM_VERSION_PATCH.diff | 13 ------------- debian/patches/series | 3 --- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 debian/patches/fix-LLVM_VERSION_PATCH.diff diff --git a/debian/changelog b/debian/changelog index 7ba00f0e..c643dbb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-5.0 (1:5.0.2~+rc1-1~exp2) experimental; urgency=medium * Remove the info text from the manpages (Closes: #894734) + * Remove the fix-LLVM_VERSION_PATCH.diff patch (applied upstream) -- Sylvestre Ledru Tue, 03 Apr 2018 19:22:12 +0200 diff --git a/debian/patches/fix-LLVM_VERSION_PATCH.diff b/debian/patches/fix-LLVM_VERSION_PATCH.diff deleted file mode 100644 index 96ba1926..00000000 --- a/debian/patches/fix-LLVM_VERSION_PATCH.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-5.0-5.0.2~+rc1/CMakeLists.txt -=================================================================== ---- llvm-toolchain-5.0-5.0.2~+rc1.orig/CMakeLists.txt -+++ llvm-toolchain-5.0-5.0.2~+rc1/CMakeLists.txt -@@ -26,7 +26,7 @@ if(NOT DEFINED LLVM_VERSION_MINOR) - set(LLVM_VERSION_MINOR 0) - endif() - if(NOT DEFINED LLVM_VERSION_PATCH) -- set(LLVM_VERSION_PATCH 1) -+ set(LLVM_VERSION_PATCH 2) - endif() - if(NOT DEFINED LLVM_VERSION_SUFFIX) - set(LLVM_VERSION_SUFFIX "") diff --git a/debian/patches/series b/debian/patches/series index 80906d50..42b2d521 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,12 +46,9 @@ silent-amd-tet.diff disable-error-xray.diff lldb-disable-swig-error.diff update-cuda-search-path.patch - test-keep-alive.diff libfuzzer-path.diff silent-gold-regression.diff glibc_2.27.diff 0048-Set-html_static_path-_static-everywhere.patch 0049-Use-Debian-provided-MathJax-everywhere.patch - -fix-LLVM_VERSION_PATCH.diff