Merge lp:~phablet-team/tone-generator/dbus_activation into lp:tone-generator

Proposed by Gustavo Pichorim Boiko
Status: Approved
Approved by: Tiago Salem Herrmann
Approved revision: 12
Proposed branch: lp:~phablet-team/tone-generator/dbus_activation
Merge into: lp:tone-generator
Diff against target: 47 lines (+20/-0)
4 files modified
debian/com.Nokia.Telephony.Tones.service (+3/-0)
debian/rules (+6/-0)
debian/tone-generator.install (+2/-0)
debian/tone-generator.sh (+9/-0)
To merge this branch: bzr merge lp:~phablet-team/tone-generator/dbus_activation
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
Review via email: mp+314261@code.launchpad.net

Commit message

Make it possible to run tonegend as a result of DBus activation

Description of the change

Make it possible to run tonegend as a result of DBus activation

To post a comment you must log in.
12. By Gustavo Pichorim Boiko

Fix installing the tone-generator wrapper script

Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

looks good to me.

review: Approve

Unmerged revisions

12. By Gustavo Pichorim Boiko

Fix installing the tone-generator wrapper script

11. By Gustavo Pichorim Boiko

Make it possible to run tonegend as a result of DBus activation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/com.Nokia.Telephony.Tones.service'
2--- debian/com.Nokia.Telephony.Tones.service 1970-01-01 00:00:00 +0000
3+++ debian/com.Nokia.Telephony.Tones.service 2017-01-17 13:22:34 +0000
4@@ -0,0 +1,3 @@
5+[D-BUS Service]
6+Name=com.Nokia.Telephony.Tones
7+Exec=/usr/lib/tone-generator/tone-generator.sh
8
9=== modified file 'debian/rules'
10--- debian/rules 2014-07-31 16:32:39 +0000
11+++ debian/rules 2017-01-17 13:22:34 +0000
12@@ -11,6 +11,12 @@
13 override_dh_install:
14 dh_install --fail-missing
15
16+override_dh_auto_install:
17+ mkdir -p debian/tmp/usr/lib/tone-generator
18+ cp debian/tone-generator.sh debian/tmp/usr/lib/tone-generator
19+ chmod a+x debian/tmp/usr/lib/tone-generator/tone-generator.sh
20+ dh_auto_install
21+
22 override_dh_strip:
23 dh_strip --dbg-package=tone-generator-dbg
24
25
26=== modified file 'debian/tone-generator.install'
27--- debian/tone-generator.install 2014-07-31 16:32:39 +0000
28+++ debian/tone-generator.install 2017-01-17 13:22:34 +0000
29@@ -1,2 +1,4 @@
30 usr/bin/tonegend
31+usr/lib/tone-generator/tone-generator.sh
32 debian/tone-generator.conf /usr/share/upstart/sessions
33+debian/com.Nokia.Telephony.Tones.service /usr/share/dbus-1/services
34
35=== added file 'debian/tone-generator.sh'
36--- debian/tone-generator.sh 1970-01-01 00:00:00 +0000
37+++ debian/tone-generator.sh 2017-01-17 13:22:34 +0000
38@@ -0,0 +1,9 @@
39+#!/bin/sh
40+
41+export DTMF_VOLUME=8
42+export TONE_STANDARD="cept"
43+export PULSE_PROP='media.role=alert'
44+export IND_PROPS='media.role=phone'
45+
46+tonegend -s $TONE_STANDARD -b 100 -r 20 --volume-dtmf $DTMF_VOLUME -I $IND_PROPS
47+

Subscribers

People subscribed via source and target branches

to all changes: