Merging debian version 6.8.9-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 5 insertions, 8 deletions

diff --git a/debian/templates/docs.control.in b/debian/templates/docs.control.in
index 0f9529bc67..a6cd1631aa 100644
--- a/debian/templates/docs.control.in
+++ b/debian/templates/docs.control.in
@@ -3,7 +3,7 @@ Meta-Rules-Target: doc
 Build-Profiles: <!nodoc !pkg.linux.quick>
 Architecture: all
 Build-Depends: graphviz, python3-sphinx, python3-sphinx-rtd-theme,
- texlive-latex-base, texlive-latex-extra, dvipng
+ texlive-latex-base, texlive-latex-extra, dvipng, python3-yaml
 Depends: ${misc:Depends}
 Section: doc
 Multi-Arch: foreign
diff --git a/debian/templates/image-unsigned.control.in b/debian/templates/image-unsigned.control.in
index 40b656f068..2f3ed2c5e5 100644
--- a/debian/templates/image-unsigned.control.in
+++ b/debian/templates/image-unsigned.control.in
@@ -7,8 +7,7 @@ Build-Depends:
 # used by kernel-wedge (only on Linux, thus not declared as a dependency)
  kmod,
 Depends: kmod, linux-base (>= 4.3~), ${misc:Depends}
-Recommends: firmware-linux-free
-Suggests: linux-doc-@version@, debian-kernel-handbook
+Suggests: firmware-linux-free, linux-doc-@version@, debian-kernel-handbook
 Conflicts: linux-image-@abiname@@localversion@
 Replaces: linux-image-@abiname@@localversion@
 Description: Linux @upstreamversion@ for @class@
diff --git a/debian/templates/image.control.in b/debian/templates/image.control.in
index 8998e61ba1..8bc561c941 100644
--- a/debian/templates/image.control.in
+++ b/debian/templates/image.control.in
@@ -7,7 +7,6 @@ Build-Depends:
 # used by kernel-wedge (only on Linux, thus not declared as a dependency)
  kmod,
 Depends: kmod, linux-base (>= 4.3~), ${misc:Depends}
-Recommends: firmware-linux-free
-Suggests: linux-doc-@version@, debian-kernel-handbook
+Suggests: firmware-linux-free, linux-doc-@version@, debian-kernel-handbook
 Description: Linux @upstreamversion@ for @class@
  The Linux kernel @upstreamversion@ and modules for use on @longclass@.
diff --git a/debian/templates/main.control.in b/debian/templates/main.control.in
index beee1d1b29..209a20308c 100644
--- a/debian/templates/main.control.in
+++ b/debian/templates/main.control.in
@@ -3,7 +3,7 @@ Meta-Rules-Target: support
 Build-Profiles: <!pkg.linux.notools>
 Architecture: all
 Section: devel
-Depends: ${python3:Depends}, python3-jinja2, ${misc:Depends}
+Depends: ${python3:Depends}, python3-dacite, python3-jinja2, ${misc:Depends}
 Multi-Arch: foreign
 Description: Support files for Linux @upstreamversion@
  This package provides support files for the Linux kernel build,
diff --git a/debian/templates/signed.image.control.in b/debian/templates/signed.image.control.in
index de85cfeb45..ad8402fe62 100644
--- a/debian/templates/signed.image.control.in
+++ b/debian/templates/signed.image.control.in
@@ -13,10 +13,9 @@ Build-Depends:
  rsync,
 Built-Using: @source_basename@@source_suffix@ (= @version_complete@)
 Depends: kmod, linux-base (>= 4.3~), ${misc:Depends}
-Recommends: firmware-linux-free
 Conflicts: linux-image-@abiname@@localversion@-unsigned
 Replaces: linux-image-@abiname@@localversion@-unsigned
-Suggests: linux-doc-@version@, debian-kernel-handbook
+Suggests: firmware-linux-free, linux-doc-@version@, debian-kernel-handbook
 Description: Linux @upstreamversion@ for @class@ (signed)
  The Linux kernel @upstreamversion@ and modules for use on @longclass@.
  .