Merge branch 'release/debian/3.6-2'HEADdebian/3.6-2master

6 files changed, 33 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 9754bbe..f604c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dmidecode (3.6-2) unstable; urgency=medium
+
+  * debian/control:
+    - Change VCS-Git from git to https.
+  * Declare compliance with Debian Policy 4.7.0 (No changes needed).
+  * New debian/patches/0600-Fix-groff-error.patch to fix groff error.
+  * Remove obsolate debian/dmidecode.lintian-overrides.
+  * debian/control:
+    - Enable udeb for riscv64 and loong64 (Closes: #1087465).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 15 Nov 2024 18:41:58 +0100
+
 dmidecode (3.6-1) unstable; urgency=medium
 
   * New upstream release (Closes: #1069767).
diff --git a/debian/control b/debian/control
index f30670d..5ad9b9b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: utils
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2.0
+Standards-Version: 4.7.0
 Rules-Requires-Root: no
-Vcs-Git: git://git.jff.email/dmidecode.git
+Vcs-Git: https://git.jff.email/cgit/dmidecode.git
 Vcs-Browser: https://git.jff.email/cgit/dmidecode.git/
 Homepage: https://nongnu.org/dmidecode/
 
@@ -30,7 +30,7 @@ Description: SMBIOS/DMI table decoder
 
 Package: dmidecode-udeb
 Section: debian-installer
-Architecture: any-amd64 arm64 armhf ia64 any-i386
+Architecture: any-amd64 arm64 armhf ia64 any-i386 riscv64 loong64
 Package-Type: udeb
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: SMBIOS/DMI table decoder (udeb)
diff --git a/debian/dmidecode.lintian-overrides b/debian/dmidecode.lintian-overrides
deleted file mode 100644
index bae92a1..0000000
--- a/debian/dmidecode.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# LC_ALL=C.UTF-8 MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z dmidecode.8 >/dev/null
-#
-# has no error
-#
-groff-message an.tmac:<standard input>:251: warning: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man8/dmidecode.8.gz:1]
\ No newline at end of file
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..ab29bff
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+dmidecode_3.6-2_source.buildinfo utils optional
diff --git a/debian/patches/0600-Fix-groff-error.patch b/debian/patches/0600-Fix-groff-error.patch
new file mode 100644
index 0000000..ce5f561
--- /dev/null
+++ b/debian/patches/0600-Fix-groff-error.patch
@@ -0,0 +1,16 @@
+Description: dmidecode.8 Fix groff error
+Author: Soren Stoutner <soren@debian.org>
+Forwarded: https://savannah.nongnu.org/patch/index.php?10463
+Last-Update: 2024-07-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/man/dmidecode.8
+===================================================================
+--- trunk.orig/man/dmidecode.8
++++ trunk/man/dmidecode.8
+@@ -1,3 +1,5 @@
++'\" t
++.\" ** The above line should force tbl to be a preprocessor **
+ .TH DMIDECODE 8 "February 2023" "dmidecode"
+ .\"
+ .SH NAME
diff --git a/debian/patches/series b/debian/patches/series
index a923944..696939d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 #0140-Fix_scan_entry_point.patch
 #0155-use_read_file.patch
 #0160-HPE_OEM_Firmware_change.patch
+0600-Fix-groff-error.patch