tags 979021 + pending forwarded 979021 https://sourceforge.net/p/lirc/tickets/374/ user debian-rele...@lists.debian.org usertags -1 + bsp-2022-10-de-karlsruhe thank you
Dear maintainer, I've prepared an NMU for lirc (versioned as 0.10.1-7.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Additionally I dared to forward the patch affecting the upstream code to their bug tracker. Hopefully this will make future maintenance of this package easier. Regards, Micha
diff -Nru lirc-0.10.1/debian/changelog lirc-0.10.1/debian/changelog --- lirc-0.10.1/debian/changelog 2022-05-12 21:29:00.000000000 +0200 +++ lirc-0.10.1/debian/changelog 2022-10-16 13:31:28.000000000 +0200 @@ -1,3 +1,14 @@ +lirc (0.10.1-7.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Add patch to support passing MODINFO to configure. + * debian/rules: Pass MODINFO and SH_PATH to configure. The paths to "modinfo" + and "sh" may vary as either located in /bin and /sbin or in /usr/bin and + /usr/sbin if the system is configured as a usrmerge system. Use the + non-usrmerge paths for the most compatible location (closes: #979021). + + -- Micha Lenk <mi...@debian.org> Sun, 16 Oct 2022 13:31:28 +0200 + lirc (0.10.1-7) unstable; urgency=medium * Add patch from Fedora for failing tests. Closes: #1009389 diff -Nru lirc-0.10.1/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch lirc-0.10.1/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch --- lirc-0.10.1/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch 1970-01-01 01:00:00.000000000 +0100 +++ lirc-0.10.1/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch 2022-10-16 13:31:28.000000000 +0200 @@ -0,0 +1,28 @@ +From: Vagrant Cascadian <vagr...@reproducible-builds.org> +Date: Sat, 2 Jan 2021 01:03:10 +0000 +Subject: Patch configure.ac to support passing MODINFO. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=979021 +Bug: https://sourceforge.net/p/lirc/tickets/374/ +Reviewed-by: Simon McVittie <s...@debian.org> +Last-Update: 2022-10-16 + +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 58347d8..1d910b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,8 +25,6 @@ AC_CHECK_PROGS([MODINFO], [modinfo], [no], [$PATH:/sbin:/usr/sbin]) + if test x$MODINFO = xno; then + AC_MSG_WARN(["No modinfo command found - skipping kernel drivers."]) + MODINFO="false" +-else +- MODINFO=$( PATH=$PATH:/sbin:/usr/sbin which modinfo ) + fi + AC_SUBST(MODINFO) + AC_CHECK_PROG([PKGCONFIG],[pkg-config],[yes],[no]) +-- +2.20.1 + diff -Nru lirc-0.10.1/debian/patches/series lirc-0.10.1/debian/patches/series --- lirc-0.10.1/debian/patches/series 2022-05-12 21:26:56.000000000 +0200 +++ lirc-0.10.1/debian/patches/series 2022-10-16 13:31:28.000000000 +0200 @@ -7,3 +7,4 @@ 0007-lirc-gpio-ir-0.10.patch 0008-python3.8.diff 0009-Replace-the-obsolete-get_event_loop-with-get_running.patch +0010-Patch-configure.ac-to-support-passing-MODINFO.patch diff -Nru lirc-0.10.1/debian/rules lirc-0.10.1/debian/rules --- lirc-0.10.1/debian/rules 2021-03-18 22:21:31.000000000 +0100 +++ lirc-0.10.1/debian/rules 2022-10-16 13:31:28.000000000 +0200 @@ -22,10 +22,14 @@ override_dh_auto_configure: ifeq ($(DEB_BUILD_ARCH_OS), linux) dh_auto_configure -- \ + SH_PATH=/bin/sh \ + MODINFO=/sbin/modinfo \ --enable-uinput --enable-devinput \ --enable-silent-rules else dh_auto_configure -- \ + SH_PATH=/bin/sh \ + MODINFO=/sbin/modinfo \ --disable-uinput --disable-devinput \ --enable-silent-rules endif
