From ad12a41752011c2d575a1e5663fdacc836f3461e Mon Sep 17 00:00:00 2001
From: Reshabh Sharma <reshabhsh@gmail.com>
Date: Tue, 7 Aug 2018 17:11:41 +0000
Subject: [PATCH] OpenMP integration follow ups

---
 debian/changelog                        |  4 ++++
 debian/control                          | 14 ++++++++------
 debian/libomp-X.Y.links.in              |  1 +
 debian/libomp5-X.Y.lintian-overrides.in |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 debian/libomp-X.Y.links.in

diff --git a/debian/changelog b/debian/changelog
index fb2196db..ea037177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,10 @@ llvm-toolchain-snapshot (1:7~svn336894-1~exp1) experimental; urgency=medium
   [ Gianfranco Costamagna ]
   * Bump std-version to 4.1.5, no changes required
 
+  [ Reshabh Sharma ]
+  * Updated debian/control with breaks, provides and conflicts for OpenMP
+    packages (Closes: #903802)
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 09 May 2018 14:23:49 +0200
 
 llvm-toolchain-snapshot (1:7~svn330801-1~exp2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index d6305401..2d80848d 100644
--- a/debian/control
+++ b/debian/control
@@ -483,8 +483,9 @@ Section: libdevel
 Architecture: any
 Depends: libomp5-7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-7-doc
-Replaces: libiomp-7-dev (<< 3.7-1)
-Breaks: libiomp-7-dev (<< 3.7-1)
+Replaces: libiomp-dev (<< 3.7-1), libomp-dev
+Breaks: libiomp-dev (<< 3.7-1), libomp-dev
+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
@@ -494,8 +495,9 @@ Package: libomp5-7
 Multi-Arch: same
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libiomp5-7 (<< 3.7-1)
-Breaks: libiomp5-7 (<< 3.7-1)
+Replaces: libomp5
+Breaks: libomp5
+Provides: libomp5
 # TODO add the break depends
 Description: LLVM OpenMP runtime
  The runtime is the part of the OpenMP implementation that your code is
@@ -506,8 +508,8 @@ Package: libomp-7-doc
 Section: doc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
-Replaces: libiomp-7-doc (<< 3.7-1)
-Breaks: libiomp-7-doc (<< 3.7-1)
+Replaces: libiomp-doc
+Breaks: libiomp-doc
 Description: LLVM OpenMP runtime - Documentation
  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
diff --git a/debian/libomp-X.Y.links.in b/debian/libomp-X.Y.links.in
new file mode 100644
index 00000000..6bc3d4ce
--- /dev/null
+++ b/debian/libomp-X.Y.links.in
@@ -0,0 +1 @@
+usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libomp.so.5 
diff --git a/debian/libomp5-X.Y.lintian-overrides.in b/debian/libomp5-X.Y.lintian-overrides.in
index f2258471..201d42dc 100644
--- a/debian/libomp5-X.Y.lintian-overrides.in
+++ b/debian/libomp5-X.Y.lintian-overrides.in
@@ -1 +1 @@
-libomp5-@LLVM_VERSION@: postinst-must-call-ldconfig usr/lib/*/libomp-@LLVM_VERSION@.so.5
+libomp5-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5