Merge version 1:6.0.1-3+rpi1 and 1:6.0.1-5 to produce 1:6.0.1-5+rpi1

diff --cc debian/changelog
index 35a93ea448a353646778722f965fe828da702187,0c3293535c90da3c965656195264e7750b1823b7..20fa8d29b51eb41554bffe3b62aa50f6f3ff2675
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,19 +1,51 @@@
- llvm-toolchain-6.0 (1:6.0.1-3+rpi1) buster-staging; urgency=medium
++llvm-toolchain-6.0 (1:6.0.1-5+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>  Wed, 15 Aug 2018 01:57:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Aug 2018 19:13:42 +0000
++
+ llvm-toolchain-6.0 (1:6.0.1-5) unstable; urgency=medium
+ 
+   * Cherry-pick a patch from 7 to fix an issue with Julia
+     on powerpc - PowerPC-Make-AddrSpaceCast-noop.diff
+     (Closes: #906314)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 17 Aug 2018 08:49:22 +0200
+ 
+ llvm-toolchain-6.0 (1:6.0.1-4) unstable; urgency=medium
+ 
+   * Disable force-gcc-header-obj.diff as it is introducing
+     some regressions in the search headers
+     (Closes: #903709)
+   * Standards-Version: 4.2.0
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 15 Aug 2018 15:25:42 +0200
  
  llvm-toolchain-6.0 (1:6.0.1-3) unstable; urgency=medium
  

diff --cc debian/control
index 23e76691d55d5b2a17cca5868cbf800cf884aa27,8dc4d06f047140c95173f0e18ce4668d95a6ef01..0bdeaeaa2d3e036e5a4b6207cd02bf7bba3785c7
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -15,8 -15,8 +15,8 @@@ Build-Depends: debhelper (>= 9.0), flex
  #    ocaml-findlib [amd64 arm64 armel armhf i386 ppc64el s390x],
  #    libctypes-ocaml-dev [amd64 arm64 armel armhf i386 ppc64el s390x],
  #    dh-ocaml [amd64 arm64 armel armhf i386 ppc64el s390x],
 -Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
 +Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev, ocaml-nox, ocaml-findlib, libctypes-ocaml-dev, dh-ocaml
- Standards-Version: 4.1.4
+ Standards-Version: 4.2.0
  Homepage: https://www.llvm.org/
  Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 6.0
  Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/6.0

diff --cc debian/patches/series
index 37c2950deccd1554994c19a56f0e7d277e280428,66b6cc3bb6de38458d9df5d2960b90fbcfba8596..49add631e2582c5d4dbb87389258a010a6ee9a6e
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -58,4 -59,4 +59,5 @@@ D40146-JumpThreading-backport-1.dif
  D42717-JumpThreading-backport-2.diff
  llvm-D49832-SCEVPred.patch
  llvm-rL323946-LSRTy.patch
+ PowerPC-Make-AddrSpaceCast-noop.diff
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094