Merge branch 'libcxx-integration-minor-fixes' into '7'

Libcxx integration minor fixes

See merge request pkg-llvm-team/llvm-toolchain!10

debian/changelog

@@ -3,6 +3,10 @@ llvm-toolchain-7 (1:7~+rc1-1~exp3) experimental; urgency=medium
   * Fixed "weak-library-dev-dependency libc++-7-dev on libc++-7-helpers"
   * Fixed "libomp5-7: shlibs-declares-dependency-on-other-package
            libomp5-7) (>= 1:7~svn298832-1~)"
+  * Fixed "Lintian warnings for libc++abi-7-dev package"
+    - Warning: libc++abi-7-dev: breaks-without-version libc++-dev
+    - Warning: libc++abi-7-dev: breaks-without-version libc++abi-dev
+    - Warning: llvm-toolchain-7 source: binaries-have-file-conflict libc++abi-7-dev libc++abi1-7 usr/lib/llvm-7/lib/libc++abi.so
 
  --   
 

debian/control

@@ -495,8 +495,8 @@ Package: libomp5-7
 Multi-Arch: same
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libomp5 (<= 4.0.1-2)
-Breaks: libomp5 (<= 4.0.1-2)
+Replaces: libomp5 (<= 6.0.1-1)
+Breaks: libomp5 (<= 6.0.1-1)
 Provides: libomp5
 # TODO add the break depends
 Description: LLVM OpenMP runtime
@@ -589,9 +589,9 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++abi1-7 (= ${binary:Version}), ${misc:Depends}
-Replaces: libc++-7-dev
-Breaks: libc++-dev , libc++-7-dev, libc++abi-dev
-Provides: libc++-dev , libc++-7-dev, libc++abi-dev
+Replaces: libc++-dev (<= 6.0.1-1), libc++-7-dev, libc++abi-dev (<= 6.0.1-1)
+Breaks: libc++-dev (<= 6.0.1-1), libc++-7-dev, libc++abi-dev (<= 6.0.1-1)
+Provides: libc++-dev, libc++-7-dev, libc++abi-dev
 Description: LLVM low level support for a standard C++ library (development files)
  libc++abi is another implementation of low level support for a standard C++
  library.

debian/libc++abi1-X.Y.install.in

@@ -1 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so*
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.*