Manual merge of version 1:6.0-1+rpi1 and 1:6.0-3 to produce 1:6.0-3+rpi1

Mkdir -p for debian/man is now upstream.

diff --cc debian/changelog
index 731844ed85af0767a1bbd45eb420cd9f531281bc,49ebd60d784ca526b48889abdafd7406e7d7ab87..3039a8f7cac5a53415bd2cc1681fb27d353d7a58
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,58 +1,87 @@@
- llvm-toolchain-6.0 (1:6.0-1+rpi1) buster-staging; urgency=medium
++llvm-toolchain-6.0 (1:6.0-3+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]
-   * add -p flag to mkdir debian/man to avoid "file exists" error.
 +  * 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.
 +
-  -- Peter Micahel Green <plugwash@raspbian.org>  Sat, 17 Mar 2018 06:51:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 May 2018 16:57:05 +0000
++
+ llvm-toolchain-6.0 (1:6.0-3) unstable; urgency=medium
+ 
+   * Remove sysconf_interceptor_bypass_test.cc because it makes
+     Debian unstable and Ubuntu bionic freeze
+   * Remove the info text from the manpages (Closes: #894734)
+ 
+   [ Reshabh Sharma ]
+   * Enable autopkgtest for amd64 & i386 on the llvm test suite
+     (Closes: #774294)
+ 
+   [ Nicholas D Steeves ]
+   * Fix the lintian error 'privacy-breach-uses-embedded-file'
+     (Closes: #829361)
+ 
+   [ Athos Ribeiro ]
+   * Create symlink to run-clang-tidy-X.Y.py to remove its .py extension
+     (Closes: #892089)
+ 
+   [ David Tenty ]
+   * Migrate to automatic debug packages (Closes: #893267)
+ 
+   [ Nishanth Aravamudan ]
+   * debian/patches/install-lldb-sb-headers.patch: Install lldb's
+     SB headers (pr36630).  Thanks to Pavel Labath <labath@google.com>.
+     (LP: #1761009) (Closes: #895051)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 24 Apr 2018 23:24:44 +0200
+ 
+ llvm-toolchain-6.0 (1:6.0.1-1~exp1) experimental; urgency=medium
+ 
+   * preparation of the new release
+   * Remove sysconf_interceptor_bypass_test.cc because it makes
+     Debian unstable and Ubuntu bionic freeze
+ 
+   [ David Tenty ]
+   * Migrate to automatic debug packages (Closes: #893267)
+ 
+   [ Nishanth Aravamudan ]
+   * debian/patches/install-lldb-sb-headers.patch: Install lldb's
+     SB headers (pr36630).  Thanks to Pavel Labath <labath@google.com>.
+     (LP: #1761009) (Closes: #895051)
+ 
+  -- David Tenty <dtenty@ryerson.ca>  Sat, 31 Mar 2018 21:11:28 +0000
+ 
+ llvm-toolchain-6.0 (1:6.0-2) unstable; urgency=medium
+ 
+   * clang-tidy-6.0: depends on libclang-common-6.0-dev
+     (Closes: #891999)
+   * clang-tidy-6.0 also depends on clang-tools-6.0 for, at least
+     clang-apply-replacements
+   * Remove a bunch of old unused patches
+   * Fix debian-watch-uses-insecure-uri as upstream has now https
+   * Standards-Version updated to 4.1.3
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 05 Mar 2018 09:58:10 +0100
  
  llvm-toolchain-6.0 (1:6.0-1) unstable; urgency=medium
  

diff --cc debian/control
index e691af7b8452bd1b8c7e77940eb421dbd487bc1c,39c709ce50f9f7fec25f423c89ccfba0ad9ab016..ef1a075e384cb5e8070cc0d1f57c5fafddf827b3
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -14,9 -15,9 +15,9 @@@ 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.1
- Homepage: http://www.llvm.org/
+ Standards-Version: 4.1.3
+ 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 6c24059812631444b2379592cd0db432de5de150,3c8c772f32db0fc684c871fcbe9132ca1489a90b..ce2f340a6722644c49aabd704059751c33baaa0e
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -47,4 -47,7 +47,8 @@@ silent-test-macho.dif
  silent-llvm-isel-fuzzer.diff
  test-keep-alive.diff
  sparc64-add-missing-tls-get-addr.diff
+ remove-test-freezing.diff
+ install-lldb-sb-headers.patch
+ 0048-Set-html_static_path-_static-everywhere.patch
+ 0049-Use-Debian-provided-MathJax-everywhere.patch
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094

diff --cc debian/rules
Simple merge