diff --git a/debian/changelog b/debian/changelog
index edce89dc..4c6cb628 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+llvm-toolchain-13 (1:13.0.1-12) UNRELEASED; urgency=medium
+
+ * Update lintian override info format in d/source/lintian-overrides on line 2,
+ 8, 10, 13-22.
+ * Trim trailing whitespace.
+ * Bump debhelper dependency to >= 11, since that's what is used in
+ debian/compat.
+ * Bump debhelper from old 11 to 13.
+ + debian/rules: Drop --fail-missing argument, now the default.
+ * Set debhelper-compat version in Build-Depends.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 04 May 2023 03:52:16 -0000
+
llvm-toolchain-13 (1:13.0.1-11) unstable; urgency=medium
* link-grpc.diff: add the detection of other libs necessary for
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de3947..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 9af8137c..57f1895d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
Rules-Requires-Root: no
Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
-Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
+Build-Depends: debhelper-compat (= 13),
+ cmake, ninja-build,
chrpath, texinfo, sharutils,
libelf-dev,
libffi-dev,
@@ -22,9 +23,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
- llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> |
- llvm-spirv [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
- spirv-tools [ linux-any ] | hello [ !i386],
+ llvm-spirv-14 [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x] <!stage1> | llvm-spirv [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x] <!stage1> | hello [!i386],
+ spirv-tools [linux-any] | hello [!i386],
libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
@@ -811,5 +811,3 @@ Description: Multi-Level Intermediate Representation library
MLIR aims to address software fragmentation, improve compilation for
heterogeneous hardware, significantly reduce the cost of building domain
specific compilers, and aid in connecting existing compilers together.
-
-
diff --git a/debian/rules b/debian/rules
index d3b13458..269e0b64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -949,7 +949,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
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 9cb5d02d..85c9f1c0 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,25 +1,25 @@
# Removed by patch remove-dbtree.diff
-source: source-is-missing clang/www/analyzer/scripts/dbtree.js
+source: source-is-missing [clang/www/analyzer/scripts/dbtree.js]
# Reported here https://bugs.llvm.org/show_bug.cgi?id=32962
# No activity, silent it to avoid false positive in automation
source: license-problem-convert-utf-code llvm/lib/Support/ConvertUTF.cpp
# A unit test. No big deal
-source: source-is-missing lldb/unittests/ObjectFile/ELF/Inputs/early-section-headers.so
+source: source-is-missing [lldb/unittests/ObjectFile/ELF/Inputs/early-section-headers.so]
# Generated See https://github.com/llvm-mirror/lldb/commit/7aee683f410ffc27b61a8e9779b9df9a7c0fff7d#diff-dcfea8d8a36846a00781105f8618e06d
-source: source-is-missing lldb/lit/Modules/ELF/Inputs/PT_LOAD-overlap-section.elf
+source: source-is-missing [lldb/lit/Modules/ELF/Inputs/PT_LOAD-overlap-section.elf]
# Makes sense for the testsuites
-source: source-contains-prebuilt-windows-binary lldb/unittests/SymbolFile/DWARF/Inputs/test-dwarf.exe
-source: source-contains-prebuilt-windows-binary lldb/unittests/SymbolFile/PDB/Inputs/test-pdb-types.exe
-source: source-contains-prebuilt-windows-binary lldb/unittests/SymbolFile/PDB/Inputs/test-pdb.exe
-source: source-is-missing lldb/lit/Modules/ELF/Inputs/netbsd-amd64.core
-source: source-is-missing llgo/third_party/gofrontend/libgo/go/debug/dwarf/testdata/*.elf*
-source: source-is-missing llgo/third_party/gofrontend/libgo/go/debug/elf/testdata/gcc-*-exec
-source: source-is-missing llgo/third_party/gofrontend/libgo/go/debug/elf/testdata/*.obj
-source: source-is-missing llvm/test/*
-source: source-is-missing lldb/test/*
-source: source-is-missing lld/test/*
+source: source-contains-prebuilt-windows-binary [lldb/unittests/SymbolFile/DWARF/Inputs/test-dwarf.exe]
+source: source-contains-prebuilt-windows-binary [lldb/unittests/SymbolFile/PDB/Inputs/test-pdb-types.exe]
+source: source-contains-prebuilt-windows-binary [lldb/unittests/SymbolFile/PDB/Inputs/test-pdb.exe]
+source: source-is-missing [lldb/lit/Modules/ELF/Inputs/netbsd-amd64.core]
+source: source-is-missing [llgo/third_party/gofrontend/libgo/go/debug/dwarf/testdata/*.elf*]
+source: source-is-missing [llgo/third_party/gofrontend/libgo/go/debug/elf/testdata/gcc-*-exec]
+source: source-is-missing [llgo/third_party/gofrontend/libgo/go/debug/elf/testdata/*.obj]
+source: source-is-missing [llvm/test/*]
+source: source-is-missing [lldb/test/*]
+source: source-is-missing [lld/test/*]
# By design
source: invalid-arch-string-in-source-relation riscv64*