Control: tags 961967 + patch Control: tags 961967 + pending Control: tags 1066822 + patch Control: tags 1066822 + pending
Dear maintainer, I've prepared an NMU for linuxtv-dvb-apps (versioned as 1.1.1+rev1500-1.5) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. I would have sent these as git merge requests of some form, but Vcs-Git/Vcs-Browser are still set to the obsolete anonscm.debian.org and I couldn't find any corresponding repositories on salsa, so this was the best I could do; you should be able to find more detailed history via "dgit clone linuxtv-dvb-apps" if you need it. Regards, -- Colin Watson (he/him) [cjwat...@debian.org]
diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog --- linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog 2020-07-26 19:42:38.000000000 +0100 +++ linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog 2024-05-23 16:49:59.000000000 +0100 @@ -1,3 +1,11 @@ +linuxtv-dvb-apps (1.1.1+rev1500-1.5) unstable; urgency=medium + + * Non-maintainer upload. + * Work around UAPI break in Linux input events (Closes: #1066822). + * Set Architecture to linux-any (Closes: #961967). + + -- Colin Watson <cjwat...@debian.org> Thu, 23 May 2024 16:49:59 +0100 + linuxtv-dvb-apps (1.1.1+rev1500-1.4) unstable; urgency=medium * Non-maintainer upload. diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/control linuxtv-dvb-apps-1.1.1+rev1500/debian/control --- linuxtv-dvb-apps-1.1.1+rev1500/debian/control 2016-04-07 17:11:50.000000000 +0100 +++ linuxtv-dvb-apps-1.1.1+rev1500/debian/control 2024-05-23 16:49:59.000000000 +0100 @@ -11,7 +11,7 @@ Homepage: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps Package: dvb-apps -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, makedev | udev, diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series --- linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series 2020-07-26 19:38:59.000000000 +0100 +++ linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series 2024-05-23 16:49:59.000000000 +0100 @@ -11,3 +11,4 @@ dst_test-no-set-id.patch glibc-stime.patch gcc-10-sid-redefinition.patch +work-around-uapi-break-in-linux-input-ev.patch diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/work-around-uapi-break-in-linux-input-ev.patch linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/work-around-uapi-break-in-linux-input-ev.patch --- linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/work-around-uapi-break-in-linux-input-ev.patch 1970-01-01 01:00:00.000000000 +0100 +++ linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/work-around-uapi-break-in-linux-input-ev.patch 2024-05-23 16:49:59.000000000 +0100 @@ -0,0 +1,25 @@ +From: Colin Watson <cjwat...@debian.org> +Date: Thu, 23 May 2024 16:38:37 +0100 +X-Dgit-Generated: 1.1.1+rev1500-1.5 5d2fca4ffffcdce8ddcdf7e13a0681da7b381301 +Subject: Work around UAPI break in Linux input events + +See +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f. + +Closes: #1066822 + +--- + +diff --git a/test/evtest.c b/test/evtest.c +index a61593e..73fb5af 100644 +--- a/test/evtest.c ++++ b/test/evtest.c +@@ -241,7 +241,7 @@ int main (int argc, char **argv) + + for (i = 0; i < rd / (int) sizeof(struct input_event); i++) + printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n", +- ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type, ++ ev[i].input_event_sec, ev[i].input_event_usec, ev[i].type, + events[ev[i].type] ? events[ev[i].type] : "?", + ev[i].code, + names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?",
