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 17167ade..16a84f00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,71 @@ llvm-toolchain-snapshot (1:3.6~svn215195-1) unstable; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 04 Aug 2014 13:36:15 +0200
 
+llvm-toolchain-3.5 (1:3.5~+rc4-2~exp1) experimental; 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)
+  * clang/www/analyzer/scripts/dbtree.js removed
+
+ -- 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
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 27 Aug 2014 23:09:59 +0200
+
+llvm-toolchain-3.5 (1:3.5~+rc3-1) unstable; urgency=medium
+
+  * New snapshot release
+  * Cherry-pick to commit from upstream (revisions 214906 214907)
+    to improve the gcc compat
+  * Remove scan-build-clang-path.diff (applied upstream)
+  * Just like in 3.4, bring back lldb & lldb-dev under mips & mipsel
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 20 Aug 2014 23:43:06 +0200
+
+llvm-toolchain-3.5 (1:3.5~+rc2-1) unstable; urgency=medium
+
+  * Fix the version
+  * try to build lldb-gdbserver under kfreebsd (kfreebsd-lldb-gdbserver.diff)
+  * Second try to fix build under HURD (hurd-EIEIO-undef.diff)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 08 Aug 2014 10:42:13 +0200
+
+llvm-toolchain-3.5 (1:3.5~+rc2-1~exp1) unstable; urgency=medium
+
+  * New snapshot release
+  * Enable compressed debug sections (Closes: #757002)
+  * Force scan-build to use the same version of clang
+  * Bring back scan-build-search-path.diff (Closes: #757219)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 04 Aug 2014 13:35:35 +0200
+
 llvm-toolchain-snapshot (1:3.6~svn214630-1~exp1) experimental; urgency=medium
 
   * New snapshot release (3.5 => 3.6)
@@ -36,7 +101,7 @@ llvm-toolchain-snapshot (1:3.6~svn214630-1~exp1) experimental; urgency=medium
   * Remove of pollycc
   * clang alternatives are managed by llvm-defaults
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 31 Jul 2014 08:42:35 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 31 Jul 2014 18:12:59 +0200
 
 llvm-toolchain-3.5 (1:3.5~+rc1-2) unstable; urgency=medium
 
diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in
index 52efa24f..dabecf22 100644
--- a/debian/clang-X.Y.lintian-overrides.in
+++ b/debian/clang-X.Y.lintian-overrides.in
@@ -2,3 +2,10 @@
 clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz
 clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz
 clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz
+clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz
+clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz
+clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz
+clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz
+clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/pp-trace-@LLVM_VERSION@.1.gz
+clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz
+
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 6ef4f290..31bfa0c4 100644
--- a/debian/control
+++ b/debian/control
@@ -23,13 +23,14 @@ Package: clang-3.6
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  libclang-common-3.6-dev (= ${binary:Version}),
- libclang1-3.6 (= ${binary:Version}), libc6-dev
+ libclang1-3.6 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-3.6-dev, python
 Suggests: gnustep, gnustep-devel, clang-3.6-doc
-# remettre les clang-X.Y avec les versions spécifiques
-Replaces: clang-3.2, clang-3.3, compiler-rt
-Breaks: clang-3.2, clang-3.3, compiler-rt
+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,
+ 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
  for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
@@ -73,8 +74,8 @@ Description: Tool to convert C++98 and C++03 code to C++11
 Package: clang-modernize-3.6
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.6
-Replaces: cpp11-migrate-3.3, cpp11-migrate-3.4, cpp11-migrate-3.5
-Breaks: cpp11-migrate-3.3, cpp11-migrate-3.4, cpp11-migrate-3.5
+Replaces: cpp11-migrate-3.3, cpp11-migrate-3.4
+Breaks: cpp11-migrate-3.3, cpp11-migrate-3.4
 Description: Tool to convert C++98 and C++03 code to C++11
  The purpose of the C++11 Migrator is to do source-to-source translation to
  migrate existing C++ code to use C++11 features to enhance
@@ -170,9 +171,16 @@ Package: python-clang-3.6
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
-Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5
-Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5
+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 +388,49 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lldb-3.6
 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.6 (= ${binary:Version}), python, llvm-3.6-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.6 (= ${binary:Version}), python, llvm-3.6-dev, liblldb-3.4, python-lldb-3.4
 Pre-Depends: ${misc:Pre-Depends}
-Replaces: lldb-3.2, lldb-3.3, lldb-3.4, lldb-3.5
-Breaks: lldb-3.2, lldb-3.3, lldb-3.4, lldb-3.5
 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.6-dev
+Package: liblldb-3.6
 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.6 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Section: libs
+Replaces: lldb-3.6 (<= 1:3.6~svn215195-2)
+Breaks: lldb-3.6 (<< 1:3.6~svn215195-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.6
+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.6-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.6 (= ${binary:Version})
+Replaces: lldb-3.6-dev (<= 1:3.6~svn215195-2)
+Breaks: lldb-3.6-dev (<< 1:3.6~svn215195-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 +438,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.6-dev
+Depends: liblldb-3.6-dev, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: transitional dummy package to liblldb-3.6-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..aa7ef217 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
+# I know and I am not planning to change that yet.
+libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@
+# Provided as transition
+libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
+libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so
diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in
index d3fff798..54f16515 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,14 +58,14 @@ 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
- clang_Location_isFromMainFile@Base @LLVM_VERSION@
- clang_Location_isInSystemHeader@Base @LLVM_VERSION@
+ clang_Location_isFromMainFile@Base 3.4
+ clang_Location_isInSystemHeader@Base 3.4
  clang_ModuleMapDescriptor_create@Base @LLVM_VERSION@
  clang_ModuleMapDescriptor_dispose@Base @LLVM_VERSION@
  clang_ModuleMapDescriptor_setFrameworkModuleName@Base @LLVM_VERSION@
  clang_ModuleMapDescriptor_setUmbrellaHeader@Base @LLVM_VERSION@
  clang_ModuleMapDescriptor_writeToBuffer@Base @LLVM_VERSION@
- clang_Module_getASTFile@Base @LLVM_VERSION@
+ clang_Module_getASTFile@Base 3.4
  clang_Module_getFullName@Base 3.2
  clang_Module_getName@Base 3.2
  clang_Module_getNumTopLevelHeaders@Base 3.2
@@ -83,12 +83,12 @@ 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
- clang_Type_getAlignOf@Base @LLVM_VERSION@
- clang_Type_getCXXRefQualifier@Base @LLVM_VERSION@
- clang_Type_getClassType@Base @LLVM_VERSION@
+ clang_Type_getAlignOf@Base 3.4
+ clang_Type_getCXXRefQualifier@Base 3.4
+ clang_Type_getClassType@Base 3.4
  clang_Type_getNumTemplateArguments@Base @LLVM_VERSION@
- clang_Type_getOffsetOf@Base @LLVM_VERSION@
- clang_Type_getSizeOf@Base @LLVM_VERSION@
+ clang_Type_getOffsetOf@Base 3.4
+ clang_Type_getSizeOf@Base 3.4
  clang_Type_getTemplateArgumentAsType@Base @LLVM_VERSION@
  clang_VerbatimBlockLineComment_getText@Base 3.2
  clang_VerbatimLineComment_getText@Base 3.2
@@ -139,8 +139,8 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_equalRanges@Base 3.2
  clang_equalTypes@Base 3.2
  clang_executeOnThread@Base 3.2
- clang_findIncludesInFile@Base @LLVM_VERSION@
- clang_findIncludesInFileWithBlock@Base @LLVM_VERSION@
+ clang_findIncludesInFile@Base 3.4
+ clang_findIncludesInFileWithBlock@Base 3.4
  clang_findReferencesInFile@Base 3.2
  clang_findReferencesInFileWithBlock@Base 3.2
  clang_formatDiagnostic@Base 3.2
@@ -205,12 +205,12 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_getEnumConstantDeclValue@Base 3.2
  clang_getEnumDeclIntegerType@Base 3.2
  clang_getExpansionLocation@Base 3.2
- clang_getFieldDeclBitWidth@Base @LLVM_VERSION@
+ clang_getFieldDeclBitWidth@Base 3.4
  clang_getFile@Base 3.2
- clang_getFileLocation@Base @LLVM_VERSION@
+ clang_getFileLocation@Base 3.4
  clang_getFileName@Base 3.2
  clang_getFileTime@Base 3.2
- clang_getFileUniqueID@Base @LLVM_VERSION@
+ clang_getFileUniqueID@Base 3.4
  clang_getFunctionTypeCallingConv@Base 3.2
  clang_getIBOutletCollectionType@Base 3.2
  clang_getIncludedFile@Base 3.2
@@ -251,7 +251,7 @@ libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_getTranslationUnitSpelling@Base 3.2
  clang_getTypeDeclaration@Base 3.2
  clang_getTypeKindSpelling@Base 3.2
- clang_getTypeSpelling@Base @LLVM_VERSION@
+ clang_getTypeSpelling@Base 3.4
  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..e1818b34
--- /dev/null
+++ b/debian/liblldb-X.Y.install.in
@@ -0,0 +1,3 @@
+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.links.in b/debian/lldb-X.Y.links.in
deleted file mode 100644
index f1da9c3e..00000000
--- a/debian/lldb-X.Y.links.in
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1               usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so
-usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1               usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1
-usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so         usr/lib/python2.7/dist-packages/lldb/_lldb.so
-usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1
-
-usr/bin/lldb-@LLVM_VERSION@ usr/bin/lldb
-usr/bin/lldb-platform-@LLVM_VERSION@ usr/bin/lldb-platform
-usr/bin/lldb-gdbserver-@LLVM_VERSION@ usr/bin/lldb-gdbserver
-usr/bin/lldb-mi-@LLVM_VERSION@ usr/bin/lldb-mi
-
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1  usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1  usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1
-
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-runtime.lintian-overrides.in b/debian/llvm-X.Y-runtime.lintian-overrides.in
new file mode 100644
index 00000000..e94e7130
--- /dev/null
+++ b/debian/llvm-X.Y-runtime.lintian-overrides.in
@@ -0,0 +1 @@
+llvm-@LLVM_VERSION@-runtime: binary-without-manpage usr/bin/lli-child-target-@LLVM_VERSION@
diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in
index 83b613b8..68b5cbe3 100644
--- a/debian/llvm-X.Y.install.in
+++ b/debian/llvm-X.Y.install.in
@@ -3,14 +3,8 @@ usr/lib/llvm-@LLVM_VERSION@/bin/opt*
 usr/lib/llvm-@LLVM_VERSION@/bin/macho-dump*
 usr/lib/llvm-@LLVM_VERSION@/bin/bugpoint*
 usr/lib/llvm-@LLVM_VERSION@/bin/llc*
-usr/lib/llvm-@LLVM_VERSION@/bin/obj2yaml
-usr/lib/llvm-@LLVM_VERSION@/bin/yaml2obj
-usr/lib/llvm-@LLVM_VERSION@/bin/verify-uselistorder
 usr/bin/llvm-*
 usr/bin/opt*
 usr/bin/macho-dump*
 usr/bin/bugpoint*
 usr/bin/llc*
-usr/bin/obj2yaml-*
-usr/bin/yaml2obj-*
-usr/bin/verify-uselistorder-*
diff --git a/debian/llvm-X.Y.lintian-overrides.in b/debian/llvm-X.Y.lintian-overrides.in
index ac3f7567..5bfc9240 100644
--- a/debian/llvm-X.Y.lintian-overrides.in
+++ b/debian/llvm-X.Y.lintian-overrides.in
@@ -7,3 +7,4 @@ llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rt
 llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-@LLVM_VERSION@.1.gz
 llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-@LLVM_VERSION@.1.gz
 llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-@LLVM_VERSION@.1.gz
+llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-ranlib-@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/orig-tar.sh b/debian/orig-tar.sh
index 79f04fe7..4ebeed69 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -14,8 +14,8 @@ set -e
 # sh 3.4/debian/orig-tar.sh RELEASE_34 rc1
 
 SVN_BASE_URL=http://llvm.org/svn/llvm-project/
-MAJOR_VERSION=3.6
-CURRENT_VERSION=3.6 # Should be changed to 3.6.1 later
+MAJOR_VERSION=3.5
+CURRENT_VERSION=3.5 # Should be changed to 3.5.1 later
 
 if test -n "$1"; then
 # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/
diff --git a/debian/patches/0047-version-name.diff b/debian/patches/0047-version-name.diff
index 94718986..a6baa19a 100644
--- a/debian/patches/0047-version-name.diff
+++ b/debian/patches/0047-version-name.diff
@@ -1,28 +1,28 @@
-Index: llvm-toolchain-snapshot_3.6~svn214390/autoconf/configure.ac
+Index: llvm-toolchain-snapshot_3.5~svn202847/autoconf/configure.ac
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn214390.orig/autoconf/configure.ac
-+++ llvm-toolchain-snapshot_3.6~svn214390/autoconf/configure.ac
-@@ -32,7 +32,7 @@ dnl===----------------------------------
+--- llvm-toolchain-snapshot_3.5~svn202847.orig/autoconf/configure.ac	2014-03-04 14:43:34.430731503 +0100
++++ llvm-toolchain-snapshot_3.5~svn202847/autoconf/configure.ac	2014-03-04 14:43:53.702730643 +0100
+@@ -32,7 +32,7 @@
  dnl Initialize autoconf and define the package name, version number and
  dnl address for reporting bugs.
  
--AC_INIT([LLVM],[3.6.0svn],[http://llvm.org/bugs/])
-+AC_INIT([LLVM],[3.6.0],[http://llvm.org/bugs/])
+-AC_INIT([LLVM],[3.5.0svn],[http://llvm.org/bugs/])
++AC_INIT([LLVM],[3.5.0],[http://llvm.org/bugs/])
  
  LLVM_VERSION_MAJOR=3
- LLVM_VERSION_MINOR=6
-Index: llvm-toolchain-snapshot_3.6~svn214390/configure
+ LLVM_VERSION_MINOR=5
+Index: llvm-toolchain-snapshot_3.5~svn202847/configure
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn214390.orig/configure
-+++ llvm-toolchain-snapshot_3.6~svn214390/configure
-@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
+--- llvm-toolchain-snapshot_3.5~svn202847.orig/configure	2014-03-04 14:43:34.430731503 +0100
++++ llvm-toolchain-snapshot_3.5~svn202847/configure	2014-03-04 14:44:24.942729247 +0100
+@@ -561,8 +561,8 @@
  # Identity of this package.
  PACKAGE_NAME='LLVM'
  PACKAGE_TARNAME='llvm'
--PACKAGE_VERSION='3.6.0svn'
--PACKAGE_STRING='LLVM 3.6.0svn'
-+PACKAGE_VERSION='3.6.0'
-+PACKAGE_STRING='LLVM 3.6.0'
+-PACKAGE_VERSION='3.5.0svn'
+-PACKAGE_STRING='LLVM 3.5.0svn'
++PACKAGE_VERSION='3.5.0'
++PACKAGE_STRING='LLVM 3.5.0'
  PACKAGE_BUGREPORT='http://llvm.org/bugs/'
  
  ac_unique_file="lib/IR/Module.cpp"
diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch
index 39f24ec2..ec3741d2 100644
--- a/debian/patches/18-soname.patch
+++ b/debian/patches/18-soname.patch
@@ -15,7 +15,7 @@ Index: llvm-toolchain-snapshot_3.6~svn214630/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/disable-powerpc-test.diff b/debian/patches/disable-powerpc-test.diff
new file mode 100644
index 00000000..9f4cee8b
--- /dev/null
+++ b/debian/patches/disable-powerpc-test.diff
@@ -0,0 +1,10 @@
+Index: llvm-toolchain-3.5-3.5~+rc2/test/CodeGen/PowerPC/unal-altivec.ll
+===================================================================
+--- llvm-toolchain-3.5-3.5~+rc2.orig/test/CodeGen/PowerPC/unal-altivec.ll
++++ llvm-toolchain-3.5-3.5~+rc2/test/CodeGen/PowerPC/unal-altivec.ll
+@@ -1,4 +1,5 @@
+ ; RUN: llc < %s -mcpu=g5 | FileCheck %s
++; XFAIL: *
+ target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128-v128:128:128-n32:64"
+ target triple = "powerpc64-unknown-linux-gnu"
+ 
diff --git a/debian/patches/kfreebsd-lldb-gdbserver.diff b/debian/patches/kfreebsd-lldb-gdbserver.diff
new file mode 100644
index 00000000..6b10091c
--- /dev/null
+++ b/debian/patches/kfreebsd-lldb-gdbserver.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-3.5-3.5~+rc2/lldb/tools/Makefile
+===================================================================
+--- llvm-toolchain-3.5-3.5~+rc2.orig/lldb/tools/Makefile
++++ llvm-toolchain-3.5-3.5~+rc2/lldb/tools/Makefile
+@@ -13,7 +13,7 @@ include $(LLDB_LEVEL)/../../Makefile.con
+ DIRS :=
+ 
+ # enable lldb-gdbserver for supported platforms
+-ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux)))
++ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux GNU/kFreeBSD)))
+ DIRS += lldb-gdbserver
+ endif
+ 
diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff
new file mode 100644
index 00000000..d8ec11d6
--- /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)
+     ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe))
+      # Link GCC atomic helper library
+      LLVMLibsOptions += -latomic
diff --git a/debian/patches/series b/debian/patches/series
index 145caeb9..609d02e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,8 +9,7 @@
 0021-shared-lib-debian.patch
 0023-link-libopagent.patch
 0044-soname.diff
-0047-version-name.diff
-scan-build-clang-path.diff
+#scan-build-clang-path.diff
 declare_clear_cache.diff
 31-powerpcspe.diff
 34-powerpc-no-altivec.diff
@@ -25,14 +24,18 @@ atomic_library_2.diff
 python-clangpath.diff
 removeduplicatedeclaration.diff
 fix-clang-path-and-build.diff
+<<<<<<< .working
 #include-target.diff
+=======
+silent-MCJIIT-tests.diff
+#include-target.diff
+>>>>>>> .merge-right.r1379
 force-gcc-header-obj.diff
 do-not-fail-on-unexpected-pass.diff
 silent-more-tests.diff
 disable-display-PASS-UNSUPPORTED-XFAIL.diff
 lldb-link-atomic.diff
 fix-llvm-config-obj-src-root.patch
-suffixsvn.diff
 compiler-rt-path.diff
 lldb-soname.diff
 force-link-pass.o.diff
@@ -41,3 +44,4 @@ lldb-kfreebsd.diff
 hurd-EIEIO-undef.diff
 silent-MCJIIT-tests.diff
 kfreebsd-lldb-mi.diff
+lldb-libname.diff
diff --git a/debian/patches/suffixsvn.diff b/debian/patches/suffixsvn.diff
index d15c5ffb..1259e4fd 100644
--- a/debian/patches/suffixsvn.diff
+++ b/debian/patches/suffixsvn.diff
@@ -1,23 +1,23 @@
-Index: llvm-toolchain-snapshot_3.6~svn214390/autoconf/configure.ac
+Index: llvm-toolchain-snapshot_3.5~svn207356/autoconf/configure.ac
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn214390.orig/autoconf/configure.ac
-+++ llvm-toolchain-snapshot_3.6~svn214390/autoconf/configure.ac
-@@ -37,7 +37,7 @@ AC_INIT([LLVM],[3.6.0],[http://llvm.org/
+--- llvm-toolchain-snapshot_3.5~svn207356.orig/autoconf/configure.ac	2014-04-27 07:56:06.576699406 -0700
++++ llvm-toolchain-snapshot_3.5~svn207356/autoconf/configure.ac	2014-04-27 07:56:06.572699443 -0700
+@@ -37,7 +37,7 @@
  LLVM_VERSION_MAJOR=3
- LLVM_VERSION_MINOR=6
+ LLVM_VERSION_MINOR=5
  LLVM_VERSION_PATCH=0
 -LLVM_VERSION_SUFFIX=svn
 +LLVM_VERSION_SUFFIX=
  
  AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API])
  AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API])
-Index: llvm-toolchain-snapshot_3.6~svn214390/configure
+Index: llvm-toolchain-snapshot_3.5~svn207356/configure
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn214390.orig/configure
-+++ llvm-toolchain-snapshot_3.6~svn214390/configure
-@@ -1926,7 +1926,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+--- llvm-toolchain-snapshot_3.5~svn207356.orig/configure	2014-04-27 07:56:06.312701828 -0700
++++ llvm-toolchain-snapshot_3.5~svn207356/configure	2014-04-27 10:00:36.436143478 -0700
+@@ -1938,7 +1938,7 @@
  LLVM_VERSION_MAJOR=3
- LLVM_VERSION_MINOR=6
+ LLVM_VERSION_MINOR=5
  LLVM_VERSION_PATCH=0
 -LLVM_VERSION_SUFFIX=svn
 +LLVM_VERSION_SUFFIX=
diff --git a/debian/patches/use-deb-json.diff b/debian/patches/use-deb-json.diff
index 1a93e6f9..f3ace12f 100644
--- a/debian/patches/use-deb-json.diff
+++ b/debian/patches/use-deb-json.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.6~svn214390/polly/lib/Makefile
+Index: llvm-toolchain-snapshot_3.5~svn204005/polly/lib/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn214390.orig/polly/lib/Makefile
-+++ llvm-toolchain-snapshot_3.6~svn214390/polly/lib/Makefile
-@@ -13,7 +13,7 @@ LOADABLE_MODULE = 1
+--- llvm-toolchain-snapshot_3.5~svn204005.orig/polly/lib/Makefile	2014-03-15 13:31:47.078458657 +0100
++++ llvm-toolchain-snapshot_3.5~svn204005/polly/lib/Makefile	2014-03-15 13:37:10.367703705 +0100
+@@ -13,7 +13,7 @@
  CPP.Flags += $(POLLY_INC)
  LD.Flags += $(POLLY_LD) $(POLLY_LIB)
  
@@ -11,8 +11,8 @@ Index: llvm-toolchain-snapshot_3.6~svn214390/polly/lib/Makefile
  
  include $(LEVEL)/Makefile.config
  
-@@ -42,9 +42,9 @@ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
-                    CodeGen/IslExprBuilder.cpp \
+@@ -46,9 +46,9 @@
+ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
                     CodeGen/IslCodeGeneration.cpp
  
 -POLLY_JSON_FILES= JSON/json_reader.cpp \
diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh
index ac968ed1..0dada9ea 100644
--- a/debian/prepare-new-release.sh
+++ b/debian/prepare-new-release.sh
@@ -1,10 +1,15 @@
 #!/bin/sh
-ORIG_VERSION=3.5
-TARGET_VERSION=3.6
-ORIG_VERSION_2=3_5
-TARGET_VERSION_2=3_6
+ORIG_VERSION=3.4
+TARGET_VERSION=3.5
+ORIG_VERSION_2=3_4
+TARGET_VERSION_2=3_5
 
-LIST=`ls debian/control debian/orig-tar.sh debian/rules`
+LIST=`ls debian/*$ORIG_VERSION*`
+for F in $LIST; do
+    TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"`
+    svn mv $F $TARGET
+done
+LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules`
 for F in $LIST; do
     sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F
     sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F
diff --git a/debian/python-lldb-X.Y.install.in b/debian/python-lldb-X.Y.install.in
new file mode 100644
index 00000000..3e2c69ea
--- /dev/null
+++ b/debian/python-lldb-X.Y.install.in
@@ -0,0 +1 @@
+usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/
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 4dba7c38..a6b9442d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,10 @@ TARGET_BUILD	:= build-llvm
 DEB_INST		:= $(CURDIR)/debian/tmp/
 #GCC_VERSION     := 4.8
 GCC_VERSION     := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p')
-LLVM_VERSION	:= 3.6
+LLVM_VERSION	:= 3.5
 LLVM_VERSION_FULL := $(LLVM_VERSION).0
 SONAME_EXT      := 1
-# Manage the case when the version is 1:3.6~svn213.62-1~exp1 or 1:3.4.2-1
+# Manage the case when the version is 1:3.5~svn213052-1~exp1 or 1:3.4.2-1
 DEBIAN_REVISION := $(shell dpkg-parsechangelog |  sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p")
 ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
   NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
@@ -90,7 +90,7 @@ ifneq (,$(filter scan-build,$(DEB_BUILD_OPTIONS)))
 # enable the build using scan-build
 # The package are installed through the variable declarations:
 # OTHERMIRROR="deb http://llvm.org/apt/unstable/ llvm-toolchain main"
-# EXTRAPACKAGES="clang-3.6"
+# EXTRAPACKAGES="clang-3.5"
 	PRE_PROCESS=scan-build-$(LLVM_VERSION) -analyzer-config stable-report-filename=true
 	PRE_PROCESS_CONF=scan-build-$(LLVM_VERSION)
 # no need to run tests in this case
@@ -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,33 @@ 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`
+	if build-llvm/tools/polly/Release/lib/libpolly*a; then \
+		chmod -x $(TARGET_BUILD)/tools/polly/Release/lib/libpolly*.a; \
+	fi
 
 # 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 +318,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
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 00000000..8c4a4aa6
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# Removed by patch remove-dbtree.diff
+source: source-is-missing clang/www/analyzer/scripts/dbtree.js