Merge version 1:6.0.1-9.2+rpi1 and 1:6.0.1-10 to produce 1:6.0.1-10+rpi1

diff --cc debian/changelog
index 194cc73af6ab162cd759da56a3af01bbe5ddafa8,b6244e65357de96b1e0c8f6081c78f03be2b4c13..b3ced14d15fba63bd48712a887a0d32ddf1d0865
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,13 +1,45 @@@
- llvm-toolchain-6.0 (1:6.0.1-9.2+rpi1) buster-staging; urgency=medium
++llvm-toolchain-6.0 (1:6.0.1-10+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, 02 Nov 2018 02:33:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Jan 2019 19:14:47 +0000
++
+ llvm-toolchain-6.0 (1:6.0.1-10) unstable; urgency=medium
+ 
+   * Fix a baseline violation on armhf (Closes: #914268)
+     Thanks to Adrian Bunk
+     doing that for the Julia package.
+ 
+   [ John Paul Adrian Glaubitz ]
+   * Add patch to fix missing include and library paths on x32
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 23 Jan 2019 23:25:50 +0100
  
  llvm-toolchain-6.0 (1:6.0.1-9.2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 8ef023978834334554dcf36b3d148704268244f3,5c5f3b7cde15e7a80ef2e8f8a3bc25dc4e49467e..43165e77028da09bcdaddf27fcef1c8fa89e1798
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -71,4 -72,4 +72,5 @@@ x32-fix-driver-search-paths.dif
  hurd-lib_Support_Unix_Path.inc.diff
  hurd-tools_llvm-shlib_CMakeLists.txt.diff
  D53557-hurd-self-exe-realpath.diff
+ clang-arm-default-vfp3-on-armv7a.patch
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094

diff --cc debian/rules
Simple merge