* Upload in unstable

* Disable the co-instability of lldb & python-lldb
  (Python stuff conflicts)
* Refresh of the list of symbol in libclang

debian/changelog

@@ -1,15 +1,14 @@
-llvm-toolchain-snapshot (1:3.6~svn218379-1~exp1) experimental; urgency=medium
+llvm-toolchain-snapshot (1:3.6~svn218446-1) unstable; urgency=medium
 
   * New snapshot release
+  * Upload in unstable
+  * Disable the co-instability of lldb & python-lldb
+    (Python stuff conflicts)
+  * Fix bad dependencies on lldb 3.6
+  * Refresh of the list of symbol in libclang
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 Sep 2014 14:20:49 +0200
 
-llvm-toolchain-snapshot (1:3.6~svn216933-1~exp2) experimental; urgency=medium
-
-  * Fix bad dependencies on lldb 3.6
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 04 Sep 2014 23:39:39 +0200
-
 llvm-toolchain-snapshot (1:3.6~svn216933-1~exp1) experimental; urgency=medium
 
   * New snapshot release

debian/control

@@ -389,6 +389,7 @@ 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, python-lldb-3.6
+Conflicts: lldb-3.4, lldb-3.5
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
  LLDB is a next generation, high-performance debugger. It is built as a set of
@@ -416,6 +417,7 @@ Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: python-lldb-3.4, python-lldb-3.5
 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

debian/libclang1-X.Y.symbols.in

@@ -28,6 +28,7 @@ libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER#
  clang_Cursor_getArgument@Base 3.2
  clang_Cursor_getBriefCommentText@Base 3.2
  clang_Cursor_getCommentRange@Base 3.2
+ clang_Cursor_getMangling@Base 3.6
  clang_Cursor_getModule@Base 3.2
  clang_Cursor_getNumArguments@Base 3.2
  clang_Cursor_getObjCDeclQualifiers@Base 3.4
@@ -43,6 +44,7 @@ libclang-@LLVM_VERSION@.so libclang1-@LLVM_VERSION@ #MINVER#
  clang_Cursor_isNull@Base 3.2
  clang_Cursor_isObjCOptional@Base 3.4
  clang_Cursor_isVariadic@Base 3.4
+ clang_File_isEqual@Base 3.6
  clang_FullComment_getAsHTML@Base 3.2
  clang_FullComment_getAsXML@Base 3.2
  clang_HTMLStartTagComment_isSelfClosing@Base 3.2

debian/patches/23-strlcpy_strlcat_warning_removed.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.6~svn218379/clang/include/clang/Basic/Builtins.def
+Index: llvm-toolchain-snapshot_3.6~svn218443/clang/include/clang/Basic/Builtins.def
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/include/clang/Basic/Builtins.def
+--- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/include/clang/Basic/Builtins.def
-+++ llvm-toolchain-snapshot_3.6~svn218379/clang/include/clang/Basic/Builtins.def
++++ llvm-toolchain-snapshot_3.6~svn218443/clang/include/clang/Basic/Builtins.def
 @@ -474,8 +474,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
  BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
  BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
@@ -24,10 +24,21 @@ Index: llvm-toolchain-snapshot_3.6~svn218379/clang/include/clang/Basic/Builtins.
  //   id objc_msgSend(id, SEL, ...)
  LIBBUILTIN(objc_msgSend, "GGH.",   "f",     "objc/message.h", OBJC_LANG)
  // long double objc_msgSend_fpret(id self, SEL op, ...) 
-Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/Sema/SemaChecking.cpp
+Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/Sema/SemaChecking.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/lib/Sema/SemaChecking.cpp
+--- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/lib/Sema/SemaChecking.cpp
-+++ llvm-toolchain-snapshot_3.6~svn218379/clang/lib/Sema/SemaChecking.cpp
++++ llvm-toolchain-snapshot_3.6~svn218443/clang/lib/Sema/SemaChecking.cpp
+@@ -367,8 +367,8 @@ Sema::CheckBuiltinFunctionCall(FunctionD
+   case Builtin::BI__builtin___memcpy_chk:
+   case Builtin::BI__builtin___memmove_chk:
+   case Builtin::BI__builtin___memset_chk:
+-  case Builtin::BI__builtin___strlcat_chk:
+-  case Builtin::BI__builtin___strlcpy_chk:
++//  case Builtin::BI__builtin___strlcat_chk:
++//  case Builtin::BI__builtin___strlcpy_chk:
+   case Builtin::BI__builtin___strncat_chk:
+   case Builtin::BI__builtin___strncpy_chk:
+   case Builtin::BI__builtin___stpncpy_chk:
 @@ -1007,9 +1007,10 @@ bool Sema::CheckFunctionCall(FunctionDec
      return false;
  
@@ -42,10 +53,10 @@ Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/Sema/SemaChecking.cpp
      CheckStrncatArguments(TheCall, FnInfo);
    else
      CheckMemaccessArguments(TheCall, CMId, FnInfo);
-Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/AST/Decl.cpp
+Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/AST/Decl.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/lib/AST/Decl.cpp
+--- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/lib/AST/Decl.cpp
-+++ llvm-toolchain-snapshot_3.6~svn218379/clang/lib/AST/Decl.cpp
++++ llvm-toolchain-snapshot_3.6~svn218443/clang/lib/AST/Decl.cpp
 @@ -3187,13 +3187,13 @@ unsigned FunctionDecl::getMemoryFunction
    case Builtin::BImemmove:
      return Builtin::BImemmove;
@@ -66,10 +77,10 @@ Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/AST/Decl.cpp
  
    case Builtin::BI__builtin_memcmp:
    case Builtin::BImemcmp:
-Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+--- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
-+++ llvm-toolchain-snapshot_3.6~svn218379/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
++++ llvm-toolchain-snapshot_3.6~svn218443/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 @@ -237,9 +237,9 @@ GenericTaintChecker::TaintPropagationRul
      case Builtin::BIstrncpy:
      case Builtin::BIstrncat:
@@ -83,9 +94,9 @@ Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/StaticAnalyzer/Checkers/G
      case Builtin::BIstrndup:
        return TaintPropagationRule(0, 1, ReturnValueIndex);
  
-Index: llvm-toolchain-snapshot_3.6~svn218379/clang/test/Sema/warn-strlcpycat-size.c
+Index: llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/warn-strlcpycat-size.c
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/test/Sema/warn-strlcpycat-size.c
+--- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/test/Sema/warn-strlcpycat-size.c
 +++ /dev/null
 @@ -1,55 +0,0 @@
 -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
@@ -143,10 +154,10 @@ Index: llvm-toolchain-snapshot_3.6~svn218379/clang/test/Sema/warn-strlcpycat-siz
 -
 -  strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
 -}
-Index: llvm-toolchain-snapshot_3.6~svn218379/clang/test/Sema/builtins.c
+Index: llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/builtins.c
 ===================================================================
---- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/test/Sema/builtins.c
+--- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/test/Sema/builtins.c
-+++ llvm-toolchain-snapshot_3.6~svn218379/clang/test/Sema/builtins.c
++++ llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/builtins.c
 @@ -185,11 +185,11 @@ void test18() {
  
    ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));

debian/python-lldb-X.Y.links.in

@@ -1,3 +1,5 @@
 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
+usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/ usr/lib/python2.7/dist-packages/lldb
+