Merge lp://staging/~morphis/bluetooth-touch/add-override-option into lp://staging/bluetooth-touch

Proposed by Simon Fels
Status: Merged
Approved by: Simon Fels
Approved revision: 6
Merged at revision: 6
Proposed branch: lp://staging/~morphis/bluetooth-touch/add-override-option
Merge into: lp://staging/bluetooth-touch
Diff against target: 24 lines (+7/-1)
2 files modified
debian/bluetooth-touch-android.conf (+4/-0)
debian/bluetooth-touch.conf (+3/-1)
To merge this branch: bzr merge lp://staging/~morphis/bluetooth-touch/add-override-option
Reviewer Review Type Date Requested Status
Simon Fels Pending
Review via email: mp+282313@code.staging.launchpad.net

Commit message

Add option to override upstart job for Bluetooth initialization

Description of the change

Add option to override upstart job for Bluetooth initialization

To post a comment you must log in.
4. By Simon Fels

Merge trunk

* Add citrain support
* Update the systemd job to check that $SCRIPT is a regular file before
  attempting to run it. (LP: #1437671)

5. By Simon Fels

Merge trunk

6. By Simon Fels

Check for the existence of a device upstart job or default to the generic
one.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: