Merge version 1:6.0.1-9+rpi1 and 1:6.0.1-9.1 to produce 1:6.0.1-9.1+rpi1

diff --cc debian/changelog
index f5b7afa98af9375b22a6097fb3d44f0f36737c7f,1dd3d3d6e02868aac2bf9829585820a1260d0695..0a5934cf22938a8d1fcd3d915383493b438839bc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,12 +1,44 @@@
- llvm-toolchain-6.0 (1:6.0.1-9+rpi1) buster-staging; urgency=medium
++llvm-toolchain-6.0 (1:6.0.1-9.1+rpi1) buster-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 21 Sep 2018 01:38:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Oct 2018 10:18:36 +0000
++
+ llvm-toolchain-6.0 (1:6.0.1-9.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Apply hurd fixes (Closes: #908847).
+     - hurd-lib_Support_Unix_Path.inc.diff
+     - hurd-pathmax.diff
+     - hurd-tools_llvm-shlib_CMakeLists.txt.diff
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Tue, 16 Oct 2018 20:18:39 +0000
  
  llvm-toolchain-6.0 (1:6.0.1-9) unstable; urgency=medium
  

diff --cc debian/patches/series
index 25adc1fbfa02394358ea4a0064ab323920635302,24bcf204dae2713231d0e3472ae099cdcba3ba4f..9ced013dfad9f0e73e0aaf6097dbc1ab79ae7df2
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -68,4 -68,5 +68,6 @@@ D51335-alignment-issue.dif
  rL338481-cherry-pick-really-subtle-miscompile.diff
  disable-sse2-old-x86.diff
  powerpcspe-add-missing-include-path.diff
+ hurd-lib_Support_Unix_Path.inc.diff
+ hurd-tools_llvm-shlib_CMakeLists.txt.diff
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094

diff --cc debian/rules
Simple merge