From 517e37f29678263e86933964f0f76adb94c05911 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 25 Aug 2015 13:58:38 +0000
Subject: [PATCH] Update changelog and control files

---
 debian/changelog |  5 +++++
 debian/control   | 13 +++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 621638e4..a3fba678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 llvm-toolchain-snapshot (1:3.8~svn245286-2) UNRELEASED; urgency=medium
 
   * Team upload
+
   [ Gianfranco Costamagna ]
   * d/p/bug783205.patch fix s390x porting issue
     (rebase to trunk).
+  * d/control: Add more conflicting packages (clang and lldb)
+    (Closes: #796811, #796843)
+  * Remove an obsolete declaration about dragonegg
+    (cherry-pick from 3.7 branch)
 
   [ James Price ]
   * d/p/fix-cmake-config-prefix.diff: fix cmake path,
diff --git a/debian/control b/debian/control
index a0ff4828..216bee42 100644
--- a/debian/control
+++ b/debian/control
@@ -125,7 +125,7 @@ Architecture: any
 Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.8 (= ${binary:Version})
 Description: clang library
  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
@@ -172,8 +172,8 @@ Package: python-clang-3.8
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
-Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6
-Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6
+Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6, python-clang-3.7
+Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6, python-clang-3.7
 Description: Clang Python Bindings
  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
@@ -218,7 +218,7 @@ Package: libllvm3.8-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Modular compiler and toolchain technologies, debugging libraries
@@ -255,9 +255,6 @@ Description: Modular compiler and toolchain technologies
  and C++ front-ends, a front-end for a Forth-like language (Stacker),
  a young scheme front-end, and Java support is in development. LLVM can
  generate code for X86, SparcV9, PowerPC or many other architectures.
- .
- LLVM is the key component of the clang compiler and the gcc plugin called
- dragonegg.
 
 Package: llvm-3.8-runtime
 Architecture: any
@@ -415,7 +412,7 @@ Package: python-lldb-3.8
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
-Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6
+Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger, python lib
  LLDB is a next generation, high-performance debugger. It is built as a set of