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
=== added file 'debian/com.Nokia.Telephony.Tones.service'
--- debian/com.Nokia.Telephony.Tones.service 1970-01-01 00:00:00 +0000
+++ debian/com.Nokia.Telephony.Tones.service 2017-01-17 13:22:34 +0000
@@ -0,0 +1,3 @@
1[D-BUS Service]
2Name=com.Nokia.Telephony.Tones
3Exec=/usr/lib/tone-generator/tone-generator.sh
04
=== modified file 'debian/rules'
--- debian/rules 2014-07-31 16:32:39 +0000
+++ debian/rules 2017-01-17 13:22:34 +0000
@@ -11,6 +11,12 @@
11override_dh_install:11override_dh_install:
12 dh_install --fail-missing12 dh_install --fail-missing
1313
14override_dh_auto_install:
15 mkdir -p debian/tmp/usr/lib/tone-generator
16 cp debian/tone-generator.sh debian/tmp/usr/lib/tone-generator
17 chmod a+x debian/tmp/usr/lib/tone-generator/tone-generator.sh
18 dh_auto_install
19
14override_dh_strip:20override_dh_strip:
15 dh_strip --dbg-package=tone-generator-dbg21 dh_strip --dbg-package=tone-generator-dbg
1622
1723
=== modified file 'debian/tone-generator.install'
--- debian/tone-generator.install 2014-07-31 16:32:39 +0000
+++ debian/tone-generator.install 2017-01-17 13:22:34 +0000
@@ -1,2 +1,4 @@
1usr/bin/tonegend1usr/bin/tonegend
2usr/lib/tone-generator/tone-generator.sh
2debian/tone-generator.conf /usr/share/upstart/sessions3debian/tone-generator.conf /usr/share/upstart/sessions
4debian/com.Nokia.Telephony.Tones.service /usr/share/dbus-1/services
35
=== added file 'debian/tone-generator.sh'
--- debian/tone-generator.sh 1970-01-01 00:00:00 +0000
+++ debian/tone-generator.sh 2017-01-17 13:22:34 +0000
@@ -0,0 +1,9 @@
1#!/bin/sh
2
3export DTMF_VOLUME=8
4export TONE_STANDARD="cept"
5export PULSE_PROP='media.role=alert'
6export IND_PROPS='media.role=phone'
7
8tonegend -s $TONE_STANDARD -b 100 -r 20 --volume-dtmf $DTMF_VOLUME -I $IND_PROPS
9

Subscribers

People subscribed via source and target branches

to all changes: