From b5b67adcc17e3e74dbcda09ff3f8a4636aa53486 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 18 May 2024 19:40:22 +0200
Subject: Merging debian version 6.7.7-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/templates/headers.tests-control.in     | 8 ++++----
 debian/templates/image.tests-control.in       | 4 ----
 debian/templates/source.control.in            | 1 +
 debian/templates/tools-unversioned.control.in | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'debian/templates')

diff --git a/debian/templates/headers.tests-control.in b/debian/templates/headers.tests-control.in
index f56894d8da..89648c212e 100644
--- a/debian/templates/headers.tests-control.in
+++ b/debian/templates/headers.tests-control.in
@@ -1,4 +1,4 @@
-Tests: kbuild
-Architecture:
-Depends: python3
-Restrictions: superficial
+Test-Command: debian/tests/headers-kbuild @abiname@@localversion@
+Architecture: @arch@
+Restrictions: skip-not-installable, superficial
+Features: test-name=headers-kbuild@localversion@
diff --git a/debian/templates/image.tests-control.in b/debian/templates/image.tests-control.in
index 62497c67ae..e69de29bb2 100644
--- a/debian/templates/image.tests-control.in
+++ b/debian/templates/image.tests-control.in
@@ -1,4 +0,0 @@
-Tests: selftests
-Restrictions: breaks-testbed, needs-root, isolation-machine
-Depends: kexec-tools, python3, gcc, make, libpopt-dev, gcc-multilib [amd64], bc, fuse, libfuse-dev, pkg-config
-Classes: smp
diff --git a/debian/templates/source.control.in b/debian/templates/source.control.in
index acff96b1f9..0022a08c5f 100644
--- a/debian/templates/source.control.in
+++ b/debian/templates/source.control.in
@@ -10,6 +10,7 @@ Build-Depends:
  debhelper-compat (= 12), dh-exec,
 # used to run debian/bin/*.py
  python3:native,
+ python3-dacite:native,
  python3-jinja2:native,
 # used by debian/rules.real to prepare the source
  quilt,
diff --git a/debian/templates/tools-unversioned.control.in b/debian/templates/tools-unversioned.control.in
index 85e9f49e9f..be4c3c50fb 100644
--- a/debian/templates/tools-unversioned.control.in
+++ b/debian/templates/tools-unversioned.control.in
@@ -60,10 +60,10 @@ Package: linux-perf
 Meta-Rules-Target: perf
 Build-Profiles: <!pkg.linux.notools !pkg.linux.mintools !nopython>
 Section: devel
-Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64
+Architecture: alpha amd64 arm64 armel armhf hppa i386 loong64 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64
 Build-Depends:
  asciidoctor <!nodoc !pkg.linux.notools !nopython>,
- gcc-multilib [amd64 mips64 mips64el mips64r6 mips64r6el ppc64 s390x sparc64],
+ gcc-multilib [amd64 mips64 mips64el mips64r6 mips64r6el ppc64 s390x sparc64] <!cross>,
  libaudit-dev,
  libbabeltrace-dev,
  libdw-dev,
-- 
cgit v1.2.3