Merge version 1:9.0.1-2+rpi1 and 1:9.0.1-6 to produce 1:9.0.1-6+rpi1

diff --cc debian/changelog
index ead497e4ff1877acb74ae342c17b112c3620ae27,ac273ebe5c9a7e3e3863c1d7c021716a83098838..4b641645aeec30d7ee3bed2f55e5c91b8cd3af29
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,36 +1,74 @@@
- llvm-toolchain-9 (1:9.0.1-2+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-9 (1:9.0.1-6+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.
 +
 +  [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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Dec 2019 09:46:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 19 Jan 2020 15:20:30 +0000
++
+ llvm-toolchain-9 (1:9.0.1-6) unstable; urgency=medium
+ 
+   * Team upload.
+   * Add some more python3 shebangs (Closes: #948497)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 10 Jan 2020 09:37:55 +0100
+ 
+ llvm-toolchain-9 (1:9.0.1-5) unstable; urgency=medium
+ 
+   * Install clang in Python3 directory (Closes: #948409)
+     - thanks Mike Gabriel for the helpful report!
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 08 Jan 2020 12:15:06 +0100
+ 
+ llvm-toolchain-9 (1:9.0.1-4) unstable; urgency=medium
+ 
+   * Source only upload to sid
+   * Force a python3 shebang on python modules to fix testsuite
+   * Do not run z3 tests if z3 support is not enabled
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 04 Jan 2020 08:52:02 +0100
+ 
+ llvm-toolchain-9 (1:9.0.1-3) unstable; urgency=medium
+ 
+   [ John Paul Adrian Glaubitz ]
+   * Build polly docs and manpages only when polly is enabled (Closes: #947236)
+ 
+   [ Sylvestre Ledru ]
+   * Introduce python3-clang-9 (closes: #942826)
+   * Remove python-lldb-9
+   * Remove Python 2 deps (Closes: #945695)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 29 Dec 2019 12:37:34 +0100
  
  llvm-toolchain-9 (1:9.0.1-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index eb7d1dafb46f7aef81f52804d0b8fe75f9b1e485,a22aeb1698ec7e8c8235a0a5c0fb0d9fa5549880..38f71857150da057b0cfdb5b79f1762fa968529b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -114,6 -136,7 +114,7 @@@ D67877.patc
  disable-lit-cpuid-install.diff
  disable-fuzzer-compiler-rt.diff
  no-z3.patch
 -
  # bug #946874
  D71028-mips-rust-test.diff
+ python3-shebang.patch
 +raspbian-triplet.patch

diff --cc debian/rules
Simple merge