From 09404cde2f3ad1969e6161e4b394c9bccc4062e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Tue, 6 Feb 2024 14:32:56 +0100 Subject: [PATCH] pkg/distro/deb: fix doc build for Ubuntu 18.04 Due to mysterious reasons, Ubuntu 18.04 ARM builds doesn't invoke dh_installinfo (even though amd64 does). Merge knot-resolver-doc.info into knot-resolver-doc.docs for compatibility. --- distro/pkg/deb/knot-resolver-doc.docs | 2 ++ distro/pkg/deb/knot-resolver-doc.info | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 distro/pkg/deb/knot-resolver-doc.info diff --git a/distro/pkg/deb/knot-resolver-doc.docs b/distro/pkg/deb/knot-resolver-doc.docs index baa81f7c6..c6f13d8b4 100644 --- a/distro/pkg/deb/knot-resolver-doc.docs +++ b/distro/pkg/deb/knot-resolver-doc.docs @@ -1 +1,3 @@ debian/tmp/usr/share/doc/knot-resolver/html/* +debian/tmp/usr/share/info/knot-resolver.info +debian/tmp/usr/share/info/knot-resolver-figures/* diff --git a/distro/pkg/deb/knot-resolver-doc.info b/distro/pkg/deb/knot-resolver-doc.info deleted file mode 100644 index 2283d88e8..000000000 --- a/distro/pkg/deb/knot-resolver-doc.info +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/info/knot-resolver.info -debian/tmp/usr/share/info/knot-resolver-figures/* -- 2.47.2