Introduce llvm-3.4-tools to contain the new files needed by Martin

debian/changelog

@@ -4,6 +4,7 @@ llvm-toolchain-3.4 (1:3.4-2) UNRELEASED; urgency=medium
   * Fix the cindex.py declaration (3.3 => 3.5). Closes upstream bug #18365
   * Bring back the dependency on gcc 4.8. It breaks the nightly snapshot
     packages and it should be the norm now...
+  * Introduce llvm-3.4-tools to contain the new files needed by Martin
 
   [ Matthias Klose ]
   * Disable the lldb build for AArch64.

debian/control

@@ -296,6 +296,25 @@ Description: Modular compiler and toolchain technologies, libraries and headers
  This package provides the libraries and headers to develop applications
  using llvm.
 
+Package: llvm-3.4-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python,
+ llvm-3.4-dev (= ${binary:Version})
+Description: Modular compiler and toolchain technologies, tools
+ LLVM is a collection of libraries and tools that make it easy to build
+ compilers, optimizers, just-in-time code generators, and many other
+ compiler-related programs.
+ .
+ LLVM uses a single, language-independent virtual instruction set both
+ as an offline code representation (to communicate code between
+ compiler phases and to run-time systems) and as the compiler internal
+ representation (to analyze and transform programs). This persistent
+ code representation allows a common set of sophisticated compiler
+ techniques to be applied at compile-time, link-time, install-time,
+ run-time, or "idle-time" (between program runs).
+ .
+ This package provides tools for testing.
+
 Package: libllvm-3.4-ocaml-dev
 Section: ocaml
 Architecture: any

debian/llvm-3.4-dev.dirs

@@ -1,7 +1,5 @@
 /usr/lib/llvm-3.4/lib
 /usr/lib/llvm-3.4/build
 /usr/lib/llvm-3.4/include
-/usr/lib/llvm-3.4/build/unittests
-/usr/lib/llvm-3.4/build/utils/lit/
 usr/share/doc/llvm-3.4-dev
 usr/share/emacs/site-lisp/llvm-3.4

debian/llvm-3.4-dev.install

@@ -1,5 +1,3 @@
-usr/lib/llvm-3.4/bin/not*
-usr/lib/llvm-3.4/bin/FileCheck*
 usr/lib/llvm-3.4/lib/libLLVM*.a
 usr/lib/llvm-3.4/lib/libllvm*.a
 usr/lib/llvm-3.4/lib/LLVM*.so
@@ -14,13 +12,10 @@ build-llvm/config.status		/usr/lib/llvm-3.4/build/
 Makefile.rules			        /usr/lib/llvm-3.4/build/
 configure			            /usr/lib/llvm-3.4/build/
 autoconf/			            /usr/lib/llvm-3.4/build/
-unittests/Makefile.unittest           /usr/lib/llvm-3.4/build/unittests/
 
 utils/vim/llvm-3.4.vim		        usr/share/vim/addons/syntax/
 utils/vim/tablegen-3.4.vim		    usr/share/vim/addons/syntax/
 
-utils/lit/*		/usr/lib/llvm-3.4/build/utils/lit/
-
 utils/emacs/emacs.el		    usr/share/emacs/site-lisp/llvm-3.4/
 utils/emacs/llvm-mode.el	    usr/share/emacs/site-lisp/llvm-3.4/
 utils/emacs/tablegen-mode.el	usr/share/emacs/site-lisp/llvm-3.4/

debian/llvm-3.4-dev.links.in

@@ -5,35 +5,3 @@ usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/include/llvm
 usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/build/include/llvm-c
 usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/build/include/llvm
 usr/lib/llvm-3.4/include/ usr/lib/llvm-3.4/build/include
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Coverage
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Coverage
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Coverage
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Coverage
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Coverage
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Coverage
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Coverage
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Coverage
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Coverage+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Coverage+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Coverage+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Coverage+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Coverage+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Coverage+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Coverage+Asserts
-usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Coverage+Asserts

debian/llvm-3.4-tools.dirs

@@ -0,0 +1,3 @@
+/usr/lib/llvm-3.4/build/unittests
+/usr/lib/llvm-3.4/build/utils/lit/
+

debian/llvm-3.4-tools.install

@@ -0,0 +1,7 @@
+usr/lib/llvm-3.4/bin/not*
+usr/lib/llvm-3.4/bin/FileCheck*
+
+unittests/Makefile.unittest           /usr/lib/llvm-3.4/build/unittests/
+
+utils/lit/*             /usr/lib/llvm-3.4/build/utils/lit/
+

debian/rules

@@ -296,7 +296,6 @@ override_dh_auto_install:
 # Managed in lldb-X.Y.links.in
 	rm -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/python*/site-packages/lldb/_lldb.so
 
-
 override_dh_installman:
 	dh_installman
 # Make sure that lli manpage is only in llvm-3.2-runtime (See #697117)
@@ -322,6 +321,10 @@ override_dh_installdeb:
 	rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make*
 	rm -f $(CURDIR)//debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT
 
+# Remove auto generated python pyc
+	find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f
+
+
 
 
 ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))