Merge branch 'pkg-bionic' into 'master'

jruzicka-nic · jruzicka-nic · commit 087d62c1ad9f · 2024-02-06T16:00:44.000+01:00
pkg/distro/deb: fix doc build for Ubuntu 18.04

See merge request knot/knot-resolver!1495
diff --git a/distro/pkg/deb/compat b/distro/pkg/deb/compat
@@ -1 +1 @@
-9
+11
diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Knot Resolver <knot-resolver@labs.nic.cz>
 Build-Depends:
- debhelper (>= 9~),
+ debhelper (>= 11~),
  libcmocka-dev (>= 1.0.0),
  libedit-dev,
  libfstrm-dev,
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`debian/tmp/usr/share/doc/knot-resolver/html/*`
	`2`	`+debian/tmp/usr/share/info/knot-resolver.info`
	`3`	`+debian/tmp/usr/share/info/knot-resolver-figures/*`