sorry for the noise, sending another final diff with all the NMUs inside.
Found that libmtd1 was also listed as runtime dependency, so I removed it. G.
diff -Nru xf86-input-mtrack-0.3.1/debian/changelog
xf86-input-mtrack-0.3.1/debian/changelog
--- xf86-input-mtrack-0.3.1/debian/changelog 2015-06-02 07:09:33.000000000
+0200
+++ xf86-input-mtrack-0.3.1/debian/changelog 2024-04-17 15:07:26.000000000
+0200
@@ -1,3 +1,27 @@
+xf86-input-mtrack (0.3.1-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop runtime dependency on old libmtdev1
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 17 Apr 2024
15:07:26 +0200
+
+xf86-input-mtrack (0.3.1-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Cherry-pick another patch from Benjamin Drung and
+ xf86-input-multitouch 1.0~rc3-2.1 to fix another FTBFS due to time64_t
+ (Closes: #1066547)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 17 Apr 2024
08:18:29 +0200
+
+xf86-input-mtrack (0.3.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Add patch to fix implicit-function-declaration build failures
+ (Closes: #1066547)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 16 Apr 2024
23:32:48 +0200
+
xf86-input-mtrack (0.3.1-1) unstable; urgency=medium
* Upload to unstable.
diff -Nru xf86-input-mtrack-0.3.1/debian/control
xf86-input-mtrack-0.3.1/debian/control
--- xf86-input-mtrack-0.3.1/debian/control 2015-02-23 00:59:49.000000000
+0100
+++ xf86-input-mtrack-0.3.1/debian/control 2024-04-17 15:07:24.000000000
+0200
@@ -16,8 +16,7 @@
Architecture: linux-any
Depends: ${shlibs:Depends},
${misc:Depends},
- ${xinpdriver:Depends},
- libmtdev1 (>= 1.0.10)
+ ${xinpdriver:Depends}
Provides: ${xinpdriver:Provides}
Conflicts: xserver-xorg-input-multitouch
Description: Multitouch X input driver
diff -Nru
xf86-input-mtrack-0.3.1/debian/patches/missing-includes-implicit-function-declaration-fix.patch
xf86-input-mtrack-0.3.1/debian/patches/missing-includes-implicit-function-declaration-fix.patch
---
xf86-input-mtrack-0.3.1/debian/patches/missing-includes-implicit-function-declaration-fix.patch
1970-01-01 01:00:00.000000000 +0100
+++
xf86-input-mtrack-0.3.1/debian/patches/missing-includes-implicit-function-declaration-fix.patch
2024-04-17 08:18:29.000000000 +0200
@@ -0,0 +1,28 @@
+Description: Add patch to fix missing includes
+Author: Gianfranco Costamagna <locutusofb...@debian.org>
+Last-Update: 2024-04-17
+
+Index: xf86-input-mtrack-0.3.1/src/gestures.c
+===================================================================
+--- xf86-input-mtrack-0.3.1.orig/src/gestures.c
++++ xf86-input-mtrack-0.3.1/src/gestures.c
+@@ -28,6 +28,7 @@
+ #include "gestures.h"
+ #include "mtouch.h"
+ #include "trig.h"
++#include <mtdev-plumbing.h>
+
+ #define IS_VALID_BUTTON(x) (x >= 0 && x <= 31)
+
+Index: xf86-input-mtrack-0.3.1/tools/mtrack-test.c
+===================================================================
+--- xf86-input-mtrack-0.3.1.orig/tools/mtrack-test.c
++++ xf86-input-mtrack-0.3.1/tools/mtrack-test.c
+@@ -23,6 +23,7 @@
+ #include "mtouch.h"
+ #include <fcntl.h>
+ #include <stdarg.h>
++#include <unistd.h>
+
+ void xf86Msg(int type, const char *format, ...)
+ {
diff -Nru
xf86-input-mtrack-0.3.1/debian/patches/Port-usage-of-struct-input_event-to-input_event_.patch
xf86-input-mtrack-0.3.1/debian/patches/Port-usage-of-struct-input_event-to-input_event_.patch
---
xf86-input-mtrack-0.3.1/debian/patches/Port-usage-of-struct-input_event-to-input_event_.patch
1970-01-01 01:00:00.000000000 +0100
+++
xf86-input-mtrack-0.3.1/debian/patches/Port-usage-of-struct-input_event-to-input_event_.patch
2024-04-17 15:07:11.000000000 +0200
@@ -0,0 +1,22 @@
+From: Benjamin Drung <benjamin.dr...@canonical.com>
+Date: Mon, 15 Apr 2024 19:56:58 +0200
+Subject: Port usage of struct input_event to input_event_*
+
+---
+ src/hwstate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xf86-input-mtrack-0.3.1/src/hwstate.c
+===================================================================
+--- xf86-input-mtrack-0.3.1.orig/src/hwstate.c
++++ xf86-input-mtrack-0.3.1/src/hwstate.c
+@@ -42,7 +42,8 @@
+ if (!caps->has_abs[MTDEV_WIDTH_MINOR])
+ s->data[i].width_minor = s->data[i].width_major;
+ }
+- timercp(&s->evtime, &syn->time);
++ s->evtime.tv_sec = syn->input_event_sec;
++ s->evtime.tv_usec = syn->input_event_usec;
+ }
+
+ static int read_event(struct HWState *s, const struct Capabilities *caps,
diff -Nru xf86-input-mtrack-0.3.1/debian/patches/series
xf86-input-mtrack-0.3.1/debian/patches/series
--- xf86-input-mtrack-0.3.1/debian/patches/series 2012-07-05
09:57:49.000000000 +0200
+++ xf86-input-mtrack-0.3.1/debian/patches/series 2024-04-17
08:12:31.000000000 +0200
@@ -1,3 +1,5 @@
#drop-mtrack-test
#aa
upsteam-commit
+missing-includes-implicit-function-declaration-fix.patch
+Port-usage-of-struct-input_event-to-input_event_.patch
OpenPGP_signature.asc
Description: OpenPGP digital signature
