use the upstream option to set the option

diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch
deleted file mode 100644 (file)
index 89ac6bd..0000000
--- a/debian/patches/19-clang_debian_version.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Basic/Version.cpp
-===================================================================
---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Basic/Version.cpp
-+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Basic/Version.cpp
-@@ -14,6 +14,7 @@
- #include "clang/Basic/LLVM.h"
- #include "clang/Config/config.h"
- #include "llvm/Support/raw_ostream.h"
-+#include "clang/Debian/debian_path.h"
- #include <cstdlib>
- #include <cstring>
- 
-@@ -95,7 +96,7 @@ std::string getClangToolFullVersion(Stri
- #ifdef CLANG_VENDOR
-   OS << CLANG_VENDOR;
- #endif
--  OS << ToolName << " version " CLANG_VERSION_STRING;
-+  OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION;
- 
-   std::string repo = getClangFullRepositoryVersion();
-   if (!repo.empty()) {

diff --git a/debian/patches/series b/debian/patches/series
index 1d83b5f01f0409b823119b2ed38be957c78d4661..58e159afb82a98dafdaecb15319953960dca0bbe 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Debian versions
-19-clang_debian_version.patch
 0003-Debian-version-info-and-bugreport.patch
 clang-format-version.diff
 clang-analyzer-force-version.diff