Merge version 1:12.0.1-19+rpi1 and 1:12.0.1-20 to produce 1:12.0.1-20+rpi1

diff --cc debian/changelog
index 500378e6591b53a1fc63e018eab09f419bb7d237,af999e16e6fae0c249b34bacc9f892b7d3cd34bb..ac5d6230ad50cc0db3c67bad6c8ebcb94b1fba1d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,13 +1,54 @@@
- llvm-toolchain-12 (1:12.0.1-19+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-12 (1:12.0.1-20+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green]
 +  * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 06 Feb 2022 19:25:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Mar 2022 08:53:05 +0000
 +
- 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
+     (closes: #1004923)
+ 
+  -- 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

diff --cc debian/control
index 2b99212434bbac1e09abe05aaa18a190fd95541d,0529f4c4109dec2a62cb4b1c1dc1b13559c8a4ad..d84b52716ae1a70417f229d3affd4d6cb19fd90f
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -18,17 -18,19 +18,17 @@@ Build-Depends: debhelper (>= 9.0), cmak
      libjs-mathjax, python3-recommonmark,
      doxygen, gfortran,
      ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
 +    ocaml-findlib [amd64 arm64 armhf ppc64el s390x],
 +    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x],
 +    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x],
      libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 -    llvm-spirv [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
 -    spirv-tools [ linux-any ] | hello [ !i386],
      libgrpc++-dev, libprotobuf-dev, protobuf-compiler, protobuf-compiler-grpc
  # "| hello" is for older buster/bionic distros without spirv support
 -Build-Conflicts: oprofile
 +Build-Conflicts: oprofile, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
  Standards-Version: 4.2.1
  Homepage: https://www.llvm.org/
- Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot
- Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
+ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 12
+ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/12
  
  # ------------- clang -------------
  

diff --cc debian/rules
Simple merge