Revert "OpenMP packages are coinstallable"

This reverts commit cb8571939a.

debian/changelog

@@ -17,15 +17,11 @@ llvm-toolchain-7 (1:7~+rc3-5) unstable; urgency=medium
 
 llvm-toolchain-7 (1:7~+rc3-4) unstable; urgency=medium
 
-  [ Sylvestre Ledru ]
   * libc++-7-dev doesn't provide libstdc++-dev anymore (Closes: #908738)
 
   [ Gianfranco Costamagna ]
   * Force polly cmake removal on arch:all because of --fail-missing
 
-  [ Reshabh Sharma ]
-  * Make OpenMP packages coinstallable from version 7
-
   [ John Paul Adrian Glaubitz ]
   * Add patch to fix missing MultiArch include dir
     on powerpcspe (Closes: #908791)

debian/control

@@ -484,6 +484,9 @@ Section: libdevel
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
 Depends: libomp5-7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-7-doc
+Replaces: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1)
+Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1)
+Provides: libomp-dev
 Description: LLVM OpenMP runtime - dev package
  The runtime is the part of the OpenMP implementation that your code is
  linked against, and that manages the multiple threads in an OpenMP program
@@ -493,6 +496,10 @@ Package: libomp5-7
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libomp5 (<< 7~+rc1-1~exp1)
+Breaks: libomp5 (<< 7~+rc1-1~exp1)
+Provides: libomp5
+# TODO add the break depends
 Description: LLVM OpenMP runtime
  The runtime is the part of the OpenMP implementation that your code is
  linked against, and that manages the multiple threads in an OpenMP program

debian/libomp-X.Y-dev.links.in

@@ -1,5 +0,0 @@
-/usr/lib/llvm-@LLVM_VERSION@/lib/libgomp.so	/usr/lib/@DEB_HOST_MULTIARCH@/libgomp-@LLVM_VERSION@.so
-/usr/lib/llvm-@LLVM_VERSION@/lib/libiomp5.so	/usr/lib/@DEB_HOST_MULTIARCH@/libiomp5-@LLVM_VERSION@.so
-/usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5	/usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so
-/usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so	/usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so
-/usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so	/usr/lib/@DEB_HOST_MULTIARCH@/libomp-@LLVM_VERSION@.so

debian/libomp5-X.Y.install.in

@@ -1,3 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5 /usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 
-usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5
-usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5

debian/libomp5-X.Y.links.in

@@ -1,2 +1,3 @@
-/usr/lib/@DEB_HOST_MULTIARCH@/libomp-@LLVM_VERSION@.so.5	/usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5  
+usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5  /usr/lib/@DEB_HOST_MULTIARCH@/libomp.so.5
-/usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5	/usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5
+
+

debian/libomp5-X.Y.lintian-overrides.in

@@ -1,2 +1 @@
 libomp5-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5
-libomp5-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libomp.so.5 usr/lib/*/libomp-@LLVM_VERSION@.so.5 libomp.so.5

debian/rules

@@ -463,6 +463,9 @@ override_dh_auto_install:
 	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)
 
+	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \
+	ln -s libomp.so.$(SONAME_OPENMP) libomp.so
+
 	if test "$(OPENMP_ENABLE)" = yes; then \
 		mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \
 		cp -f openmp/runtime/exports/common*/include/* debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \
@@ -512,18 +515,6 @@ endif
 	$(MAKE) -C libcxxabi/build install DESTDIR=$(DEB_INST)
 	$(MAKE) -C libcxx/build install DESTDIR=$(DEB_INST)
 
-# hack to make them co installable
-	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libc++.so.1.0 libc++-$(LLVM_VERSION).so.1.0; \
-	mv libc++.so libc++-$(LLVM_VERSION).so; \
-	mv libc++.a libc++-$(LLVM_VERSION).a; \
-	mv libc++abi.so.1.0 libc++abi-$(LLVM_VERSION).so.1.0; \
-	mv libc++abi.a libc++abi-$(LLVM_VERSION).a; \
-	rm libc++.so.1 libc++abi.so libc++abi.so.1; \
-	ln -s libc++-$(LLVM_VERSION).so.1.0 libc++-$(LLVM_VERSION).so.1; \
-	ln -s libc++abi-$(LLVM_VERSION).so.1.0 libc++abi-$(LLVM_VERSION).so.1; \
-	ln -s libc++abi-$(LLVM_VERSION).so.1 libc++abi-$(LLVM_VERSION).so; \
-	ln -s libc++abi-$(LLVM_VERSION).so.1 libc++abi.so.1
-
 # Rename binaries
 	mkdir -p $(DEB_INST)/usr/bin/
 	cd $(DEB_INST)/usr/bin/; \