Merge lp:~renatofilho/dialer-app/im-service into lp:dialer-app/staging
- im-service
- Merge into staging
Status: | Merged |
---|---|
Approved by: | Gustavo Pichorim Boiko |
Approved revision: | 561 |
Merged at revision: | 557 |
Proposed branch: | lp:~renatofilho/dialer-app/im-service |
Merge into: | lp:dialer-app/staging |
Prerequisite: | lp:~phablet-team/dialer-app/voip_support |
Diff against target: |
44 lines (+16/-0) 4 files modified
CMakeLists.txt (+1/-0) accounts/CMakeLists.txt (+2/-0) accounts/dialer-app.application (+12/-0) debian/dialer-app.install (+1/-0) |
To merge this branch: | bzr merge lp:~renatofilho/dialer-app/im-service |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gustavo Pichorim Boiko (community) | Approve | ||
system-apps-ci-bot | continuous-integration | Pending | |
Review via email: mp+320667@code.launchpad.net |
This proposal supersedes a proposal from 2016-12-19.
Commit message
Install 'IM' account application file.
Make sure that dialer-app appear on the application list for 'IM' services.
Description of the change
Install 'IM' account application file.
Make sure that dialer-app appear on the application list for 'IM' services.
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal | # |
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:557
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:558
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:559
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:560
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:561
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Gustavo Pichorim Boiko (boiko) wrote : Posted in a previous version of this proposal | # |
Looks good!
Gustavo Pichorim Boiko (boiko) wrote : | # |
Looks good!
Preview Diff
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2014-08-15 09:08:45 +0000 |
3 | +++ CMakeLists.txt 2017-03-22 16:17:24 +0000 |
4 | @@ -73,4 +73,5 @@ |
5 | |
6 | add_subdirectory(po) |
7 | add_subdirectory(src) |
8 | +add_subdirectory(accounts) |
9 | add_subdirectory(tests) |
10 | |
11 | === added directory 'accounts' |
12 | === added file 'accounts/CMakeLists.txt' |
13 | --- accounts/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
14 | +++ accounts/CMakeLists.txt 2017-03-22 16:17:24 +0000 |
15 | @@ -0,0 +1,2 @@ |
16 | +file(GLOB APPLICATION_FILES *.application) |
17 | +install(FILES ${APPLICATION_FILES} DESTINATION share/accounts/applications/) |
18 | |
19 | === added file 'accounts/dialer-app.application' |
20 | --- accounts/dialer-app.application 1970-01-01 00:00:00 +0000 |
21 | +++ accounts/dialer-app.application 2017-03-22 16:17:24 +0000 |
22 | @@ -0,0 +1,12 @@ |
23 | +<?xml version="1.0" encoding="UTF-8"?> |
24 | +<application id="dialer-app"> |
25 | + <description>Dialer</description> |
26 | + <desktop-entry>dialer-app.desktop</desktop-entry> |
27 | + <translations>dialer</translations> |
28 | + |
29 | + <services> |
30 | + <service id="telephony-sip-im"> |
31 | + <description>Allow SIP calls from dialer app</description> |
32 | + </service> |
33 | + </services> |
34 | +</application> |
35 | |
36 | === modified file 'debian/dialer-app.install' |
37 | --- debian/dialer-app.install 2015-04-30 18:10:29 +0000 |
38 | +++ debian/dialer-app.install 2017-03-22 16:17:24 +0000 |
39 | @@ -11,4 +11,5 @@ |
40 | usr/share/dialer-app/Dialogs |
41 | usr/share/dialer-app/assets |
42 | usr/share/dialer-app/MMI |
43 | +usr/share/accounts/applications/* |
44 | usr/bin/*dialer-app* |
PASSED: Continuous integration, rev:556 /jenkins. canonical. com/system- apps/job/ lp-dialer- app-ci/ 30/ /jenkins. canonical. com/system- apps/job/ build/2209 /jenkins. canonical. com/system- apps/job/ test-0- autopkgtest/ label=phone- armhf,release= vivid+overlay, testname= default/ 572 /jenkins. canonical. com/system- apps/job/ build-0- fetch/2212 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2037/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2037/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/2037/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2037/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2037/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/2037/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2037/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2037/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/2037 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/2037/ artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-dialer- app-ci/ 30/rebuild
https:/