From 89a2954b4ff4139234d9568bdbf4f5822c0862cb Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 23 Jan 2020 14:55:01 +0100 Subject: [PATCH] Cherry-pick fixes from 9 branch --- debian/control | 2 +- debian/rules | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 63c52ab4..45a8476d 100644 --- a/debian/control +++ b/debian/control @@ -482,7 +482,7 @@ Package: python3-lldb-10 Section: python Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-six +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-10 (= ${binary:Version}), python3-six Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y Provides: python3-lldb-x.y diff --git a/debian/rules b/debian/rules index 2b0725ed..b3ff0677 100755 --- a/debian/rules +++ b/debian/rules @@ -596,10 +596,6 @@ endif # Path changed. Make a copy of it cp $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/README.txt $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/share/README.txt -# idem for the lldb python binding - mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3/dist-packages/ - mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3.*/site-packages/* $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3/dist-packages/ - # Remove things that CMake install but which aren't packaged yet, # or are packaged from the source or build tree. mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \