diff -Nru lirc-0.10.1/debian/changelog lirc-0.10.1/debian/changelog --- lirc-0.10.1/debian/changelog 2020-01-05 00:27:40.000000000 +0000 +++ lirc-0.10.1/debian/changelog 2021-06-23 23:14:02.000000000 +0000 @@ -1,20 +1,40 @@ -lirc (0.10.1-6~16.04.sav1) xenial; urgency=medium +lirc (0.10.1-6.3~16.04.sav0) xenial; urgency=medium - * Rebuild against ppa:savoury1/build-tools (backported debhelper 11.3.5 and - other backported build tools) with original debian/{control,rules} files + * Backport to Xenial * debian/compat: Set compat level to 10 (Launchpad sbuild highest for Xenial) - -- Rob Savoury Sat, 04 Jan 2020 16:27:40 -0800 + -- Rob Savoury Wed, 23 Jun 2021 16:14:02 -0700 -lirc (0.10.1-6~16.04.sav0) xenial; urgency=medium +lirc (0.10.1-6.3) unstable; urgency=medium - * Backport to Xenial - * debian/compat: Drop compat level to 9 (Xenial) - * debian/control: Drop debhelper BD to 9 and Standards to 3.9.8 (Xenial) and - add dh-autoreconf BD (compat level < 10) - * debian/rules: Add "--with autoreconf" to dh invocation (compat level < 10) + * Non-maintainer upload. + * d/lirc.preinst: Normalize embedded ${DEB_HOST_MULTIARCH} value in + /etc/lirc/lirc_options.conf to find unmodified configuration files on all + architectures. + * Recommend gir1.2-vte-2.91 instead of non-existant gir1.2-vte. + (Closes: #983581) + + -- Andreas Beckmann Thu, 18 Mar 2021 22:21:31 +0100 + +lirc (0.10.1-6.2) unstable; urgency=medium + + * Non-maintainer upload. + * Revert "Revert "Do not install conffiles in a dummy location"" + (0.10.1-5.2). (Closes: #932779, #851618) + * d/lirc.maintscript: rm_conffile /etc/lirc/*.dist because they are most + likely unmodified, don't mv_conffile them to =~ s/\.dist// to avoid + clashes with existing and possibly modified configuration files. + * d/lirc.preinst: Remove unmodified configuration files that are unknown to + dpkg to avoid prompting when replacing them with conffiles. + + -- Andreas Beckmann Thu, 14 May 2020 11:46:53 +0200 + +lirc (0.10.1-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix time.clock usage. Closes: #949835. - -- Rob Savoury Sun, 10 Nov 2019 09:57:40 -0800 + -- Matthias Klose Fri, 13 Mar 2020 08:55:53 +0100 lirc (0.10.1-6) unstable; urgency=medium diff -Nru lirc-0.10.1/debian/control lirc-0.10.1/debian/control --- lirc-0.10.1/debian/control 2019-04-06 11:27:42.000000000 +0000 +++ lirc-0.10.1/debian/control 2021-03-18 21:21:31.000000000 +0000 @@ -45,7 +45,7 @@ ${python3:Depends}, ${shlibs:Depends} Recommends: - gir1.2-vte, + gir1.2-vte-2.91, python3-yaml, python3-gi, systemd [linux-any] diff -Nru lirc-0.10.1/debian/lirc.maintscript lirc-0.10.1/debian/lirc.maintscript --- lirc-0.10.1/debian/lirc.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/lirc.maintscript 2021-03-18 21:21:31.000000000 +0000 @@ -0,0 +1,4 @@ +rm_conffile /etc/lirc/lircd.conf.dist 0.10.1-6.2~ +rm_conffile /etc/lirc/lircmd.conf.dist 0.10.1-6.2~ +rm_conffile /etc/lirc/irexec.lircrc.dist 0.10.1-6.2~ +rm_conffile /etc/lirc/lirc_options.conf.dist 0.10.1-6.2~ diff -Nru lirc-0.10.1/debian/lirc.preinst.in lirc-0.10.1/debian/lirc.preinst.in --- lirc-0.10.1/debian/lirc.preinst.in 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/lirc.preinst.in 2021-03-18 21:21:31.000000000 +0000 @@ -0,0 +1,40 @@ +#!/bin/sh +set -e + +md5sums_shipped=" +92df549c82f58ea28b605e5045984e04 /etc/lirc/irexec.lircrc +6447d4261e0b8a80beb4b94e80e3333a /etc/lirc/lirc_options.conf #stretch, normalized +c2a8478e9eda95eb4216414a7979acb5 /etc/lirc/lirc_options.conf #buster, normalized +810233d6f1bb15b64468beb95e4c670e /etc/lirc/lircd.conf +eca53bdc53bd5edc63cf06a4cff16b0d /etc/lirc/lircmd.conf +" + +if dpkg --compare-versions "$2" lt-nl "0.10.1-6.3~" +then + # * configuration files unknown to dpkg and identical to a known + # shipped version can be deleted to avoid prompting when replacing + # them with proper conffiles + # * we must not remove conffiles still known to dpkg as "(obsolete)", + # otherwise dpkg will remember their deletion + conffiles="$(dpkg-query -f '${Conffiles}' -W lirc)" + for conffile in /etc/lirc/lircd.conf /etc/lirc/lircmd.conf /etc/lirc/irexec.lircrc /etc/lirc/lirc_options.conf + do + test -f "$conffile" || continue + if [ -n "$(echo "$conffiles" | grep " $conffile ")" ] + then + echo "Keeping conffile $conffile which is known to dpkg." + continue + fi + case "$md5sums_shipped" in + *"$(md5sum "$conffile")"*|*"$(sed 's%@DEB_HOST_MULTIARCH@%%g' "$conffile" | md5sum | sed "s%-%$conffile%")"*) + echo "Removing unmodified configuration file $conffile which is unknown to dpkg." + rm "$conffile" + ;; + *) + echo "Keeping modified configuration file $conffile which is unknown to dpkg." + ;; + esac + done +fi + +#DEBHELPER# diff -Nru lirc-0.10.1/debian/patches/python3.8.diff lirc-0.10.1/debian/patches/python3.8.diff --- lirc-0.10.1/debian/patches/python3.8.diff 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/patches/python3.8.diff 2021-03-18 21:21:31.000000000 +0000 @@ -0,0 +1,17 @@ +Index: b/python-pkg/lirc/client.py +=================================================================== +--- a/python-pkg/lirc/client.py ++++ b/python-pkg/lirc/client.py +@@ -219,10 +219,10 @@ class RawConnection(AbstractConnection): + def readline(self, timeout: float = None) -> str: + ''' Implements AbstractConnection.readline(). ''' + if timeout: +- start = time.clock() ++ start = time.perf_counter() + while b'\n' not in self._buffer: + ready = self._select.select( +- start + timeout - time.clock() if timeout else timeout) ++ start + timeout - time.perf_counter() if timeout else timeout) + if ready == []: + if timeout: + raise TimeoutException( diff -Nru lirc-0.10.1/debian/patches/series lirc-0.10.1/debian/patches/series --- lirc-0.10.1/debian/patches/series 2019-07-04 14:43:06.000000000 +0000 +++ lirc-0.10.1/debian/patches/series 2021-03-18 21:21:31.000000000 +0000 @@ -4,3 +4,4 @@ 0004-lircd-Fix-connect-option-parsing-error-343.patch 0005-systemd-support-Notify-systemd-on-successful-startup.patch lirc-gpio-ir-0.10.patch +python3.8.diff diff -Nru lirc-0.10.1/debian/rules lirc-0.10.1/debian/rules --- lirc-0.10.1/debian/rules 2019-04-06 12:56:02.000000000 +0000 +++ lirc-0.10.1/debian/rules 2021-03-18 21:21:31.000000000 +0000 @@ -9,11 +9,16 @@ dh $@ --with python3 override_dh_clean: + $(RM) debian/lirc.preinst dh_clean override_dh_autoreconf: dh_autoreconf $(CURDIR)/autogen.sh +debian/lirc.preinst: debian/lirc.preinst.in + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ + +override_dh_auto_configure: debian/lirc.preinst override_dh_auto_configure: ifeq ($(DEB_BUILD_ARCH_OS), linux) dh_auto_configure -- \ @@ -42,10 +47,6 @@ endif # Temporary postinstall 0.9.4 script. cp debian/lirc-old2new debian/tmp/usr/share/lirc - # Don't overwrite existing config files. - for f in lircd.conf lircmd.conf irexec.lircrc lirc_options.conf; do \ - mv debian/tmp/etc/lirc/$$f debian/tmp/etc/lirc/$$f.dist; \ - done override_dh_auto_test: ifneq "nocheck" "$(findstring nocheck,$(DEB_BUILD_OPTIONS))"