diff --git a/debian/changelog b/debian/changelog index ad628c68..44ebc86b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ llvm-toolchain-3.2 (1:3.2repack-1~exp3) UNRELEASED; urgency=low * Fix some issues relative to the epoch change + * Fix a wrong path in the _lldb.so Python symlink + * Remove the embedded copy of libjs-jquery (Closes: #701087) -- Sylvestre Ledru Sun, 17 Feb 2013 12:05:15 +0100 @@ -32,6 +34,5 @@ llvm-toolchain-3.2 (3.2repack-1~exp1) experimental; urgency=low * Add a script pollycc which will call clang with the right arguments. * Use __builtin___clear_cache on ARM to fix a clang bug. Thanks to Matthias Klose. - * Enable the r600 experimental backend for mesa 9.1. -- Sylvestre Ledru Sat, 09 Feb 2013 12:14:10 +0100 diff --git a/debian/control b/debian/control index b65a89c3..33bab85f 100644 --- a/debian/control +++ b/debian/control @@ -380,7 +380,7 @@ Description: Low-Level Virtual Machine (LLVM), bindings for OCaml Package: llvm-3.2-doc Section: doc Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, libjs-jquery Description: Low-Level Virtual Machine (LLVM), documentation The Low-Level Virtual Machine (LLVM) is a collection of libraries and tools that make it easy to build compilers, optimizers, Just-In-Time diff --git a/debian/lldb-3.2.links.in b/debian/lldb-3.2.links.in index 0f0527b4..b106f333 100644 --- a/debian/lldb-3.2.links.in +++ b/debian/lldb-3.2.links.in @@ -1 +1,2 @@ usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so +usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/python2.7/dist-packages/lldb/_lldb.so diff --git a/debian/rules b/debian/rules index 770e55d2..912d6861 100755 --- a/debian/rules +++ b/debian/rules @@ -136,6 +136,12 @@ override_dh_auto_install: # Remove some license files rm $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT +# Managed in lldb-X.Y.links.in + rm -f build-llvm/Release/lib/python*/site-packages/lldb/_lldb.so + +# Remove the copy of jquery. See bug #701087 + cd ./docs/_build/html/_static/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js + .PHONY: override_dh_strip override_dh_strip: dh_strip -p libclang$(SONAME_EXT) --dbg-package=libclang$(SONAME_EXT)-dbg