diff --git a/debian/changelog b/debian/changelog index 7294dcc0..17ff0616 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-9 (1:9.0.1-3) unstable; urgency=medium * Introduce python3-clang-9 + * Remove python-lldb-9 -- diff --git a/debian/control b/debian/control index 86306e3b..7ddcdab9 100644 --- a/debian/control +++ b/debian/control @@ -476,7 +476,7 @@ Package: lldb-9 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m69k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}), llvm-9-dev, - python-lldb-9 + python3-lldb-9 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 @@ -496,23 +496,6 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: python-lldb-9 -Section: python -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m69k sh4 x32 -# ia64 hurd powerpc powerpcspe ppc64 alpha sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-9, python3, python3-six -Conflicts: python-lldb-x.y -Replaces: python-lldb-x.y -Provides: python-lldb-x.y -Pre-Depends: ${misc:Pre-Depends} -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 - Project, such as the Clang expression parser and LLVM disassembler. - . - This binding package provides access to lldb. - - Package: python3-lldb-9 Section: python Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m69k sh4 x32 diff --git a/debian/python-lldb-X.Y.install.in b/debian/python-lldb-X.Y.install.in deleted file mode 100644 index d74b8c35..00000000 --- a/debian/python-lldb-X.Y.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/*-packages/lldb/ diff --git a/debian/python-lldb-X.Y.links.in b/debian/python-lldb-X.Y.links.in deleted file mode 100644 index 063bee37..00000000 --- a/debian/python-lldb-X.Y.links.in +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/llvm-@LLVM_VERSION@/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/llvm-@LLVM_VERSION@/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/dist-packages/lldb/_lldb.so -usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/ usr/lib/python2.7/dist-packages/lldb - - diff --git a/debian/rules b/debian/rules index 438f276a..97cbda42 100755 --- a/debian/rules +++ b/debian/rules @@ -647,7 +647,7 @@ endif # Disable CMake's package validation checks for binaries that may not be installed sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake -# Managed in python-lldb-X.Y.links.in +# Managed in python*-lldb-X.Y.links.in rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/_lldb.so # Manage the polly files. Sometimes, we build them. Sometimes not. @@ -753,7 +753,7 @@ override_dh_installdeb: # Managed by the package dh_installdeb -a - rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc $(CURDIR)/debian/python-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc + rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc $(CURDIR)/debian/python*-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make* # Remove auto generated python pyc