Control: tags -1 - moreinfo On Sun, Mar 10, 2019 at 08:58:00AM +0000, Niels Thykier wrote: > --link-doc requires dir-to-symlink migration via dpkg-maintscript-helper > in the maintscript. I do not see that in the debdiff, so I assume the > proposed changes will trigger a new bug (as I recall, an RC bug).
Yes indeed!
Thanks for catching this, here is the debdiff for the updated package.
I also fixed some other issues, like #924158.
Best,
nicoo
diff -Nru lirc-0.10.1/debian/changelog lirc-0.10.1/debian/changelog
--- lirc-0.10.1/debian/changelog 2019-01-01 15:19:01.000000000 +0100
+++ lirc-0.10.1/debian/changelog 2019-03-10 00:28:01.000000000 +0100
@@ -1,3 +1,30 @@
+lirc (0.10.1-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+
+ * debian/rules
+ + Replace rdfind-based dedup with dh_installdocs --link-doc
+ - This achieves the same effect (copyright, changelog, ... aren't
+ duplicated) cleanly and without RC-buggyness. (Closes: #919843)
+ - Add missing maintscripts for dir-to-symlink migration.
+ Thanks to Niels Thykier for spotting the bug.
+
+ + Do not install conffiles in a dummy location
+ dpkg will, by default, not overwrite users' conffiles,
+ so shipping them in a different location is superfluous.
+
+ * Rename debian/post{inst,rm} to lirc.post{inst,rm}
+ * debian/lirc.{postinst,prerm}: Recompile and remove Python bytecode as
needed
+ Closes: #924158
+
+ * debian/control: Fix relationships on liblirc{,client}-dev.
+ This should be Breaks+Replaces, not Conflict+Replaces.
+ Using the former should ensure that upgrading from stretch works smoothly.
+
+ * debian/changelog: Fix spelling in v0.10.1-4
+
+ -- Nicolas Braud-Santoni <ni...@debian.org> Sun, 10 Mar 2019 00:28:01 +0100
+
lirc (0.10.1-5) unstable; urgency=medium
* Fix upstream #343, --connect parsing error.
@@ -11,7 +38,7 @@
lirc (0.10.1-4) unstable; urgency=medium
[ Alec Leamas ]
- * Dont use broken LOG_CONS syslog flag, closes: #872749.
+ * Don't use broken LOG_CONS syslog flag, closes: #872749.
[ Pino Toscano ]
* Fix build on !linux OS, restrict systemd only to linux OS. closes: #912400
diff -Nru lirc-0.10.1/debian/control lirc-0.10.1/debian/control
--- lirc-0.10.1/debian/control 2019-01-01 15:19:01.000000000 +0100
+++ lirc-0.10.1/debian/control 2019-03-10 00:28:01.000000000 +0100
@@ -29,7 +29,6 @@
python3-dev (>= 3.5),
python3-setuptools,
python3-yaml,
- rdfind,
socat [!hurd-any],
systemd [linux-any],
xsltproc
@@ -128,7 +127,7 @@
#Multi-Arch: same
Section: libdevel
Provides: liblircclient-dev
-Conflicts: liblircclient-dev (<< 0.9.1)
+Breaks: liblircclient-dev (<< 0.9.1)
Replaces: liblircclient-dev (<< 0.9.1)
Depends:
liblirc0 (= ${binary:Version}),
diff -Nru lirc-0.10.1/debian/liblirc0.maintscript
lirc-0.10.1/debian/liblirc0.maintscript
--- lirc-0.10.1/debian/liblirc0.maintscript 1970-01-01 01:00:00.000000000
+0100
+++ lirc-0.10.1/debian/liblirc0.maintscript 2019-03-10 00:28:01.000000000
+0100
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/liblirc0 /usr/share/doc/lirc
diff -Nru lirc-0.10.1/debian/liblirc-client0.maintscript
lirc-0.10.1/debian/liblirc-client0.maintscript
--- lirc-0.10.1/debian/liblirc-client0.maintscript 1970-01-01
01:00:00.000000000 +0100
+++ lirc-0.10.1/debian/liblirc-client0.maintscript 2019-03-10
00:28:01.000000000 +0100
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/liblirc-client0 /usr/share/doc/lirc
diff -Nru lirc-0.10.1/debian/liblircclient0.maintscript
lirc-0.10.1/debian/liblircclient0.maintscript
--- lirc-0.10.1/debian/liblircclient0.maintscript 1970-01-01
01:00:00.000000000 +0100
+++ lirc-0.10.1/debian/liblircclient0.maintscript 2019-03-10
00:28:01.000000000 +0100
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/liblircclient0 /usr/share/doc/lirc
diff -Nru lirc-0.10.1/debian/liblircclient-dev.maintscript
lirc-0.10.1/debian/liblircclient-dev.maintscript
--- lirc-0.10.1/debian/liblircclient-dev.maintscript 1970-01-01
01:00:00.000000000 +0100
+++ lirc-0.10.1/debian/liblircclient-dev.maintscript 2019-03-10
00:28:01.000000000 +0100
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/liblircclient-dev /usr/share/doc/lirc
diff -Nru lirc-0.10.1/debian/liblirc-dev.maintscript
lirc-0.10.1/debian/liblirc-dev.maintscript
--- lirc-0.10.1/debian/liblirc-dev.maintscript 1970-01-01 01:00:00.000000000
+0100
+++ lirc-0.10.1/debian/liblirc-dev.maintscript 2019-03-10 00:28:01.000000000
+0100
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/liblirc-dev /usr/share/doc/lirc
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 01:00:00.000000000 +0100
+++ lirc-0.10.1/debian/lirc.maintscript 2019-03-10 00:28:01.000000000 +0100
@@ -0,0 +1,4 @@
+mv_conffile /etx/lirc/lircd.conf.dist /etc/lirc/lircd.conf
+mv_conffile /etx/lirc/lircmd.conf.dist /etc/lirc/lircmd.conf
+mv_conffile /etx/lirc/irexec.lircrc.dist /etc/lirc/irexec.lircrc
+mv_conffile /etx/lirc/lirc_options.conf.dist /etc/lirc/lirc_options.conf
diff -Nru lirc-0.10.1/debian/lirc.postinst lirc-0.10.1/debian/lirc.postinst
--- lirc-0.10.1/debian/lirc.postinst 1970-01-01 01:00:00.000000000 +0100
+++ lirc-0.10.1/debian/lirc.postinst 2019-03-10 00:28:01.000000000 +0100
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+rm -f /etc/init.d/lirc
+
+if which systemd-tmpfiles >/dev/null; then
+ systemd-tmpfiles --create /usr/lib/tmpfiles.d/lirc.conf || :
+fi
+
+# distutils' sysconfig.get_python_lib is broken - #911038. Furthermore, the
+# first iteration of this fix did not remove the links in postrm. So:
+find /usr/lib/python3/dist-packages -maxdepth 1 -type l -name lirc -delete
+find /usr/lib/python3/dist-packages -maxdepth 1 -type l -name lirc-setup
-delete
+ln -s /usr/lib/*/python*/site-packages/lirc \
+ /usr/lib/python3/dist-packages
+ln -s /usr/lib/*/python*/site-packages/lirc-setup \
+ /usr/lib/python3/dist-packages
+
+# Recompile Python bytecode as needed
+py3compile /usr/lib/*/python3.*/site-packages/lirc
+py3compile /usr/lib/*/python3.*/site-packages/lirc-setup
+
+#DEBHELPER#
diff -Nru lirc-0.10.1/debian/lirc.postrm lirc-0.10.1/debian/lirc.postrm
--- lirc-0.10.1/debian/lirc.postrm 1970-01-01 01:00:00.000000000 +0100
+++ lirc-0.10.1/debian/lirc.postrm 2019-03-10 00:28:01.000000000 +0100
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = 'purge'; then
+ for f in lircd.conf lircmd.conf irexec.lircrc lirc_options.conf; do
+ rm -f /etc/lirc/$f;
+ done || :
+ find /etc/lirc -type d -empty -delete || :
+ rm -f /usr/lib/python3/dist-packages/lirc
+ rm -f /usr/lib/python3/dist-packages/lirc-setup
+fi
+
+
+#DEBHELPER#
+
diff -Nru lirc-0.10.1/debian/lirc.prerm lirc-0.10.1/debian/lirc.prerm
--- lirc-0.10.1/debian/lirc.prerm 1970-01-01 01:00:00.000000000 +0100
+++ lirc-0.10.1/debian/lirc.prerm 2019-03-10 00:28:01.000000000 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# Remove Python bytecode as needed
+py3clean -p lirc
+
+
+#DEBHELPER#
diff -Nru lirc-0.10.1/debian/lirc-x.maintscript
lirc-0.10.1/debian/lirc-x.maintscript
--- lirc-0.10.1/debian/lirc-x.maintscript 1970-01-01 01:00:00.000000000
+0100
+++ lirc-0.10.1/debian/lirc-x.maintscript 2019-03-10 00:28:01.000000000
+0100
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/lirc-x /usr/share/doc/lirc
diff -Nru lirc-0.10.1/debian/postinst lirc-0.10.1/debian/postinst
--- lirc-0.10.1/debian/postinst 2019-01-01 15:19:01.000000000 +0100
+++ lirc-0.10.1/debian/postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -f /etc/init.d/lirc
-
-if which systemd-tmpfiles >/dev/null; then
- systemd-tmpfiles --create /usr/lib/tmpfiles.d/lirc.conf || :
-fi
-
-for f in lircd.conf lircmd.conf irexec.lircrc lirc_options.conf; do
- test -e /etc/lirc/$f || cp /etc/lirc/${f}.dist /etc/lirc/$f || :
-done
-
-# distutils' sysconfig.get_python_lib is broken - #911038. Furthermore, the
-# first iteration of this fix did not remove the links in postrm. So:
-find /usr/lib/python3/dist-packages -maxdepth 1 -type l -name lirc -delete
-find /usr/lib/python3/dist-packages -maxdepth 1 -type l -name lirc-setup
-delete
-ln -s /usr/lib/*/python*/site-packages/lirc \
- /usr/lib/python3/dist-packages
-ln -s /usr/lib/*/python*/site-packages/lirc-setup \
- /usr/lib/python3/dist-packages
-
-#DEBHELPER#
diff -Nru lirc-0.10.1/debian/postrm lirc-0.10.1/debian/postrm
--- lirc-0.10.1/debian/postrm 2019-01-01 15:14:43.000000000 +0100
+++ lirc-0.10.1/debian/postrm 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if test "$1" = 'purge'; then
- for f in lircd.conf lircmd.conf irexec.lircrc lirc_options.conf; do
- rm -f /etc/lirc/$f;
- done || :
- find /etc/lirc -type d -empty -delete || :
- rm -f /usr/lib/python3/dist-packages/lirc
- rm -f /usr/lib/python3/dist-packages/lirc-setup
-fi
-
-
-#DEBHELPER#
-
diff -Nru lirc-0.10.1/debian/rules lirc-0.10.1/debian/rules
--- lirc-0.10.1/debian/rules 2019-01-01 15:19:01.000000000 +0100
+++ lirc-0.10.1/debian/rules 2019-03-10 00:28:01.000000000 +0100
@@ -42,12 +42,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
- # De-duplicate docs
- rdfind -makesymlinks true debian/tmp/usr/share/doc/lirc
override_dh_auto_test:
ifneq "nocheck" "$(findstring nocheck,$(DEB_BUILD_OPTIONS))"
@@ -64,6 +58,10 @@
endif
+override_dh_installdocs:
+ dh_installdocs --link-doc=lirc -a
+ dh_installdocs -p lirc-doc
+
override_dh_installsystemd:
ifeq ($(DEB_BUILD_ARCH_OS), linux)
dh_installsystemd -p lirc lircd.socket
signature.asc
Description: PGP signature
