Merge version 1:6.0.1-14+rpi1 and 1:6.0.1-14.1 to produce 1:6.0.1-14.1+rpi1

diff --cc debian/changelog
index 3ff36b7e047f3b086747d342d4b74c9b4692782a,6f017be1117b6becccedf8715f4d039e349f2e1c..de79aad5006ec9a0973a136f5f27ae9559c5cdb6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,11 +1,46 @@@
- llvm-toolchain-6.0 (1:6.0.1-14+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-6.0 (1:6.0.1-14.1+rpi1) bullseye-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.
 +  * Put commented out (by Debian not us)  ocaml build-depends into build-conflicts
 +    if they are installed it seems that the package builds the ocaml stuff and
 +    then errors out during packaging because it's not installed to anywhere.
 +
 +  [changes introduced in 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in 1:6.0.1-14+rpi1 by Peter Michael Green]
 +  * Clean up yet more crap in clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 04 Apr 2020 14:49:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 May 2020 12:51:47 +0000
++
+ llvm-toolchain-6.0 (1:6.0.1-14.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Maintainer agreed NMU to drop clang-tidy-6.0 since it is not needed to
+     support ghc, the only remaining llvm-6.0 user, and allows progress on
+     python2 removal (Closes: #956903)
+ 
+  -- Scott Kitterman <scott@kitterman.com>  Fri, 15 May 2020 12:25:16 -0400
  
  llvm-toolchain-6.0 (1:6.0.1-14) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge