From 5dc1a03a77d43cc350585c493bf91b0b0bedd041 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 8 Dec 2019 21:03:12 +0100 Subject: [PATCH] Bump debhelper from old 9 to 12. + debian/rules: Move --fail-missing argument to dh_missing. Fixes lintian: package-uses-old-debhelper-compat-version See https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html for more details. --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 35 +---------------------------------- debian/rules | 5 ++++- 4 files changed, 7 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 769f34ff..5ea3860a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ llvm-toolchain-9 (1:9.0.1~+rc2-1~exp2) UNRELEASED; urgency=medium fail-extended-long-double.patch, revert-change-soname.diff, try-to- unbreak-thinlto.diff that are missing from debian/patches/series. * Rely on pre-initialized dpkg-architecture variables. + * Bump debhelper from old 9 to 12. -- Sylvestre Ledru Sun, 08 Dec 2019 21:02:49 +0100 diff --git a/debian/compat b/debian/compat index ec635144..48082f72 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +12 diff --git a/debian/control b/debian/control index 49175186..2a97a8fd 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Rules-Requires-Root: no Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru -Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, +Build-Depends: debhelper (>= 12~), cmake, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9), lsb-release, patchutils, diffstat, xz-utils, python3-dev, libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), @@ -26,8 +26,6 @@ Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 9 Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/9 -# ------------- clang ------------- - Package: clang-9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, @@ -197,7 +195,6 @@ Description: C++ interface to the Clang library locations with elements within the AST, and other facilities that support Clang-based development tools. - Package: libfuzzer-9-dev Architecture: linux-any Section: libdevel @@ -218,7 +215,6 @@ Description: Library for coverage-guided fuzz testing coverage information for libFuzzer is provided by LLVM's SanitizerCoverage instrumentation. - Package: python-clang-9 Section: python Architecture: any @@ -236,7 +232,6 @@ Description: Clang Python Bindings . This binding package provides access to the Clang compiler and libraries. - Package: clang-9-examples Architecture: any Section: doc @@ -251,8 +246,6 @@ Description: Clang examples . This package contains the Clang examples. -# ------------- LLVM ------------- - Package: libllvm9 Architecture: any Section: libs @@ -341,7 +334,6 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, python3, python-pygments, python-yaml, python3-pygments, python3-yaml -# Because of yaml-bench Breaks: libclang-common-9-dev (<< 9.0.1~+rc1-1~exp2) Replaces: libclang-common-9-dev (<< 9.0.1~+rc1-1~exp2) Description: Modular compiler and toolchain technologies, tools @@ -421,12 +413,8 @@ Description: Modular compiler and toolchain technologies, examples This package contains examples for using LLVM, both in developing extensions to LLVM and in using it to compile code. - -# ------------- lld ------------- - Package: lld-9 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 -# ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: LLVM-based linker @@ -436,7 +424,6 @@ Description: LLVM-based linker Package: liblld-9 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 -# ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -450,7 +437,6 @@ Description: LLVM-based linker, library Package: liblld-9-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 -# ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-9 (= ${binary:Version}), liblld-9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -461,12 +447,8 @@ Description: LLVM-based linker, header files . This package provides the header files to build extension over lld. - -# ------------- lldb ------------- - 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 Pre-Depends: ${misc:Pre-Depends} @@ -477,7 +459,6 @@ Description: Next generation, high-performance debugger Package: liblldb-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}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -491,7 +472,6 @@ Description: Next generation, high-performance debugger, 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 @@ -504,11 +484,9 @@ Description: Next generation, high-performance debugger, python lib . 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 -# ia64 hurd powerpc powerpcspe ppc64 alpha sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-9, python3-six Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -521,11 +499,9 @@ Description: Next generation, high-performance debugger, python3 lib . This binding package provides access to lldb. - Package: liblldb-9-dev Section: libdevel 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}, lldb-9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files @@ -535,11 +511,6 @@ Description: Next generation, high-performance debugger, header files . This package provides the header files to build extension over lldb. - -# ------------- openmp ------------- -# 44 because it was the first version in which openmp & libc++ have been -# managed in llvm-defaults - Package: libomp-9-dev Section: libdevel Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 @@ -580,8 +551,6 @@ Description: LLVM OpenMP runtime - Documentation . This package contains the documentation of this package. -# ------------- libcxx ------------- - Package: libc++1-9 Section: libs Architecture: any @@ -628,8 +597,6 @@ Description: LLVM C++ Standard library (development files) as exception objects, rtti and memory allocation. * Extensive unit tests. -# ------------- libcxxabi ------------- - Package: libc++abi1-9 Section: libs Architecture: any diff --git a/debian/rules b/debian/rules index 438f276a..3dac23c9 100755 --- a/debian/rules +++ b/debian/rules @@ -747,7 +747,7 @@ else rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake endif endif - dh_install --fail-missing + dh_install override_dh_installdeb: # Managed by the package @@ -857,3 +857,6 @@ override_dh_auto_clean: fi .PHONY: override_dh_strip preconfigure debian-full-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build + +override_dh_missing: + dh_missing --fail-missing