Control: tags 925066 + patch
Control: tags 925066 + pending
Control: tags 925477 + patch
Control: tags 925477 + pending

Dear maintainer,

I've prepared an NMU for lirc (versioned as 0.10.1-5.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru lirc-0.10.1/debian/changelog lirc-0.10.1/debian/changelog
--- lirc-0.10.1/debian/changelog	2019-03-12 01:33:40.000000000 +0100
+++ lirc-0.10.1/debian/changelog	2019-04-06 15:12:52.000000000 +0200
@@ -1,3 +1,11 @@
+lirc (0.10.1-5.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Revert removal of liblircclient{0,-dev} (Closes: #925477)
+  * Revert "Do not install conffiles in a dummy location" (Closes: #925066)
+
+ -- Tobias Frost <t...@debian.org>  Sat, 06 Apr 2019 15:12:52 +0200
+
 lirc (0.10.1-5.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru lirc-0.10.1/debian/control lirc-0.10.1/debian/control
--- lirc-0.10.1/debian/control	2019-03-12 01:33:40.000000000 +0100
+++ lirc-0.10.1/debian/control	2019-04-06 13:27:42.000000000 +0200
@@ -105,6 +105,24 @@
  LIRC applications (lirc_private.so*)
 
 
+Package: liblircclient0
+Architecture: any
+Section: libs
+Depends: liblirc-client0, ${misc:Depends}
+Description: Transitional placeholder for obsoleted liblircclient0
+ Virtual, empty package used in the process of renaming liblircclient0
+ to liblirc-client0.
+
+
+Package: liblircclient-dev
+Architecture: any
+Section: libdevel
+Depends: liblirc-dev, ${misc:Depends}
+Description: Transitional placeholder for obsoleted liblircclient-dev
+ Virtual, empty package used in the process of incorporating
+ liblircclient-dev in new package liblirc-dev.
+
+
 Package: liblirc-dev
 Architecture: any
 #Multi-Arch: same
diff -Nru lirc-0.10.1/debian/lirc.maintscript lirc-0.10.1/debian/lirc.maintscript
--- lirc-0.10.1/debian/lirc.maintscript	2019-03-12 01:33:40.000000000 +0100
+++ lirc-0.10.1/debian/lirc.maintscript	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-mv_conffile /etc/lirc/lircd.conf.dist /etc/lirc/lircd.conf 0.10.1-5.1~
-mv_conffile /etc/lirc/lircmd.conf.dist /etc/lirc/lircmd.conf 0.10.1-5.1~
-mv_conffile /etc/lirc/irexec.lircrc.dist /etc/lirc/irexec.lircrc 0.10.1-5.1~
-mv_conffile /etc/lirc/lirc_options.conf.dist /etc/lirc/lirc_options.conf 0.10.1-5.1~
diff -Nru lirc-0.10.1/debian/rules lirc-0.10.1/debian/rules
--- lirc-0.10.1/debian/rules	2019-03-12 01:33:40.000000000 +0100
+++ lirc-0.10.1/debian/rules	2019-04-06 14:56:02.000000000 +0200
@@ -42,6 +42,10 @@
 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))"

Attachment: signature.asc
Description: PGP signature

Reply via email to