From 52e967c258c9977e28fd8231ea54c4d752a68b1d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@mozilla.com>
Date: Tue, 18 Sep 2018 21:54:53 +0200
Subject: [PATCH 1/2] try to improve the non coinstability

---
 debian/control | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 3c791506..36c58d83 100644
--- a/debian/control
+++ b/debian/control
@@ -484,8 +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)
+Conflicts: libomp-dev
+Replaces: libomp-dev
 Provides: libomp-dev
 Description: LLVM OpenMP runtime - dev package
  The runtime is the part of the OpenMP implementation that your code is
@@ -496,8 +497,9 @@ 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)
+Conflicts: libomp5
+Replaces: libomp5
 Provides: libomp5
 # TODO add the break depends
 Description: LLVM OpenMP runtime
@@ -527,8 +529,9 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
-Replaces: libc++1 (<< 7~+rc1-1~exp1)
 Breaks: libc++1 (<< 7~+rc1-1~exp1)
+Conflicts: libc++1
+Replaces: libc++1
 Provides: libc++1
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
@@ -548,9 +551,10 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-7 (= ${binary:Version}), ${misc:Depends}
-Provides: libc++-dev
 Breaks: libc++-dev (<< 7~+rc1-1~exp1)
-Replaces: libc++-dev (<< 7~+rc1-1~exp1)
+Conflicts: libc++-dev
+Provides: libc++-dev
+Replaces: libc++-dev
 Description: LLVM C++ Standard library (development files)
  libc++ is another implementation of the C++ standard library
  .
@@ -573,8 +577,9 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libc++abi1 (<< 7~+rc1-1~exp1)
+Conflicts: libc++abi1
 Provides: libc++abi1
-Replaces: libc++abi1 (<< 7~+rc1-1~exp1)
+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.
@@ -589,9 +594,10 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++abi1-7 (= ${binary:Version}), ${misc:Depends}
-Replaces: libc++-dev (<= 6.0.1-1), libc++abi-dev (<= 6.0.1-1)
-Breaks: libc++-dev (<= 6.0.1-1), libc++abi-dev (<= 6.0.1-1)
+Breaks: libc++abi-dev (<= 6.0.1-1),
+Conflicts: libc++abi-dev
 Provides: libc++abi-dev
+Replaces: 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.

From 083e854ad4d27260991eea94b7c1d1a94cfe5e94 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 19 Sep 2018 08:36:49 +0200
Subject: [PATCH 2/2] make the deletion work even if no file exists

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index a7b111d5..cd8ca502 100755
--- a/debian/rules
+++ b/debian/rules
@@ -522,7 +522,7 @@ ifeq (${POLLY_ENABLE},yes)
 ifneq (,$(filter libclang-common-$(LLVM_VERSION)-dev, $(shell dh_listpackages)))
 	dh_install -p libclang-common-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly
 # On old Debian & Ubuntu, removing the files is necessary
-	rm debian/tmp/usr/lib/llvm-$(VERSION)/lib/cmake/polly/*.cmake
+	rm -rf debian/tmp/usr/lib/llvm-$(VERSION)/lib/cmake/polly/*.cmake
 else
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 endif