diff --git a/debian/changelog b/debian/changelog index b400ae2b..0609b410 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-6.0 (1:6.0-2.1) UNRELEASED; urgency=medium + + * Migrate to automatic debug packages (Closes: #893267) + + -- David Tenty Sat, 31 Mar 2018 21:11:28 +0000 + llvm-toolchain-6.0 (1:6.0-2) unstable; urgency=medium * clang-tidy-6.0: depends on libclang-common-6.0-dev diff --git a/debian/control b/debian/control index e66b8704..bdf7683c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru -Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, +Build-Depends: debhelper (>= 9.20160114), flex, bison, dejagnu, tcl, expect, cmake, perl, libtool, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9), lsb-release, patchutils, diffstat, xz-utils, python-dev, libedit-dev, libncurses5-dev, swig, python-six, python-sphinx, binutils-dev, @@ -117,22 +117,6 @@ Description: C interface to the clang library locations with elements within the AST, and other facilities that support Clang-based development tools. -Package: libclang1-6.0-dbg -Architecture: any -Multi-Arch: same -Section: debug -Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-6.0 (= ${binary:Version}) -Description: clang library (debug) - Clang project is a C, C++, Objective C and Objective C++ front-end - based on the LLVM compiler. Its goal is to offer a replacement to the - GNU Compiler Collection (GCC). - . - Clang implements all of the ISO C++ 1998, 11 and 14 standards and also - provides most of the support of C++17. - . - This package contains the debugging symbols. - Package: libclang-6.0-dev Architecture: any Section: libdevel @@ -237,22 +221,6 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: libllvm6.0-dbg -Architecture: any -Section: debug -Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm6.0 (= ${binary:Version}) -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Breaks: libllvm3.9v4-dbg -Replaces: libllvm3.9v4-dbg -Description: Modular compiler and toolchain technologies, debugging libraries - 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. - . - This package contains the LLVM runtime library debug symbols. - Package: llvm-6.0 Architecture: any Suggests: llvm-6.0-doc @@ -430,21 +398,6 @@ Description: LLVM-based linker, library . This package contains the LLD runtime library. -# Package: liblld-6.0-dbg -# Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel -# # ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed -# Depends: ${shlibs:Depends}, ${misc:Depends}, liblld-6.0 (= ${binary:Version}) -# Pre-Depends: ${misc:Pre-Depends} -# Section: debug -# Priority: optional -# Description: LLVM-based linker, debugging libraries -# LLD is a new, high-performance linker. It is built as a set of reusable -# components which highly leverage existing libraries in the larger LLVM -# Project. -# . -# This package contains the LLD runtime library debug symbols. - - Package: liblld-6.0-dev Section: libdevel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel @@ -488,22 +441,6 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: liblldb-6.0-dbg -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k sh4 x32 mips mipsel arm64 -# ia64 mips mipsel hurd powerpc powerpcspe ppc64 ppc64el alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-6.0 (= ${binary:Version}) -Pre-Depends: ${misc:Pre-Depends} -Conflicts: liblldb-7-dbg -Section: debug -Priority: optional -Description: Next generation, high-performance debugger, debugging libraries - 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 package contains the LLDB runtime library debug symbols. - - Package: python-lldb-6.0 Section: python Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k sh4 x32 mips mipsel arm64 diff --git a/debian/rules b/debian/rules index e44b43aa..0ca4cfdd 100755 --- a/debian/rules +++ b/debian/rules @@ -501,9 +501,9 @@ override_dh_installman: override_dh_strip: : # running out of diskspace on the buildds find $(TARGET_BUILD) -name '*.o' -o -name '*.a' | xargs -r rm -f - dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg - dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg - dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=liblldb-$(LLVM_VERSION)-dbg + dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg (<< 1:6.0-2~)' + dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg (<< 1:6.0-2~)' + dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg (<< 1:6.0-2~)' # ifeq (${LLD_ENABLE},yes) # dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg # endif