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

Proposed by Scott Moser on 2011-03-18
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~smoser/ubuntu/natty/lirc/lp-698208
Merge into: lp:ubuntu/natty/lirc
Diff against target: 29 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/lirc.init.d (+2/-2)
To merge this branch: bzr merge lp:~smoser/ubuntu/natty/lirc/lp-698208
Reviewer Review Type Date Requested Status
Michael Vogt Approve on 2011-03-24
Ubuntu branches 2011-03-18 Pending
Review via email: mp+54069@code.launchpad.net
To post a comment you must log in.
Michael Vogt (mvo) wrote :

Looks fine!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-14 15:47:27 +0000
3+++ debian/changelog 2011-03-18 20:39:26 +0000
4@@ -1,3 +1,10 @@
5+lirc (0.8.7-0ubuntu4) natty; urgency=low
6+
7+ [Ernst Sjöstrand]
8+ * update init script for /sys change in natty kernels (LP: #698208)
9+
10+ -- Scott Moser <smoser@ubuntu.com> Fri, 18 Mar 2011 16:26:14 -0400
11+
12 lirc (0.8.7-0ubuntu3) natty; urgency=low
13
14 * debian/patches/define_current_cpu_data.patch: fix undeclared
15
16=== modified file 'debian/lirc.init.d'
17--- debian/lirc.init.d 2010-09-04 18:38:49 +0000
18+++ debian/lirc.init.d 2011-03-18 20:39:26 +0000
19@@ -93,8 +93,8 @@
20 else
21 action="-"
22 fi
23- if [ -d /sys/devices/virtual/rc ]; then
24- for file in `find /sys/devices/virtual/rc/ -name protocols`; do
25+ if [ -d /sys/class/rc ]; then
26+ for file in `find /sys/class/rc/*/ -name protocols`; do
27 for protocol in rc5 nec rc6 jvc sony; do
28 echo "${action}${protocol}" > $file
29 done

Subscribers

People subscribed via source and target branches

to all changes: