Merge remote-tracking branch 'origin/13' into 14

debian/changelog

@@ -315,6 +315,18 @@ llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; ur
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 06 Aug 2021 08:40:58 +0200
 
+llvm-toolchain-13 (1:13.0.1-3) unstable; urgency=medium
+
+  * Fix a typo in an header (closes: #1005195)
+
+  * Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a
+    usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a
+    usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a
+    in libclang-X.Y-dev
+    (Closes: #1005666)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 08 Feb 2022 21:39:18 +0100
+
 llvm-toolchain-13 (1:13.0.1-2) unstable; urgency=medium
 
   * mlir: use the cmake option to avoid installing object files
@@ -657,7 +669,15 @@ llvm-toolchain-snapshot (1:13~++20201124100523+245052ac3080-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 27 Jan 2021 16:02:16 +0100
 
-llvm-toolchain-12 (1:12.0.1-19) UNRELEASED; urgency=medium
+llvm-toolchain-12 (1:12.0.1-20) unstable; urgency=medium
+
+  * Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a
+    usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a
+    in libclang-X.Y-dev
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 13 Feb 2022 14:04:40 +0100
+
+llvm-toolchain-12 (1:12.0.1-19) unstable; urgency=medium
 
   * Build clangd with GRPC support
     Thanks to Sam McCall for the patch

debian/libclang-X.Y-dev.install.in

@@ -5,3 +5,8 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a
 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so
 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@*.so
 usr/lib/llvm-@LLVM_VERSION@/lib/libfindAllSymbols.a
+
+# clangd
+usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a

debian/patches/fix-typo.diff

@@ -0,0 +1,22 @@
+Index: llvm-toolchain-13-13.0.1/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h
+===================================================================
+--- llvm-toolchain-13-13.0.1.orig/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h
++++ llvm-toolchain-13-13.0.1/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h
+@@ -79,7 +79,7 @@ protected:
+ #ifndef NDEBUG
+   ~RefCountedBase() {
+     assert(RefCount == 0 &&
+-           "Destruction occured when there are still references to this.");
++           "Destruction occurred when there are still references to this.");
+   }
+ #else
+   // Default the destructor in release builds, A trivial destructor may enable
+@@ -110,7 +110,7 @@ protected:
+ #ifndef NDEBUG
+   ~ThreadSafeRefCountedBase() {
+     assert(RefCount == 0 &&
+-           "Destruction occured when there are still references to this.");
++           "Destruction occurred when there are still references to this.");
+   }
+ #else
+   // Default the destructor in release builds, A trivial destructor may enable

debian/patches/series

@@ -149,3 +149,4 @@ compilerrt-build-scudo-standalone-option.diff
 wasm-ld-path.diff
 python3-scan-build.py
 revert-update-doc.diff
+fix-typo.diff

debian/rules

@@ -745,9 +745,6 @@ override_dh_auto_install:
 	# Remove an example - introduced in https://reviews.llvm.org/D61446
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libBye.a
 
-	# Remove unused clangd lib
-	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libRemoteIndexProto.a $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libRemoteIndexServiceProto.a $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libMonitoringServiceProto.a
-
 	cp $(TARGET_BUILD_STAGE2)/bin/clang-query $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin
 
 	# Only run on executable, not script