diff --git a/debian/changelog b/debian/changelog index b1340bfe..22a8fd96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-9 (1:9.0.1~+rc2-1~exp2) UNRELEASED; urgency=medium +<<<<<<< * Use secure URI in debian/watch. * Move source package lintian overrides to debian/source. * Remove patches force-gcc-header-obj.diff, hurd-pathmax.diff, impl- @@ -11,6 +12,16 @@ llvm-toolchain-9 (1:9.0.1~+rc2-1~exp2) UNRELEASED; urgency=medium * Set debhelper-compat version in Build-Depends. * Move transitional package libclang-cpp1-9 to oldlibs/optional per policy 4.0.1. +======= + * Use secure URI in debian/watch. + * Move source package lintian overrides to debian/source. + * Remove patches force-gcc-header-obj.diff, hurd-pathmax.diff, impl- + path-hurd.diff, libcxxabi-arm-ehabi-fix.patch, libcxxabi-test-don-t- + 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 new file mode 100644 index 00000000..48082f72 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +12 diff --git a/debian/control b/debian/control index 5a0754c7..acfaf086 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-compat (= 12), 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),