Merge lp:~renatofilho/dialer-app/ubuntu-app-platform into lp:dialer-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 564
Merged at revision: 564
Proposed branch: lp:~renatofilho/dialer-app/ubuntu-app-platform
Merge into: lp:dialer-app
Diff against target: 107 lines (+56/-18)
2 files modified
setup/gui/dialer-app.desktop (+1/-1)
snapcraft.yaml (+55/-17)
To merge this branch: bzr merge lp:~renatofilho/dialer-app/ubuntu-app-platform
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+312689@code.launchpad.net

Commit message

Make use of 'ubuntu-app-platform' snap interface.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:564
https://jenkins.canonical.com/system-apps/job/lp-dialer-app-ci/29/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2142
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/547
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2145
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1973/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1973/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1973/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1973/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1973/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1973/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1973/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1973/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1973
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1973/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-dialer-app-ci/29/rebuild

review: Approve (continuous-integration)
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup/gui/dialer-app.desktop'
2--- setup/gui/dialer-app.desktop 2016-10-11 18:49:19 +0000
3+++ setup/gui/dialer-app.desktop 2016-12-07 15:54:57 +0000
4@@ -233,7 +233,7 @@
5 Keywords[zh_TW]=Phone;Dialer;Dial;Call;Keypad;手機;通話;撥打;
6 Exec=dialer-app %u
7 Terminal=false
8-Icon=/snap/dialer-app/current/usr/share/dialer-app/assets/dialer-app.png
9+Icon=${SNAP}/usr/share/dialer-app/assets/dialer-app.png
10 MimeType=x-scheme-handler/contact;x-scheme-handler/call
11 X-Ubuntu-Touch=true
12 X-Ubuntu-StageHint=SideStage
13
14=== added directory 'snap'
15=== added directory 'snap/ubuntu-app-platform'
16=== modified file 'snapcraft.yaml'
17--- snapcraft.yaml 2016-11-30 15:14:37 +0000
18+++ snapcraft.yaml 2016-12-07 15:54:57 +0000
19@@ -8,7 +8,14 @@
20 apps:
21 dialer-app:
22 command: desktop-launch $SNAP/usr/bin/dialer-app --desktop_file_hint=unity8 "$@"
23- plugs: [unity7, opengl]
24+ plugs: [opengl, platform, unity7, unity8]
25+
26+plugs:
27+ platform:
28+ interface: content
29+ content: ubuntu-app-platform1
30+ target: ubuntu-app-platform
31+ default-provider: ubuntu-app-platform
32
33 parts:
34 dialer-app:
35@@ -25,25 +32,56 @@
36 - qtdeclarative5-dev-tools
37
38 stage-packages:
39- - qml-module-qt-labs-settings
40- - qml-module-qtsysteminfo
41- - qml-module-ofono
42- - qml-module-ubuntu-components
43- - qtdeclarative5-gsettings1.0
44 - qtdeclarative5-ubuntu-addressbook0.1
45- - qtdeclarative5-ubuntu-content1
46 - qtdeclarative5-ubuntu-history0.1
47 - qtdeclarative5-ubuntu-telephony0.1
48 - qtdeclarative5-ubuntu-telephony-phonenumber0.1
49- - qtdeclarative5-ubuntu-keyboard-extensions0.1
50- - qtdeclarative5-qtcontacts-plugin
51- - qtubuntu-desktop
52- - suru-icon-theme
53- - mir-graphics-drivers-desktop
54
55 snap:
56- - -usr/lib/python3
57- - -usr/share/doc
58- - -usr/include
59-
60- after: [desktop-qt5]
61+ # dialer-app
62+ - usr/share/applications/dialer-app*.desktop
63+ - usr/share/url-dispatcher/urls
64+ - usr/share/locale/*/LC_MESSAGES/dialer-app.mo
65+ - usr/share/dialer-app/*.qml
66+ - usr/share/dialer-app/LiveCallPage
67+ - usr/share/dialer-app/HistoryPage
68+ - usr/share/dialer-app/DialerPage
69+ - usr/share/dialer-app/ContactsPage
70+ - usr/share/dialer-app/ContactViewPage
71+ - usr/share/dialer-app/ContactEditorPage
72+ - usr/share/dialer-app/Dialogs
73+ - usr/share/dialer-app/assets
74+ - usr/share/dialer-app/MMI
75+ - usr/bin/*dialer-app*
76+
77+ # qtdeclarative5-ubuntu-addressbook0.1
78+ - usr/lib/*/qt5/qml/Ubuntu/Contacts.0.1/
79+ - usr/share/doc/qtdeclarative5-ubuntu-contacts0.1/copyright
80+ - usr/lib/*/qt5/qml/Ubuntu/AddressBook/
81+ - usr/share/doc/qtdeclarative5-ubuntu-addressbook0.1/copyright
82+
83+ # qtdeclarative5-ubuntu-history0.1
84+ - usr/share/doc/qtdeclarative5-ubuntu-history0.1/copyright
85+ - usr/lib/*/qt5/qml/Ubuntu/History/libhistory-qml.so
86+ - usr/lib/*/qt5/qml/Ubuntu/History/qmldir
87+ - usr/lib/*/libhistoryservice.so.*
88+ - usr/lib/*/libtelepathy-qt5.so.*
89+
90+ # qtdeclarative5-ubuntu-telephony0.1
91+ - usr/lib/*/qt5/qml/Ubuntu/Telephony/
92+ - usr/share/doc/qtdeclarative5-ubuntu-telephony0.1/copyright
93+
94+ # qtdeclarative5-ubuntu-telephony-phonenumber0.1
95+ - usr/share/doc/qtdeclarative5-ubuntu-telephony-phonenumber0.1/copyright
96+ - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberField.qml
97+ - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/libtelephonyservice-phonenumber-qml.so
98+ - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumber.js
99+ - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberInput.qml
100+ - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/qmldir
101+ - usr/lib/*/libphonenumber.so.7*
102+
103+ after: [desktop-ubuntu-app-platform]
104+
105+ environment:
106+ source: snap/
107+ plugin: dump

Subscribers

People subscribed via source and target branches