* Remove usr/lib/llvm-3.4/build/autoconf/LICENSE.TXT

* silent warning "manpage-has-useless-whatis-entry" in lldb-3.4
* silent warning "package-name-doesnt-match-sonames libclang1"
* Refresh patch kfreebsd_v2.diff to, maybe, fix lldb build under kfreebsd.
  Thanks to Ed Maste for the patch.

debian/changelog

@@ -6,8 +6,13 @@ llvm-toolchain-3.4 (1:3.4~+rc1-2) unstable; urgency=low
     (also remove the tests)
   * Make lldb 3.4 also conflict with 3.5 (Closes: #730163)
   * Make python-clang 3.4 also conflict with 3.5 (Closes: #730164)
+  * Remove usr/lib/llvm-3.4/build/autoconf/LICENSE.TXT
+  * silent warning "manpage-has-useless-whatis-entry" in lldb-3.4
+  * silent warning "package-name-doesnt-match-sonames libclang1"
+  * Refresh patch kfreebsd_v2.diff to, maybe, fix lldb build under kfreebsd.
+    Thanks to Ed Maste for the patch.
 
- --
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 26 Nov 2013 15:01:03 +0100
 
 llvm-toolchain-3.4 (1:3.4~+rc1-1) unstable; urgency=low
 

debian/control

@@ -171,8 +171,8 @@ Package: python-clang-3.4
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
-Replaces: python-clang-3.3, python-clang-3.5
-Breaks: python-clang-3.3, python-clang-3.5
+Replaces: python-clang-3.3
+Breaks: python-clang-3.3
 Description: Clang Python Bindings
  This binding package provides access to the Clang compiler and libraries.
 
@@ -365,8 +365,8 @@ Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mips
 # Only hurd has been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}), python, llvm-3.4-dev
 Pre-Depends: ${misc:Pre-Depends}
-Replaces: lldb-3.2, lldb-3.3, lldb-3.5
-Breaks: lldb-3.2, lldb-3.3, lldb-3.5
+Replaces: lldb-3.2, lldb-3.3
+Breaks: lldb-3.2, lldb-3.3
 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

debian/libclang1-3.4.lintian-overrides

@@ -0,0 +1,2 @@
+# I know and I am not planning to change that.
+libclang1-3.4: package-name-doesnt-match-sonames libclang1

debian/libclang1-3.4.symbols

@@ -7,7 +7,7 @@ libclang.so.1 libclang1-3.4 #MINVER#
  clang_CXCursorSet_insert@Base 3.2
  clang_CXIndex_getGlobalOptions@Base 3.2
  clang_CXIndex_setGlobalOptions@Base 3.2
- clang_CXXMethod_isPureVirtual@Base 1:3.4
+ clang_CXXMethod_isPureVirtual@Base 1:3.4~+rc1
  clang_CXXMethod_isStatic@Base 3.2
  clang_CXXMethod_isVirtual@Base 3.2
  clang_Comment_getChild@Base 3.2
@@ -16,7 +16,7 @@ libclang.so.1 libclang1-3.4 #MINVER#
  clang_Comment_isWhitespace@Base 3.2
  clang_CompilationDatabase_dispose@Base 3.2
  clang_CompilationDatabase_fromDirectory@Base 3.2
- clang_CompilationDatabase_getAllCompileCommands@Base 1:3.4
+ clang_CompilationDatabase_getAllCompileCommands@Base 1:3.4~+rc1
  clang_CompilationDatabase_getCompileCommands@Base 3.2
  clang_CompileCommand_getArg@Base 3.2
  clang_CompileCommand_getDirectory@Base 3.2
@@ -29,19 +29,19 @@ libclang.so.1 libclang1-3.4 #MINVER#
  clang_Cursor_getCommentRange@Base 3.2
  clang_Cursor_getModule@Base 3.2
  clang_Cursor_getNumArguments@Base 3.2
- clang_Cursor_getObjCDeclQualifiers@Base 1:3.4
- clang_Cursor_getObjCPropertyAttributes@Base 1:3.4
+ clang_Cursor_getObjCDeclQualifiers@Base 1:3.4~+rc1
+ clang_Cursor_getObjCPropertyAttributes@Base 1:3.4~+rc1
  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 1:3.4
+ clang_Cursor_isBitField@Base 1:3.4~+rc1
  clang_Cursor_isDynamicCall@Base 3.2
  clang_Cursor_isNull@Base 3.2
- clang_Cursor_isObjCOptional@Base 1:3.4
- clang_Cursor_isVariadic@Base 1:3.4
+ clang_Cursor_isObjCOptional@Base 1:3.4~+rc1
+ clang_Cursor_isVariadic@Base 1:3.4~+rc1
  clang_FullComment_getAsHTML@Base 3.2
  clang_FullComment_getAsXML@Base 3.2
  clang_HTMLStartTagComment_isSelfClosing@Base 3.2
@@ -57,9 +57,9 @@ libclang.so.1 libclang1-3.4 #MINVER#
  clang_InlineCommandComment_getNumArgs@Base 3.2
  clang_InlineCommandComment_getRenderKind@Base 3.2
  clang_InlineContentComment_hasTrailingNewline@Base 3.2
- clang_Location_isFromMainFile@Base 1:3.4
- clang_Location_isInSystemHeader@Base 1:3.4
- clang_Module_getASTFile@Base 1:3.4
+ clang_Location_isFromMainFile@Base 1:3.4~+rc1
+ clang_Location_isInSystemHeader@Base 1:3.4~+rc1
+ clang_Module_getASTFile@Base 1:3.4~+rc1
  clang_Module_getFullName@Base 3.2
  clang_Module_getName@Base 3.2
  clang_Module_getNumTopLevelHeaders@Base 3.2
@@ -76,11 +76,11 @@ libclang.so.1 libclang1-3.4 #MINVER#
  clang_TParamCommandComment_getParamName@Base 3.2
  clang_TParamCommandComment_isParamPositionValid@Base 3.2
  clang_TextComment_getText@Base 3.2
- clang_Type_getAlignOf@Base 1:3.4
- clang_Type_getCXXRefQualifier@Base 1:3.4
- clang_Type_getClassType@Base 1:3.4
- clang_Type_getOffsetOf@Base 1:3.4
- clang_Type_getSizeOf@Base 1:3.4
+ clang_Type_getAlignOf@Base 1:3.4~+rc1
+ clang_Type_getCXXRefQualifier@Base 1:3.4~+rc1
+ clang_Type_getClassType@Base 1:3.4~+rc1
+ clang_Type_getOffsetOf@Base 1:3.4~+rc1
+ clang_Type_getSizeOf@Base 1:3.4~+rc1
  clang_VerbatimBlockLineComment_getText@Base 3.2
  clang_VerbatimLineComment_getText@Base 3.2
  clang_annotateTokens@Base 3.2
@@ -123,8 +123,8 @@ libclang.so.1 libclang1-3.4 #MINVER#
  clang_equalRanges@Base 3.2
  clang_equalTypes@Base 3.2
  clang_executeOnThread@Base 3.2
- clang_findIncludesInFile@Base 1:3.4
- clang_findIncludesInFileWithBlock@Base 1:3.4
+ clang_findIncludesInFile@Base 1:3.4~+rc1
+ clang_findIncludesInFileWithBlock@Base 1:3.4~+rc1
  clang_findReferencesInFile@Base 3.2
  clang_findReferencesInFileWithBlock@Base 3.2
  clang_formatDiagnostic@Base 3.2
@@ -188,12 +188,12 @@ libclang.so.1 libclang1-3.4 #MINVER#
  clang_getEnumConstantDeclValue@Base 3.2
  clang_getEnumDeclIntegerType@Base 3.2
  clang_getExpansionLocation@Base 3.2
- clang_getFieldDeclBitWidth@Base 1:3.4
+ clang_getFieldDeclBitWidth@Base 1:3.4~+rc1
  clang_getFile@Base 3.2
- clang_getFileLocation@Base 1:3.4
+ clang_getFileLocation@Base 1:3.4~+rc1
  clang_getFileName@Base 3.2
  clang_getFileTime@Base 3.2
- clang_getFileUniqueID@Base 1:3.4
+ clang_getFileUniqueID@Base 1:3.4~+rc1
  clang_getFunctionTypeCallingConv@Base 3.2
  clang_getIBOutletCollectionType@Base 3.2
  clang_getIncludedFile@Base 3.2
@@ -232,7 +232,7 @@ libclang.so.1 libclang1-3.4 #MINVER#
  clang_getTranslationUnitSpelling@Base 3.2
  clang_getTypeDeclaration@Base 3.2
  clang_getTypeKindSpelling@Base 3.2
- clang_getTypeSpelling@Base 1:3.4
+ clang_getTypeSpelling@Base 1:3.4~+rc1
  clang_getTypedefDeclUnderlyingType@Base 3.2
  clang_hashCursor@Base 3.2
  clang_indexLoc_getCXSourceLocation@Base 3.2

debian/lldb-3.4.lintian-overrides

@@ -1,3 +1,6 @@
 # That is normal. The lib is not shipped as a new package
 lldb-3.4: package-name-doesnt-match-sonames liblldb
 lldb-3.4: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
+# Does not really matter
+lldb-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-3.4.1.gz
+

debian/patches/kfreebsd_v2.diff

@@ -305,3 +305,15 @@
 +ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD))
  	LLVMLibsOptions += -Wl,-rpath,$(LibDir)
  endif
+--- a/lldb/source/Host/common/Host.cpp
++++ b/lldb/source/Host/common/Host.cpp
+@@ -1569,7 +1569,7 @@ Host::RunShellCommand (const char *command,
+     return error;
+ }
+
+-#if defined(__linux__) or defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__)
+ // The functions below implement process launching via posix_spawn() for Linux
+ // and FreeBSD.
+
+

debian/rules

@@ -307,18 +307,21 @@ override_dh_installdeb:
 
 	rm -f $(CURDIR)/debian/lldb-$(LLVM_VERSION)/usr/lib/python*/dist-packages/lldb/__init__.pyc
 	rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make*
+	rm $(CURDIR)//debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT
+
+
 
 ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
-
 # List of the archs we know we have 100 % tests working
 ARCH_LLVM_TEST_OK := amd64 i386
 override_dh_auto_test:
+
 # LLVM tests
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK)))
 # Fail the build if the test fails
-	$(MAKE) -C $(TARGET_BUILD) check
+	LD_LIBRARY_PATH=$(CURDIR)/$(TARGET_BUILD)/Release/lib/ $(MAKE) -C $(TARGET_BUILD) check
 else
-    $(MAKE) -C $(TARGET_BUILD) check || true
+	LD_LIBRARY_PATH=$(CURDIR)/$(TARGET_BUILD)/Release/lib/ $(MAKE) -C $(TARGET_BUILD) check || true
 endif
 
 # clang tests