From 95169ec8ccd9a13ae97d4662ab4e2c5f614c11f4 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 24 Oct 2016 08:41:56 +0000
Subject: [PATCH] The libstdc++-6-dev & libobjc-6-dev are only install with
 clang-X.Y and libclang-X.Y-dev and no longer with libclang1-X.Y (Closes:
 #841309)

---
 debian/changelog | 3 +++
 debian/control   | 7 ++++---
 debian/rules     | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e1c2ef7..6da056ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ llvm-toolchain-3.8 (1:3.8.1-13) UNRELEASED; urgency=medium
 
   * Fix a version issue with run-clang-tidy-4.0.py
   * Updated patch kfreebsd-support.diff
+  * The libstdc++-6-dev & libobjc-6-dev are only install with clang-X.Y
+    and libclang-X.Y-dev and no longer with libclang1-X.Y
+    (Closes: #841309)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Sep 2016 13:57:25 +0200
 
diff --git a/debian/control b/debian/control
index 13c6abf4..7db7f840 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Vcs-Browser: https://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/3.8
 Package: clang-3.8
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-common-3.8-dev (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang-common-3.8-dev (= ${binary:Version}),
  libclang1-3.8 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-3.8-dev, python
@@ -85,7 +85,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation
 
 Package: libclang1-3.8
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: C interface to the clang library
@@ -126,7 +126,8 @@ Package: libclang-3.8-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang1-3.8 (= ${binary:Version}), libclang-common-3.8-dev (= ${binary:Version})
+ ${dep:devlibs-objc}, libclang1-3.8 (= ${binary:Version}),
+ libclang-common-3.8-dev (= ${binary:Version})
 Description: clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
diff --git a/debian/rules b/debian/rules
index 341fd346..55c51de2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,9 +60,11 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
 endif
 
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0)
-	control_vars = '-Vdep:devlibs=libstdc++-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev, libobjc-$(GCC_VERSION)-dev'
+	control_vars = '-Vdep:devlibs=libstdc++-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev' \
+		'-Vdep:devlibs-objc=libobjc-$(GCC_VERSION)-dev'
 else ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.7.2-10~ ; echo $$?),0)
-	control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev, libobjc-$(GCC_VERSION)-dev'
+	control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev' \
+		'-Vdep:devlibs-objc=libobjc-$(GCC_VERSION)-dev'
 else
 	control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
 endif