--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
In my last update of lirc I overlooked that one of the conffiles
contains the value of $DEB_HOST_MULTIARCH and thus the detection of
known old conffiles by md5sum only worked on amd64. I've now fixed
that and verified that upgrades from stretch to buster with this
patch work on i386 as well as amd64.
The attached diff is a git diff because it better copes with the rename
of debian/lirc.preinst to debian/lirc.preinst.in
The package is already uploaded.
Andreas
diff --git a/debian/changelog b/debian/changelog
index 663e07e..a3cf102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+lirc (0.10.1-6.3~deb10u1) buster; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for buster.
+
+ -- Andreas Beckmann <anbe@debian.org> Sat, 20 Mar 2021 21:32:41 +0100
+
+lirc (0.10.1-6.3) unstable; urgency=medium
+
+ * 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 <anbe@debian.org> Thu, 18 Mar 2021 22:21:31 +0100
+
lirc (0.10.1-6.2~deb10u1) buster; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 7f18471..a8deb3f 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Depends:
${python3:Depends},
${shlibs:Depends}
Recommends:
- gir1.2-vte,
+ gir1.2-vte-2.91,
python3-yaml,
python3-gi,
systemd [linux-any]
diff --git a/debian/lirc.preinst b/debian/lirc.preinst.in
similarity index 76%
rename from debian/lirc.preinst
rename to debian/lirc.preinst.in
index 53a5c31..df3b9cc 100644
--- a/debian/lirc.preinst
+++ b/debian/lirc.preinst.in
@@ -3,13 +3,13 @@ set -e
md5sums_shipped="
92df549c82f58ea28b605e5045984e04 /etc/lirc/irexec.lircrc
-d2664e84bab19f7f36628d1de3f273dd /etc/lirc/lirc_options.conf #stretch
-6599e8ea08b5f4bf19409666cae22441 /etc/lirc/lirc_options.conf #buster
+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.2~"
+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
@@ -26,7 +26,7 @@ then
continue
fi
case "$md5sums_shipped" in
- *"$(md5sum "$conffile")"*)
+ *"$(md5sum "$conffile")"*|*"$(sed 's%@DEB_HOST_MULTIARCH@%<DEB_HOST_MULTIARCH>%g' "$conffile" | md5sum | sed "s%-%$conffile%")"*)
echo "Removing unmodified configuration file $conffile which is unknown to dpkg."
rm "$conffile"
;;
diff --git a/debian/rules b/debian/rules
index 84787ef..8223d80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,16 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
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 -- \
--- End Message ---