bluetooth-touch

Merge lp:~morphis/bluetooth-touch/fix-lp1539566 into lp:bluetooth-touch

  1. fix-lp1539566
  2. Merge into trunk
Proposed by Simon Fels on 2016-02-01
Status: Merged
Approved by: Łukasz Zemczak on 2016-02-01
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~morphis/bluetooth-touch/fix-lp1539566
Merge into: lp:bluetooth-touch
Prerequisite: lp:~morphis/bluetooth-touch/add-override-option
Diff against target: 12 lines (+1/-1)
1 file modified
debian/bluetooth-touch.conf (+1/-1)
To merge this branch: bzr merge lp:~morphis/bluetooth-touch/fix-lp1539566
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve on 2016-02-01
Simon Fels Pending
Review via email: mp+284575@code.launchpad.net

Commit Message

Correctly check for upstart job configuration file

Description of the Change

Correctly check for upstart job configuration file

To post a comment you must log in.
lp:~morphis/bluetooth-touch/fix-lp1539566 updated on 2016-02-01
8. By Simon Fels on 2016-02-01

Merge trunk

[ Simon Fels ]
* Add citrain support removed: debian/source/ debian/source/format
  added: .bzr-builddeb/ .bzr-builddeb/default.conf
* Add option to override upstart job for Bluetooth initialization
  added: debian/bluetooth-touch-android.conf
* Drop unwanted bzr-builddeb configuration removed: debian/bzr-
  builddeb.conf

Łukasz Zemczak (sil2100) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/bluetooth-touch.conf'
2--- debian/bluetooth-touch.conf 2016-01-18 14:40:53 +0000
3+++ debian/bluetooth-touch.conf 2016-02-01 11:17:16 +0000
4@@ -13,7 +13,7 @@
5 script
6 if [ -x `which getprop` ]; then
7 device=`getprop ro.product.device`
8- if [ -e /etc/init/bluetooth-touch-$device ]; then
9+ if [ -e /etc/init/bluetooth-touch-$device.conf ]; then
10 start bluetooth-touch-$device
11 else
12 start bluetooth-touch-android

Subscribers

People subscribed via source and target branches

to all changes: