Fix some lintian warnings from libcxx* integration

debian/control

@@ -526,6 +526,9 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
+Replaces: libc++1
+Breaks: libc++1
+Provides: libc++1
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
  .
@@ -544,8 +547,9 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-7 (= ${binary:Version}), ${misc:Depends}, libc++-helpers
-Provides: libstdc++-dev, libc++-7-dev
+Provides: libstdc++-dev, libc++-dev
 Breaks: libc++-dev
+Replaces: libc++-dev
 Description: LLVM C++ Standard library (development files)
  libc++ is another implementation of the C++ standard library
  .
@@ -559,27 +563,6 @@ Description: LLVM C++ Standard library (development files)
      as exception objects, rtti and memory allocation.
    * Extensive unit tests.
 
-Package: libc++-7-test
-Section: libs
-Architecture: any
-Depends: libc++1-7 (= ${binary:Version}), ${misc:Depends}
-Breaks: libc++-test
-Provides: libc++-test
-Description: LLVM C++ Standard library (test cases)
- libc++ is another implementation of the C++ standard library.
- .
- Features and Goals
- .
-   * Correctness as defined by the standards.
-   * Fast execution.
-   * Minimal memory use.
-   * Fast compile times.
-   * ABI compatibility with gcc's libstdc++ for some low-level features such
-     as exception objects, rtti and memory allocation.
-   * Extensive unit tests.
- .
- This package contains the test cases of libc++ library.
-
 # ------------- libcxxabi -------------
 
 Package: libc++abi1-7
@@ -590,6 +573,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libc++abi1
 Provides: libc++abi1
+Replaces: libc++abi1
 Description: LLVM low level support for a standard C++ library
  libc++abi is another implementation of low level support for a standard C++
  library.
@@ -605,8 +589,9 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++abi1-7 (= ${binary:Version}), ${misc:Depends}
-Replaces: libc++-7-dev (<< 3.9.0-3)
+Replaces: libc++-7-dev
-Breaks: libc++-dev (<< 3.9.0-3), libc++-7-dev
+Breaks: libc++-dev , libc++-7-dev, libc++abi-dev
+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.
@@ -617,30 +602,13 @@ Description: LLVM low level support for a standard C++ library (development file
    * Provide a portable sublayer to ease the porting of libc++
  .
 
-Package: libc++abi-7-test
-Section: libs
-Architecture: any
-Depends: libc++abi1-7 (= ${binary:Version}), ${misc:Depends}
-Breaks: libc++abi-test
-Provides: libc++abi-test
-Description: libc++abi test cases
- libc++abi is another implementation of low level support for a standard C++
- library.
- .
- Features and Goals
- .
-   * Correctness as defined by the C++ standards.
-   * Provide a portable sublayer to ease the porting of libc++
- .
- Test cases of libc++abi library.
-
-
 Package: libc++-7-helpers
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: libc++-7-helpers
+Breaks: libc++-helpers
 Provides: libc++-helpers
+Replaces: libc++-helpers
 Description: LLVM C++ Standard library - build helpers
  libc++ is another implementation of the C++ standard library
  .

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

@@ -1,3 +1,3 @@
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++*.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a
-usr/lib/llvm-@LLVM_VERSION@/include/c++/* usr/lib/llvm-@LLVM_VERSION@/include/c++
+usr/lib/llvm-@LLVM_VERSION@/include/c++/* usr/lib/llvm-@LLVM_VERSION@/include/c++/v1

debian/libc++-X.Y-dev.lintian-overrides.in

@@ -0,0 +1 @@
+libc++-@LLVM_VERSION@-dev: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a

debian/libc++-X.Y-helpers.links.in

@@ -1,2 +1,2 @@
-usr/lib/llvm-@LLVM_VERSION@/bin/clang++-libc++-@LLVM_VERSION@ usr/bin/clang++-libc++-@LLVM_VERSION@
+usr/lib/llvm-@LLVM_VERSION@/bin/clang++-libc++-@LLVM_VERSION@ usr/bin/clang++-libc++
-usr/lib/llvm-@LLVM_VERSION@/bin/g++-libc++-@LLVM_VERSION@ usr/bin/g++-libc++-@LLVM_VERSION@
+usr/lib/llvm-@LLVM_VERSION@/bin/g++-libc++-@LLVM_VERSION@ usr/bin/g++-libc++

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

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

debian/libc++1-X.Y.links.in

@@ -1 +1,2 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0
+/usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0	/usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1

debian/libc++1-X.Y.lintian-overrides.in

@@ -0,0 +1 @@
+libc++1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0

debian/libc++abi-X.Y-dev.install.in

@@ -1,3 +1,3 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi*so
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a
-usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/*cxxabi*
+libcxxabi/include/* usr/lib/llvm-@LLVM_VERSION@/include/

debian/libc++abi-X.Y-dev.links.in

@@ -1,4 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.a
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so
-usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/cxxabi.h /usr/include/c++/v1/cxxabi.h
-usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/__cxxabi_config.h /usr/include/c++/v1/__cxxabi_config.h

debian/libc++abi-X.Y-dev.lintian-overrides.in

@@ -0,0 +1 @@
+libc++abi-@LLVM_VERSION@-dev: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a

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

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

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

@@ -1 +1,2 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0
+/usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0	/usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1

debian/libc++abi1-X.Y.lintian-overrides.in

@@ -0,0 +1 @@
+libc++abi1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0

debian/rules

@@ -360,9 +360,10 @@ endif
 	$(LIBCXX_CMAKE_OPTIONS) \
 	-DLIBCXXABI_LIBCXX_PATH=$(BASE_PATH)/libcxx \
 	-DLIBCXXABI_LIBCXX_LIBRARY_PATH=$(BASE_PATH)/libcxx/build/lib \
+	-DLIBCXXABI_LIBCXX_INCLUDES=$(BASE_PATH)/libcxx/include \
 	-DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
 	-DLLVM_ENABLE_RTTI=ON
-
+	$(MAKE) $(NJOBS) VERBOSE=1
 	cd libcxx/build && \
 	cmake ../ \
 	$(LIBCXX_CMAKE_OPTIONS) \
@@ -371,6 +372,7 @@ endif
 	-DLIBCXX_CXX_ABI_LIBRARY_PATH=$(BASE_PATH)/libcxxabi/build/lib \
 	-DLIBCXX_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
 	-DLIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON
+	$(MAKE) $(NJOBS) VERBOSE=1
 
 override_dh_prep: build_doc
 	dh_prep
@@ -430,6 +432,7 @@ override_dh_auto_install:
 
 	# Only run on executable, not script
 	chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1`
+	chrpath -d debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libc++abi.so.1.0
 
 	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \
 	ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT)