diff --git a/debian/TODO b/debian/TODO
index 7fcc5878..0ce53dbd 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,18 +1,6 @@
 * add the support of libclang in llvm default (for now, it is
 called libclang1-3.3.so)
 
-* add a symbol file for libclang.so in llvm default
-
-* check if we should use alternatives
-
-* remove of clang & llvm 3.2
-
-* look at the bugs of llvm 3.2
-
 * move the header at the right place in libclang-dev
 
 * bootstrap of clang with itself
-
-* update of the soname
-
-* man page for clang-format
diff --git a/debian/changelog b/debian/changelog
index 3f34ae03..03676abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+llvm-toolchain-3.5 (1:3.5~+rc4-2) unstable; urgency=medium
+
+  * sync from 1:3.4.2-9~exp1
+  * libclang-3.5.so should be used instead libclang.so. Update the soname
+    to match the new lib name (Closes: #759538)
+  * Rename liblldb.so to liblldb-3.5.so + update of the soname.
+  * python-clang-3.5 description updated
+  * liblldb-3.5 and python-lldb-3.5 added
+  * lldb-3.5-dev renamed to liblldb-3.5-dev to match the previous changes
+  * Manpages for llvm-ranlib, clang-apply-replacements, pp-trace and clang-tidy
+    added
+  * clang-3.5 should depends on binutils (for ld, at least)
+    (Closes: #751030)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 30 Aug 2014 18:09:20 +0200
+
+llvm-toolchain-3.4 (1:3.4.2-8) unstable; urgency=medium
+
+  * Try to bring back lldb-3.4-dev on mips & mipsel (Closes: #758314)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 16 Aug 2014 22:39:13 +0200
+
+llvm-toolchain-3.4 (1:3.4.2-7) unstable; urgency=medium
+
+  * Upload in unstable
+  * Try to bring back lldb on mips & mipsel
+  * Force scan-build to use the same version of clang
+  * Try to fix hurd (hurd-EIEIO-undef.diff)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 05 Aug 2014 14:40:05 +0200
+
 llvm-toolchain-3.5 (1:3.5~+rc4-1) unstable; urgency=medium
 
   * New snapshot release
diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in
index a07b5ee3..c414065e 100644
--- a/debian/clang-X.Y.manpages.in
+++ b/debian/clang-X.Y.manpages.in
@@ -3,3 +3,6 @@ clang/tools/scan-build/scan-build-@LLVM_VERSION@.1
 debian/man/clang-check-@LLVM_VERSION@.1
 debian/man/clang-tblgen-@LLVM_VERSION@.1
 debian/man/scan-view-@LLVM_VERSION@.1
+debian/man/clang-tidy-@LLVM_VERSION@.1
+debian/man/clang-apply-replacements-@LLVM_VERSION@.1
+debian/man/pp-trace-@LLVM_VERSION@.1
diff --git a/debian/clang-format-X.Y.manpages.in b/debian/clang-format-X.Y.manpages.in
index a073eda3..486b909d 100644
--- a/debian/clang-format-X.Y.manpages.in
+++ b/debian/clang-format-X.Y.manpages.in
@@ -1,2 +1,2 @@
 debian/man/clang-format-diff-@LLVM_VERSION@.1
-
+debian/man/clang-format-@LLVM_VERSION@.1
diff --git a/debian/control b/debian/control
index b75f49bb..4314708f 100644
--- a/debian/control
+++ b/debian/control
@@ -22,13 +22,13 @@ Package: clang-3.5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  libclang-common-3.5-dev (= ${binary:Version}),
- libclang1-3.5 (= ${binary:Version}), libc6-dev
+ libclang1-3.5 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-3.5-dev, python
 Suggests: gnustep, gnustep-devel, clang-3.5-doc
 Replaces: clang-3.1, clang-3.2, clang-3.3,
  clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt
-Breaks: clang-3.1, clang-3.2, clang-3.3, 
+Breaks: clang-3.1, clang-3.2, clang-3.3,
  clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt
 Description: C, C++ and Objective-C compiler (LLVM based)
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -173,6 +173,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python
 Replaces: python-clang-3.3, python-clang-3.4
 Breaks: python-clang-3.3, python-clang-3.4
 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
+ Collection (GCC).
+ .
+ Clang implements all of the ISO C++ 1998 and 2001 standards and also provides
+ a partial support of C++1y.
+ .
  This binding package provides access to the Clang compiler and libraries.
 
 
@@ -380,19 +387,49 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lldb-3.5
 Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel
 # ia64 mips mipsel hurd have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}), python, llvm-3.5-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}), python, llvm-3.5-dev, liblldb-3.4, python-lldb-3.4
 Pre-Depends: ${misc:Pre-Depends}
-Replaces: lldb-3.2, lldb-3.3, lldb-3.4
-Breaks: lldb-3.2, lldb-3.3, lldb-3.4
 Description: Next generation, high-performance debugger
  LLDB is a next generation, high-performance debugger. It is built as a set of
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: lldb-3.5-dev
+Package: liblldb-3.5
 Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel
+# ia64 hurd have been removed
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Section: libs
+Replaces: lldb-3.5 (<< 1:3.5~+rc4-2~)
+Breaks: lldb-3.5 (<< 1:3.5~+rc4-2~)
+Description: Next generation, high-performance debugger, library
+ LLDB is a next generation, high-performance debugger. It is built as a set of
+ reusable components which highly leverage existing libraries in the larger LLVM
+ Project, such as the Clang expression parser and LLVM disassembler.
+ .
+ This package contains the LLDB runtime library.
+
+
+Package: python-lldb-3.5
+Section: python
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python
+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
+ reusable components which highly leverage existing libraries in the larger LLVM
+ Project, such as the Clang expression parser and LLVM disassembler.
+ .
+ This binding package provides access to lldb.
+
+
+Package: liblldb-3.5-dev
+Section: libdevel
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel
 # ia64 mips mipsel hurd have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.5 (= ${binary:Version})
+Replaces: lldb-3.5-dev (<< 1:3.5~+rc4-2~)
+Breaks: lldb-3.5-dev (<< 1:3.5~+rc4-2~)
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger - Header files
  LLDB is a next generation, high-performance debugger. It is built as a set of
@@ -400,3 +437,11 @@ Description: Next generation, high-performance debugger - Header files
  Project, such as the Clang expression parser and LLVM disassembler.
  .
  This package provides the header files to build extension over lldb.
+
+
+Package: lldb-3.5-dev
+Depends: liblldb-3.5-dev, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: transitional dummy package to liblldb-3.5-dev
+ This is a transitional dummy package. It can safely be removed.
diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in
index 71a871fe..556f59c9 100644
--- a/debian/libclang-X.Y-dev.install.in
+++ b/debian/libclang-X.Y-dev.install.in
@@ -1,6 +1,7 @@
 usr/lib/llvm-@LLVM_VERSION@/include/clang
 usr/lib/llvm-@LLVM_VERSION@/include/clang-c
 usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a
+usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so
 
 usr/lib/llvm-@LLVM_VERSION@/lib/libmodernizeCore.a
 
diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in
index e5025d27..5edcb499 100644
--- a/debian/libclang-X.Y-dev.links.in
+++ b/debian/libclang-X.Y-dev.links.in
@@ -1,3 +1,2 @@
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so
diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in
index 77bcd4eb..74348405 100644
--- a/debian/libclang1-X.Y.lintian-overrides.in
+++ b/debian/libclang1-X.Y.lintian-overrides.in
@@ -1,2 +1,5 @@
 # I know and I am not planning to change that.
 libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1
+# Provided as transition
+libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
+
diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in
index d3fff798..f70ebe05 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
@@ -1,4 +1,4 @@
-libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
+libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER#
  clang_BlockCommandComment_getArgText@Base 3.2
  clang_BlockCommandComment_getCommandName@Base 3.2
  clang_BlockCommandComment_getNumArgs@Base 3.2
@@ -7,8 +7,8 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_CXCursorSet_insert@Base 3.2
  clang_CXIndex_getGlobalOptions@Base 3.2
  clang_CXIndex_setGlobalOptions@Base 3.2
- clang_CXXMethod_isConst@Base @LLVM_VERSION@
- clang_CXXMethod_isPureVirtual@Base @LLVM_VERSION@
+ clang_CXXMethod_isConst@Base 3.4
+ clang_CXXMethod_isPureVirtual@Base 3.4
  clang_CXXMethod_isStatic@Base 3.2
  clang_CXXMethod_isVirtual@Base 3.2
  clang_Comment_getChild@Base 3.2
@@ -17,7 +17,7 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_Comment_isWhitespace@Base 3.2
  clang_CompilationDatabase_dispose@Base 3.2
  clang_CompilationDatabase_fromDirectory@Base 3.2
- clang_CompilationDatabase_getAllCompileCommands@Base @LLVM_VERSION@
+ clang_CompilationDatabase_getAllCompileCommands@Base 3.4
  clang_CompilationDatabase_getCompileCommands@Base 3.2
  clang_CompileCommand_getArg@Base 3.2
  clang_CompileCommand_getDirectory@Base 3.2
@@ -30,19 +30,19 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_Cursor_getCommentRange@Base 3.2
  clang_Cursor_getModule@Base 3.2
  clang_Cursor_getNumArguments@Base 3.2
- clang_Cursor_getObjCDeclQualifiers@Base @LLVM_VERSION@
- clang_Cursor_getObjCPropertyAttributes@Base @LLVM_VERSION@
+ clang_Cursor_getObjCDeclQualifiers@Base 3.4
+ clang_Cursor_getObjCPropertyAttributes@Base 3.4
  clang_Cursor_getObjCSelectorIndex@Base 3.2
  clang_Cursor_getParsedComment@Base 3.2
  clang_Cursor_getRawCommentText@Base 3.2
  clang_Cursor_getReceiverType@Base 3.2
  clang_Cursor_getSpellingNameRange@Base 3.2
  clang_Cursor_getTranslationUnit@Base 3.2
- clang_Cursor_isBitField@Base @LLVM_VERSION@
+ clang_Cursor_isBitField@Base 3.4
  clang_Cursor_isDynamicCall@Base 3.2
  clang_Cursor_isNull@Base 3.2
- clang_Cursor_isObjCOptional@Base @LLVM_VERSION@
- clang_Cursor_isVariadic@Base @LLVM_VERSION@
+ clang_Cursor_isObjCOptional@Base 3.4
+ clang_Cursor_isVariadic@Base 3.4
  clang_FullComment_getAsHTML@Base 3.2
  clang_FullComment_getAsXML@Base 3.2
  clang_HTMLStartTagComment_isSelfClosing@Base 3.2
@@ -58,6 +58,7 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_InlineCommandComment_getNumArgs@Base 3.2
  clang_InlineCommandComment_getRenderKind@Base 3.2
  clang_InlineContentComment_hasTrailingNewline@Base 3.2
+<<<<<<< .working
  clang_Location_isFromMainFile@Base @LLVM_VERSION@
  clang_Location_isInSystemHeader@Base @LLVM_VERSION@
  clang_ModuleMapDescriptor_create@Base @LLVM_VERSION@
@@ -66,6 +67,11 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_ModuleMapDescriptor_setUmbrellaHeader@Base @LLVM_VERSION@
  clang_ModuleMapDescriptor_writeToBuffer@Base @LLVM_VERSION@
  clang_Module_getASTFile@Base @LLVM_VERSION@
+=======
+ clang_Location_isFromMainFile@Base 3.4
+ clang_Location_isInSystemHeader@Base 3.4
+ clang_Module_getASTFile@Base 3.4
+>>>>>>> .merge-right.r1372
  clang_Module_getFullName@Base 3.2
  clang_Module_getName@Base 3.2
  clang_Module_getNumTopLevelHeaders@Base 3.2
@@ -83,6 +89,7 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_TParamCommandComment_getParamName@Base 3.2
  clang_TParamCommandComment_isParamPositionValid@Base 3.2
  clang_TextComment_getText@Base 3.2
+<<<<<<< .working
  clang_Type_getAlignOf@Base @LLVM_VERSION@
  clang_Type_getCXXRefQualifier@Base @LLVM_VERSION@
  clang_Type_getClassType@Base @LLVM_VERSION@
@@ -90,6 +97,13 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_Type_getOffsetOf@Base @LLVM_VERSION@
  clang_Type_getSizeOf@Base @LLVM_VERSION@
  clang_Type_getTemplateArgumentAsType@Base @LLVM_VERSION@
+=======
+ clang_Type_getAlignOf@Base 3.4
+ clang_Type_getCXXRefQualifier@Base 3.4
+ clang_Type_getClassType@Base 3.4
+ clang_Type_getOffsetOf@Base 3.4
+ clang_Type_getSizeOf@Base 3.4
+>>>>>>> .merge-right.r1372
  clang_VerbatimBlockLineComment_getText@Base 3.2
  clang_VerbatimLineComment_getText@Base 3.2
  clang_VirtualFileOverlay_addFileMapping@Base @LLVM_VERSION@
@@ -139,8 +153,13 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_equalRanges@Base 3.2
  clang_equalTypes@Base 3.2
  clang_executeOnThread@Base 3.2
+<<<<<<< .working
  clang_findIncludesInFile@Base @LLVM_VERSION@
  clang_findIncludesInFileWithBlock@Base @LLVM_VERSION@
+=======
+ clang_findIncludesInFile@Base 3.4
+ clang_findIncludesInFileWithBlock@Base 3.4
+>>>>>>> .merge-right.r1372
  clang_findReferencesInFile@Base 3.2
  clang_findReferencesInFileWithBlock@Base 3.2
  clang_formatDiagnostic@Base 3.2
@@ -205,12 +224,24 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_getEnumConstantDeclValue@Base 3.2
  clang_getEnumDeclIntegerType@Base 3.2
  clang_getExpansionLocation@Base 3.2
+<<<<<<< .working
  clang_getFieldDeclBitWidth@Base @LLVM_VERSION@
+=======
+ clang_getFieldDeclBitWidth@Base 3.4
+>>>>>>> .merge-right.r1372
  clang_getFile@Base 3.2
+<<<<<<< .working
  clang_getFileLocation@Base @LLVM_VERSION@
+=======
+ clang_getFileLocation@Base 3.4
+>>>>>>> .merge-right.r1372
  clang_getFileName@Base 3.2
  clang_getFileTime@Base 3.2
+<<<<<<< .working
  clang_getFileUniqueID@Base @LLVM_VERSION@
+=======
+ clang_getFileUniqueID@Base 3.4
+>>>>>>> .merge-right.r1372
  clang_getFunctionTypeCallingConv@Base 3.2
  clang_getIBOutletCollectionType@Base 3.2
  clang_getIncludedFile@Base 3.2
@@ -251,7 +282,11 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_getTranslationUnitSpelling@Base 3.2
  clang_getTypeDeclaration@Base 3.2
  clang_getTypeKindSpelling@Base 3.2
+<<<<<<< .working
  clang_getTypeSpelling@Base @LLVM_VERSION@
+=======
+ clang_getTypeSpelling@Base 3.4
+>>>>>>> .merge-right.r1372
  clang_getTypedefDeclUnderlyingType@Base 3.2
  clang_hashCursor@Base 3.2
  clang_indexLoc_getCXSourceLocation@Base 3.2
diff --git a/debian/liblldb-X.Y-dev.install.in b/debian/liblldb-X.Y-dev.install.in
new file mode 100644
index 00000000..96c96b31
--- /dev/null
+++ b/debian/liblldb-X.Y-dev.install.in
@@ -0,0 +1,4 @@
+/usr/lib/llvm-@LLVM_VERSION@/include/lldb
+/usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*a
+
+
diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Y.install.in
new file mode 100644
index 00000000..0e364cd1
--- /dev/null
+++ b/debian/liblldb-X.Y.install.in
@@ -0,0 +1,4 @@
+usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1
+usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/readline.so
+
diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Y.links.in
new file mode 100644
index 00000000..a046fc49
--- /dev/null
+++ b/debian/liblldb-X.Y.links.in
@@ -0,0 +1,5 @@
+usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1               usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so
+usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1               usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so         usr/lib/python2.7/dist-packages/lldb-@LLVM_VERSION@/_lldb.so
+usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1
+
diff --git a/debian/liblldb-X.Y.lintian-overrides.in b/debian/liblldb-X.Y.lintian-overrides.in
new file mode 100644
index 00000000..b045ee27
--- /dev/null
+++ b/debian/liblldb-X.Y.lintian-overrides.in
@@ -0,0 +1,4 @@
+# That is normal. The lib is not (yet?) shipped as a new package
+liblldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb
+# For now, override this warning. We might create a -dev at some point
+liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
diff --git a/debian/lldb-X.Y-dev.install.in b/debian/lldb-X.Y-dev.install.in
deleted file mode 100644
index 393c07bb..00000000
--- a/debian/lldb-X.Y-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/llvm-@LLVM_VERSION@/include/lldb
-usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*a
diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in
index 4c3b062f..16e1859c 100644
--- a/debian/lldb-X.Y.install.in
+++ b/debian/lldb-X.Y.install.in
@@ -1,12 +1,10 @@
 usr/bin/lldb-@LLVM_VERSION@
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-platform
-usr/lib/llvm-@LLVM_VERSION@/bin/lldb-gdbserver
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi
-usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
-usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/
-usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/readline.so
+usr/lib/llvm-@LLVM_VERSION@/bin/lldb-gdbserver
 
 usr/bin/lldb-platform-@LLVM_VERSION@
 usr/bin/lldb-gdbserver-@LLVM_VERSION@
 usr/bin/lldb-mi-@LLVM_VERSION@
+
diff --git a/debian/lldb-X.Y.lintian-overrides.in b/debian/lldb-X.Y.lintian-overrides.in
index 362e2b60..a456a341 100644
--- a/debian/lldb-X.Y.lintian-overrides.in
+++ b/debian/lldb-X.Y.lintian-overrides.in
@@ -1,5 +1,3 @@
-# That is normal. The lib is not shipped as a new package
-lldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb
 lldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
 # Does not really matter
 lldb-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-@LLVM_VERSION@.1.gz
diff --git a/debian/llvm-X.Y.manpages.in b/debian/llvm-X.Y.manpages.in
index b74242d7..693f9ee6 100644
--- a/debian/llvm-X.Y.manpages.in
+++ b/debian/llvm-X.Y.manpages.in
@@ -7,4 +7,5 @@ debian/man/llvm-rtdyld-@LLVM_VERSION@.1
 debian/man/llvm-size-@LLVM_VERSION@.1
 debian/man/llvm-tblgen-@LLVM_VERSION@.1
 debian/man/macho-dump-@LLVM_VERSION@.1
+debian/man/llvm-ranlib-@LLVM_VERSION@.1
 
diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch
index 7142fd19..f3a3ddfc 100644
--- a/debian/patches/18-soname.patch
+++ b/debian/patches/18-soname.patch
@@ -15,7 +15,7 @@ Index: llvm-toolchain-snapshot_3.5~svn213052/clang/tools/libclang/Makefile
  # Add soname to the library.
  ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD))
 -        LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT)
-+        LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_MAJOR)
++        LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT)
  endif
  
  ifeq ($(ENABLE_CLANG_ARCMT),1)
diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff
new file mode 100644
index 00000000..db56d832
--- /dev/null
+++ b/debian/patches/lldb-libname.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-3.5-3.5~+rc4/lldb/lib/Makefile
+===================================================================
+--- llvm-toolchain-3.5-3.5~+rc4.orig/lldb/lib/Makefile
++++ llvm-toolchain-3.5-3.5~+rc4/lldb/lib/Makefile
+@@ -175,7 +175,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
+     LLVMLibsOptions += -Wl,--no-undefined
+     # Link in python
+     LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel
+-    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION)
++	LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT).$(SONAME_EXTENSION)
+     ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe))
+      # Link GCC atomic helper library
+      LLVMLibsOptions += -latomic
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 8c951e0d..1610770b 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -11,42 +11,3 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build
    if (!defined $Clang || ! -x $Clang) {
      $Clang = Cwd::realpath("$RealBin/clang");
    }
-diff -Naur llvm-toolchain-3.5-3.5~+rc1.orig/clang/tools/scan-build/ccc-analyzer llvm-toolchain-3.5-3.5~+rc1/clang/tools/scan-build/ccc-analyzer
---- llvm-toolchain-3.5-3.5~+rc1.orig/clang/tools/scan-build/ccc-analyzer	2014-08-06 10:29:51.990552103 +0200
-+++ llvm-toolchain-3.5-3.5~+rc1/clang/tools/scan-build/ccc-analyzer	2014-08-06 10:35:05.016567533 +0200
-@@ -25,6 +25,17 @@
- # Compiler command setup.
- ##===----------------------------------------------------------------------===##
- 
-+# Search in the PATH if the compiler exists
-+sub SearchInPath {
-+    my $file = shift;
-+    foreach my $dir (split (':', $ENV{PATH})) {
-+        if (-x "$dir/$file") {
-+            return 1;
-+        }
-+    }
-+    return 0;
-+}
-+
- my $Compiler;
- my $Clang;
- my $DefaultCCompiler;
-@@ -41,7 +52,7 @@
- 
- if ($FindBin::Script =~ /c\+\+-analyzer/) {
-   $Compiler = $ENV{'CCC_CXX'};
--  if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCXXCompiler; }
-+  if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
- 
-   $Clang = $ENV{'CLANG_CXX'};
-   if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
-@@ -50,7 +61,7 @@
- }
- else {
-   $Compiler = $ENV{'CCC_CC'};
--  if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCCompiler; }
-+  if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; }
- 
-   $Clang = $ENV{'CLANG'};
-   if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
diff --git a/debian/patches/series b/debian/patches/series
index d96d7063..fd724e55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,3 +44,4 @@ kfreebsd-lldb-gdbserver.diff
 #fix-lldb-3.5-rc2.diff
 gcc-compat-1.diff
 gcc-compat-2.diff
+lldb-libname.diff
diff --git a/debian/python-lldb-X.Y.install.in b/debian/python-lldb-X.Y.install.in
new file mode 100644
index 00000000..75f28cf9
--- /dev/null
+++ b/debian/python-lldb-X.Y.install.in
@@ -0,0 +1 @@
+build-llvm/Release/lib/python2.7/site-packages/lldb/ /usr/lib/python2.7/dist-packages/
diff --git a/debian/python-lldb-X.Y.links.in b/debian/python-lldb-X.Y.links.in
new file mode 100644
index 00000000..0b700f07
--- /dev/null
+++ b/debian/python-lldb-X.Y.links.in
@@ -0,0 +1,3 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1  usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1  usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1
+
diff --git a/debian/rules b/debian/rules
index d7ccd140..7ffba7c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,7 +121,7 @@ LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el
 # mips* fails with "undefined references to `__atomic_load_8'"
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 # Disable LLDB for this arch.
-        LLDB_ENABLE=no
+		LLDB_ENABLE=no
 endif
 
 
@@ -154,25 +154,25 @@ override_dh_auto_configure: preconfigure
 
 # Remove some old symlinks
 	cd tools/ && \
-	if test -h clang; then \
-		rm clang; \
-	fi; \
-    ln -s ../clang .; \
+		if test -h clang; then \
+			rm clang; \
+		fi; \
+		ln -s ../clang .; \
 	readlink clang
 
 	if test $(POLLY_ENABLE) = yes; then \
-	cd tools/ && \
-    if test -h polly; then \
-        rm polly; \
-    fi; \
-    ln -s ../polly .; \
+		cd tools/ && \
+		if test -h polly; then \
+			rm polly; \
+		fi; \
+		ln -s ../polly .; \
 	fi
 
 	if test $(LLDB_ENABLE) = yes; then \
-	    cd tools/ && \
-	    if test -h lldb; then \
+		cd tools/ && \
+		if test -h lldb; then \
 		   rm lldb; \
-	    fi; \
+		fi; \
 		ln -s ../lldb .; \
 	fi
 
@@ -253,36 +253,31 @@ build_doc:
 	help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
 	help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
 
-	for f in clang clang-tblgen clang-check; do \
-		help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
+	CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen llvm-ranlib macho-dump lldb clang-format clang-modernize clang clang-tblgen clang-check clang-tidy clang-apply-replacements pp-trace"; \
+	for f in $$CMDS; do \
+		echo "Generating manpage of $$f"; \
+		LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
 	done
 
-	for f in llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen macho-dump lldb clang-format clang-modernize; do \
-		help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
-	done
-
-
 override_dh_auto_install:
 	$(MAKE) -C $(TARGET_BUILD) VERBOSE=1 install DESTDIR=$(DEB_INST)/
 
 	chrpath -d $(TARGET_BUILD)/Release/bin/clang
 	chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable`
+	chmod -x $(TARGET_BUILD)/tools/polly/Release/lib/libpolly*.a
 
 # Add the trailing soname
 	mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT)
 
-
-	if test $(LLDB_ENABLE) = yes; then \
-		mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so.$(SONAME_EXT); \
-	fi
-
 	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \
-	if test ! -f libclang-$(LLVM_VERSION).so.$(SONAME_EXT); then \
-		mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \
-		ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \
+	mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \
+	ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \
+        ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \
+	if test $(LLDB_ENABLE) = yes; then \
+		mv liblldb.so liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \
+		ln -s liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) liblldb.so.$(SONAME_EXT); \
 	fi; \
-	rm -f libLLVM-$(LLVM_VERSION_FULL).so; \
-	rm -f libclang.so
+	rm -f libLLVM-$(LLVM_VERSION_FULL).so
 
 # Remove artefact (where compiler-rt is built)
 	if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \
@@ -321,8 +316,10 @@ override_dh_auto_install:
 
 	cp -f $(CURDIR)/clang/tools/clang-format/clang-format.py clang/tools/clang-format/clang-format-$(LLVM_VERSION).py
 
+	rm -rf clang/tools/scan-build-$(LLVM_VERSION)
 	cp -fR $(CURDIR)/clang/tools/scan-build clang/tools/scan-build-$(LLVM_VERSION)
 
+	rm -rf clang/tools/scan-view-$(LLVM_VERSION)
 	cp -fR $(CURDIR)/clang/tools/scan-view clang/tools/scan-view-$(LLVM_VERSION)
 
 # Remove some license files