From e10f474fcaee28f9142b7665b36657d05fb69a20 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 31 Aug 2019 13:30:51 +0200 Subject: [PATCH] Rename libclang-cpp1-9 to libclang-cpp9 to match the soname and libllvm9 naming (at some point, all libs should do that ...) --- debian/changelog | 4 +++- debian/control | 10 ++++++++++ debian/libclang-cpp1-X.Y.lintian-overrides.in | 2 -- ...-cpp1-X.Y.install.in => libclang-cppX.Y.install.in} | 0 ...lang-cpp1-X.Y.links.in => libclang-cppX.Y.links.in} | 0 5 files changed, 13 insertions(+), 3 deletions(-) delete mode 100644 debian/libclang-cpp1-X.Y.lintian-overrides.in rename debian/{libclang-cpp1-X.Y.install.in => libclang-cppX.Y.install.in} (100%) rename debian/{libclang-cpp1-X.Y.links.in => libclang-cppX.Y.links.in} (100%) diff --git a/debian/changelog b/debian/changelog index 386fbcd9..a3f529f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,9 +21,11 @@ llvm-toolchain-9 (1:9~+rc3-1~exp1) experimental; urgency=medium * Improve the fix-clang-path-and-build.diff patch If this package was built with libclang-common installed on the system, it could fail with 'use of undeclared identifier' because - #include_next was failing as it was expecting the next header to be + #include_next was failing as it was expecting the next header to be libstdc++ Now, if the local build headers are found, don't include system's + * Rename libclang-cpp1-9 to libclang-cpp9 to match the soname and libllvm9 + naming (at some point, all libs should do that ...) -- Sylvestre Ledru Tue, 27 Aug 2019 23:38:11 +0200 diff --git a/debian/control b/debian/control index 413c4587..4bd36453 100644 --- a/debian/control +++ b/debian/control @@ -168,10 +168,20 @@ Description: Clang library - Common development package (profiling, etc). Package: libclang-cpp1-9 +Depends: libclang-cpp9, ${misc:Depends} +Architecture: all +Priority: optional +Section: oldlibs +Description: transitional package + This is a transitional package. It can safely be removed. + +Package: libclang-cpp9 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} +Replaces: libclang-cpp1-9 (<< 1:9~+rc3-1~exp1) +Breaks: libclang-cpp1-9 (<< 1:9~+rc3-1~exp1) Description: C++ interface to the Clang library Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the diff --git a/debian/libclang-cpp1-X.Y.lintian-overrides.in b/debian/libclang-cpp1-X.Y.lintian-overrides.in deleted file mode 100644 index 37ce714c..00000000 --- a/debian/libclang-cpp1-X.Y.lintian-overrides.in +++ /dev/null @@ -1,2 +0,0 @@ -# I know and I am not planning to change that yet. -libclang-cpp1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang-cpp@LLVM_VERSION@ diff --git a/debian/libclang-cpp1-X.Y.install.in b/debian/libclang-cppX.Y.install.in similarity index 100% rename from debian/libclang-cpp1-X.Y.install.in rename to debian/libclang-cppX.Y.install.in diff --git a/debian/libclang-cpp1-X.Y.links.in b/debian/libclang-cppX.Y.links.in similarity index 100% rename from debian/libclang-cpp1-X.Y.links.in rename to debian/libclang-cppX.Y.links.in