Merge ~vpa1977/ubuntu/+source/hxtools:ubuntu/devel into ubuntu/+source/hxtools:ubuntu/devel

[Vladimir Petko]

PPA: ppa:vpa1977/october-21[1]

Testing:
 - package installs (piuparts install/upgrade/purge passes on amd64)
 - gpsh works
---
# gpsh foo
[1219] Index has 5 entries
[1219] Queue has 0 entries
---

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21/+sourcepub/15927636/+listing-archive-extra

diff --git a/debian/changelog b/debian/changelog
index 3045b90..da3085c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hxtools (20231224-2ubuntu1) noble; urgency=medium
+
+  * Add missing headers to fix FTBFS. (LP: #2060825)
+  * Add runtime dependency on libfile-find-rule-perl. (LP: #2060728)
+
+ -- Sudip Mukherjee <[e-mail]>  Thu, 11 Apr 2024 19:36:09 +0100
+
 hxtools (20231224-2build1) noble; urgency=high
 
   * No change rebuild against libhx32t64.
diff --git a/debian/control b/debian/control
index f292faf..2cd8765 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: https://salsa.debian.org/debian/hxtools
 
 Package: hxtools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, libfile-find-rule-perl
 # because of /usr/bin/bin2c
 Conflicts: nvidia-cuda-toolkit
 Description: Collection of tools and scripts
diff --git a/debian/patches/add-missing-header.patch b/debian/patches/add-missing-header.patch
 new file mode 100644
index 0000000..baf730e
--- /dev/null
+++ b/debian/patches/add-missing-header.patch
@@ -0,0 +1,78 @@
+Description: Add missing header files
+ This patch can be removed when libhx is updated to v4.21+
+Author: Sudip Mukherjee <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/2060825
+Forwarded: not-needed
+Last-Update: 2024-04-11
+---
+
+--- hxtools-20231224.orig/smath/graph-fanout.c
++++ hxtools-20231224/smath/graph-fanout.c
+@@ -36,6 +36,7 @@
+ #include <libHX/map.h>
+ #include <libHX/option.h>
+ #include <libHX/string.h>
++#include <libHX/defs.h>
+ 
+ struct node {
+ 	char *name;
+--- hxtools-20231224.orig/smm/bsvplay.c
++++ hxtools-20231224/smm/bsvplay.c
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #include <libHX/init.h>
+ #include <libHX/option.h>
++#include <libHX/defs.h>
+ #include "pcspkr.h"
+ #define TICKSPERSEC 1086
+ 
+--- hxtools-20231224.orig/smm/hcdplay.c
++++ hxtools-20231224/smm/hcdplay.c
+@@ -15,6 +15,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <libHX/option.h>
++#include <libHX/defs.h>
+ #include <sys/ioctl.h>
+ #if defined(HAVE_LINUX_CDROM_H)
+ #	include <linux/cdrom.h>
+--- hxtools-20231224.orig/smm/pcmdiff.c
++++ hxtools-20231224/smm/pcmdiff.c
+@@ -17,6 +17,7 @@
+ #include <unistd.h>
+ #include <libHX/init.h>
+ #include <libHX/option.h>
++#include <libHX/defs.h>
+ 
+ struct fdstream {
+ 	int fd;
+--- hxtools-20231224.orig/smm/pcmmix.c
++++ hxtools-20231224/smm/pcmmix.c
+@@ -12,6 +12,7 @@
+ #include <unistd.h>
+ #include <libHX/init.h>
+ #include <libHX/option.h>
++#include <libHX/defs.h>
+ 
+ static char *blocklen_str;
+ static unsigned int mixing_mode, sample_rate = 48000;
+--- hxtools-20231224.orig/suser/tailhex.c
++++ hxtools-20231224/suser/tailhex.c
+@@ -16,6 +16,7 @@
+ #include <libHX/ctype_helper.h>
+ #include <libHX/init.h>
+ #include <libHX/option.h>
++#include <libHX/defs.h>
+ 
+ static struct {
+ 	long long start;
+--- hxtools-20231224.orig/suser/xcp.c
++++ hxtools-20231224/suser/xcp.c
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #include <libHX/init.h>
+ #include <libHX/option.h>
++#include <libHX/defs.h>
+ #include "config.h"
+ 
+ enum {
diff --git a/debian/patches/series b/debian/patches/series
index 0f0c200..a5980ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Drop-some-tools.patch
+add-missing-header.patch