Merge lp:~smoser/ubuntu/natty/lirc/lp-698208 into lp:ubuntu/natty/lirc

[Scott Moser]

[Michael Vogt (mvo)]

Looks fine!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-14 15:47:27 +0000
+++ debian/changelog	2011-03-18 20:39:26 +0000
@@ -1,3 +1,10 @@
+lirc (0.8.7-0ubuntu4) natty; urgency=low
+
+  [Ernst Sjöstrand]
+  * update init script for /sys change in natty kernels (LP: #698208)
+
+ -- Scott Moser <[e-mail]>  Fri, 18 Mar 2011 16:26:14 -0400
+
 lirc (0.8.7-0ubuntu3) natty; urgency=low
 
   * debian/patches/define_current_cpu_data.patch: fix undeclared
 
=== modified file 'debian/lirc.init.d'
--- debian/lirc.init.d	2010-09-04 18:38:49 +0000
+++ debian/lirc.init.d	2011-03-18 20:39:26 +0000
@@ -93,8 +93,8 @@
 	else
 		action="-"
 	fi
-	if [ -d /sys/devices/virtual/rc ]; then
-		for file in `find /sys/devices/virtual/rc/ -name protocols`; do
+	if [ -d /sys/class/rc ]; then
+		for file in `find /sys/class/rc/*/ -name protocols`; do
 			for protocol in rc5 nec rc6 jvc sony; do
 				echo "${action}${protocol}" > $file
 			done