Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Control: block 919843 by -1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Dear release team,
Please unblock package lirc, as I fixed an RC bug.
Note that the upload was to DELAYED/3, as it is a NMU.
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,18 @@
+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)
+
+ * 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 +26,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/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
@@ -46,8 +46,6 @@
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 +62,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
unblock lirc/0.10.1-5.1
- -- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set
to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-----BEGIN PGP SIGNATURE-----
iQJFBAEBCgAvFiEEU7EqA8ZVHYoLJhPE5vmO4pLV7MsFAlyETwkRHG5pY29vQGRl
Ymlhbi5vcmcACgkQ5vmO4pLV7MtsZw//VaakF1WKmQZogNQgcC4iyvFE1c6e4fue
HlsHGiJonBOh259DkJUiWDrkGWXB8FdKfg8tmOmiMatwEloahHajjY+32RYglVgi
9sWIbTWE8GBv4Qe4P3epKWby2TR8zzz/gS8i35oKlQL/ikpyl0LBBHvDgr3drvbo
HatUrqjcwIAkA0ANE0Qc3CD/mk40R+YQldq9K8x7SwPdPvqOR1SuWbFd99ykfVc3
pKGEjMgjtYW9+0DAKn4/CrfunkN9EXVdUK4QIZLhnUa7Rp8CkdNWO76l+oHZ5mv4
lfNtO7qcvPRPMrIigxg5lzE3xIJgjcsmE6O8+7YhkQZf+EEO9KoifQl8qLVe6ZxR
qtG45tx6oVruf9iNTMAVu8f3Ph3x/BllCgg/9wK04YP69yvoxIxUwjB0wX07jXgz
OoqRzbuz8pzGyUTWqqUmc7yvmHmSzNf9tfuqcNAhUhDR7XMRLl5YuP71v7jP1vfC
42OSyKbP8MHSaiCAkAoDQbNQMlUyXXRjKXOotn1a70aa9d7EweDRonLS+FbQIPRM
waYpSBUIw41lQqQk+Zzq2PhMG/AHbDurT7q0QmPKu4aRpBUcpepmOwxJjcLvYmD3
werZS5tu2SCjtlVoeILxFOQBTQPTTqpV+AzMuDrC2+l0LGIP0Ge3W66oRisQPqyf
66uMn3mRtjw=
=kQuD
-----END PGP SIGNATURE-----
