Merge lp:~renatofilho/messaging-app/shared-snappy into lp:messaging-app
- shared-snappy
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Roberto Mier Escandon |
Approved revision: | 610 |
Merged at revision: | 608 |
Proposed branch: | lp:~renatofilho/messaging-app/shared-snappy |
Merge into: | lp:messaging-app |
Prerequisite: | lp:~renatofilho/messaging-app/fix-snap-paths |
Diff against target: |
97 lines (+55/-22) 1 file modified
snapcraft.yaml (+55/-22) |
To merge this branch: | bzr merge lp:~renatofilho/messaging-app/shared-snappy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Approve | |
Roberto Mier Escandon (community) | Approve | ||
Review via email: mp+311598@code.launchpad.net |
Commit message
Use ubuntu-app-platform snap plugin.
Description of the change
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
- 607. By Renato Araujo Oliveira Filho
-
Added gsettings needed plug and qtdeclarative5-
gsettings1. 0 dependency
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:607
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:/
- 608. By Renato Araujo Oliveira Filho
-
Remove deps present on ubuntu-
app-platform.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:608
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:/
- 609. By Renato Araujo Oliveira Filho
-
List files to be snaped to avoid duplicate files with ubuntu-app-platform
- 610. By Renato Araujo Oliveira Filho
-
QtFeedback is already present on ubuntu-
app-platform.
Remove duplicated entry 'usr/lib/*/libtelepathy- qt5.so. *'
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:609
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:/
Roberto Mier Escandon (rmescandon) wrote : | # |
only 2.7Mb of size here when created the package. LveryGTM
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:610
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:/
Preview Diff
1 | === added directory 'snap' |
2 | === added directory 'snap/ubuntu-app-platform' |
3 | === modified file 'snapcraft.yaml' |
4 | --- snapcraft.yaml 2016-10-12 12:10:08 +0000 |
5 | +++ snapcraft.yaml 2016-11-24 12:58:17 +0000 |
6 | @@ -8,7 +8,14 @@ |
7 | apps: |
8 | messaging-app: |
9 | command: desktop-launch $SNAP/usr/bin/messaging-app --desktop_file_hint=unity8 "$@" |
10 | - plugs: [unity7, opengl] |
11 | + plugs: [unity7, opengl, platform, gsettings] |
12 | + |
13 | +plugs: |
14 | + platform: |
15 | + interface: content |
16 | + content: ubuntu-app-platform1 |
17 | + target: ubuntu-app-platform |
18 | + default-provider: ubuntu-app-platform |
19 | |
20 | parts: |
21 | messaging-app: |
22 | @@ -28,28 +35,54 @@ |
23 | - qtpim5-dev |
24 | |
25 | stage-packages: |
26 | - - libqt5multimedia5 |
27 | - - qml-module-qt-labs-folderlistmodel |
28 | - - qml-module-qt-labs-settings |
29 | - - qml-module-ubuntu-components |
30 | - - qml-module-qtmultimedia |
31 | - - qml-module-ofono |
32 | + - qtdeclarative5-ubuntu-addressbook0.1 |
33 | + - qtdeclarative5-ubuntu-history0.1 |
34 | - qtdeclarative5-ubuntu-telephony-phonenumber0.1 |
35 | - - qtdeclarative5-ubuntu-history0.1 |
36 | - qtdeclarative5-ubuntu-telephony0.1 |
37 | - - qtdeclarative5-qtcontacts-plugin |
38 | - - ttf-ancient-fonts-symbola |
39 | - - qtdeclarative5-gsettings1.0 |
40 | - - qtdeclarative5-ubuntu-addressbook0.1 |
41 | - - qtdeclarative5-ubuntu-content1 |
42 | - - qtdeclarative5-ubuntu-keyboard-extensions0.1 |
43 | - - qtubuntu-desktop |
44 | - - suru-icon-theme |
45 | - - mir-graphics-drivers-desktop |
46 | |
47 | snap: |
48 | - - -usr/lib/python3 |
49 | - - -usr/share/doc |
50 | - - -usr/include |
51 | - |
52 | - after: [desktop-qt5] |
53 | + # Messaging ap |
54 | + - usr/share/applications/messaging-app*.desktop |
55 | + - usr/share/url-dispatcher/urls |
56 | + - usr/share/content-hub/peers/messaging-app |
57 | + - usr/share/locale/*/LC_MESSAGES/messaging-app.mo |
58 | + - usr/share/messaging-app/*.qml |
59 | + - usr/share/messaging-app/*.js |
60 | + - usr/share/messaging-app/assets |
61 | + - usr/share/messaging-app/3rd_party |
62 | + - usr/share/messaging-app/MMS/*.qml |
63 | + - usr/share/messaging-app/Dialogs/*.qml |
64 | + - usr/share/messaging-app/Stickers/*.qml |
65 | + - usr/bin/*messaging-app* |
66 | + |
67 | + # Addressbook |
68 | + - usr/lib/*/qt5/qml/Ubuntu/Contacts.0.1/ |
69 | + - usr/share/doc/qtdeclarative5-ubuntu-contacts0.1/copyright |
70 | + - usr/lib/*/qt5/qml/Ubuntu/AddressBook/ |
71 | + - usr/share/doc/qtdeclarative5-ubuntu-addressbook0.1/copyright |
72 | + |
73 | + # History |
74 | + - usr/share/doc/qtdeclarative5-ubuntu-history0.1/copyright |
75 | + - usr/lib/*/qt5/qml/Ubuntu/History/libhistory-qml.so |
76 | + - usr/lib/*/qt5/qml/Ubuntu/History/qmldir |
77 | + - usr/lib/*/libhistoryservice.so.* |
78 | + - usr/lib/*/libtelepathy-qt5.so.* |
79 | + |
80 | + #PhoneNumber |
81 | + - usr/share/doc/qtdeclarative5-ubuntu-telephony-phonenumber0.1/copyright |
82 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberField.qml |
83 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/libtelephonyservice-phonenumber-qml.so |
84 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumber.js |
85 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberInput.qml |
86 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/qmldir |
87 | + - usr/lib/*/libphonenumber.so.7* |
88 | + |
89 | + #Telephony |
90 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/ |
91 | + - usr/share/doc/qtdeclarative5-ubuntu-telephony0.1/copyright |
92 | + |
93 | + after: [desktop-ubuntu-app-platform] |
94 | + |
95 | + environment: |
96 | + source: snap/ |
97 | + plugin: dump |
PASSED: Continuous integration, rev:606 /jenkins. canonical. com/system- apps/job/ lp-messaging- app-ci/ 158/ /jenkins. canonical. com/system- apps/job/ build/2043 /jenkins. canonical. com/system- apps/job/ test-0- autopkgtest/ label=phone- armhf,release= vivid+overlay, testname= default/ 497 /jenkins. canonical. com/system- apps/job/ build-0- fetch/2046 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1876/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1876/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1876/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1876 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1876/ 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-messaging- app-ci/ 158/rebuild
https:/