Merge lp:~renatofilho/address-book-app/ubuntu-app-platform into lp:address-book-app
- ubuntu-app-platform
- Merge into trunk
Status: | Merged |
---|---|
Merged at revision: | 661 |
Proposed branch: | lp:~renatofilho/address-book-app/ubuntu-app-platform |
Merge into: | lp:address-book-app |
Prerequisite: | lp:~renatofilho/address-book-app/qsysteminfo-snap |
Diff against target: |
173 lines (+80/-55) (has conflicts) 2 files modified
address-book-app.wrapper (+0/-25) snapcraft.yaml (+80/-30) Text conflict in snapcraft.yaml |
To merge this branch: | bzr merge lp:~renatofilho/address-book-app/ubuntu-app-platform |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+311351@code.launchpad.net |
Commit message
Uses shared library from 'ubuntu-
Description of the change
- 652. By Renato Araujo Oliveira Filho
-
It is not necessary remove *.pc files anymore, since we are not installing it on stage.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:652
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:/
- 653. By Renato Araujo Oliveira Filho
-
Pack only the necessary files.
Ignore files that is already present on ubuntu-app-platform plugin.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:653
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:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 654. By Renato Araujo Oliveira Filho
-
Export the new paths for "QML2_IMPORT_PATH"
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:654
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:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 655. By Renato Araujo Oliveira Filho
-
Added missing package 'qtdeclarative5
-qtcontacts- plugin' - 656. By Renato Araujo Oliveira Filho
-
Add missing gsettings library.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:655
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:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 657. By Renato Araujo Oliveira Filho
-
Missing telepathy library.
- 658. By Renato Araujo Oliveira Filho
-
We do not need wrapper.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:656
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:/
FAILURE: 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 : | # |
FAILED: Continuous integration, rev:658
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: 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:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:658
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:/
- 659. By Renato Araujo Oliveira Filho
-
Parent merged.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:659
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:/
- 660. By Renato Araujo Oliveira Filho
-
Sync snap version with changelog 0.2.17
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:660
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:/
- 661. By Renato Araujo Oliveira Filho
-
Added 'unity8' sanp interface on the plug list.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:661
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === removed file 'address-book-app.wrapper' |
2 | --- address-book-app.wrapper 2016-11-17 11:54:15 +0000 |
3 | +++ address-book-app.wrapper 1970-01-01 00:00:00 +0000 |
4 | @@ -1,25 +0,0 @@ |
5 | -#!/bin/sh |
6 | -if [ "$SNAP_ARCH" = "amd64" ]; then |
7 | - ARCH="x86_64-linux-gnu" |
8 | -elif [ "$SNAP_ARCH" = "armhf" ]; then |
9 | - ARCH="arm-linux-gnueabihf" |
10 | -else |
11 | - ARCH="$SNAP_ARCH-linux-gnu" |
12 | -fi |
13 | - |
14 | -export QTCHOOSER_NO_GLOBAL_DIR=1 |
15 | -export QT_SELECT=snappy-qt5 |
16 | - |
17 | -# Qt Libs |
18 | -export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/qt5/libs:$LD_LIBRARY_PATH |
19 | - |
20 | -# Qt Modules |
21 | -export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins |
22 | -export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/usr/lib/$ARCH/qt5/qml |
23 | -export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/lib/$ARCH |
24 | - |
25 | -# Necessary for the SDK to find the translations directory |
26 | -export APP_DIR=$SNAP |
27 | - |
28 | -cd $SNAP |
29 | -exec $SNAP/usr/bin/address-book-app "$@" |
30 | |
31 | === added directory 'snap' |
32 | === added directory 'snap/ubuntu-app-platform' |
33 | === modified file 'snapcraft.yaml' |
34 | --- snapcraft.yaml 2016-11-24 18:54:55 +0000 |
35 | +++ snapcraft.yaml 2016-11-30 15:35:31 +0000 |
36 | @@ -1,5 +1,9 @@ |
37 | name: address-book-app |
38 | +<<<<<<< TREE |
39 | version: 0.2+17.04.20161124.2-0ubuntu1 |
40 | +======= |
41 | +version: 0.2.17 |
42 | +>>>>>>> MERGE-SOURCE |
43 | summary: Address Book app |
44 | description: Address Book app |
45 | confinement: devmode # use "strict" to enforce system access only via declared interfaces |
46 | @@ -7,8 +11,15 @@ |
47 | |
48 | apps: |
49 | address-book-app: |
50 | - command: desktop-launch $SNAP/bin/address-book-app --desktop_file_hint=unity8 "$@" |
51 | - plugs: [gsettings, unity7, opengl] # FIXME: add 'address-book' interface after it get merged on snapd |
52 | + command: desktop-launch $SNAP/usr/bin/address-book-app --desktop_file_hint=unity8 "$@" |
53 | + plugs: [gsettings, unity7, unity8, opengl, platform] # FIXME: add 'address-book' interface after it get merged on snapd |
54 | + |
55 | +plugs: |
56 | + platform: |
57 | + interface: content |
58 | + content: ubuntu-app-platform1 |
59 | + target: ubuntu-app-platform |
60 | + default-provider: ubuntu-app-platform |
61 | |
62 | parts: |
63 | address-book-app: |
64 | @@ -23,42 +34,81 @@ |
65 | - qtdeclarative5-dev |
66 | - qtpim5-dev |
67 | - libqofono-dev |
68 | + |
69 | stage-packages: |
70 | - - accountsservice |
71 | - - accountsservice-ubuntu-schemas |
72 | - - account-plugin-google |
73 | - - qmlscene |
74 | - - qml-module-qt-labs-settings |
75 | - - qml-module-ubuntu-components |
76 | - - qml-module-ubuntu-onlineaccounts |
77 | - - qtcontact5-galera |
78 | - - qtdeclarative5-ubuntu-content1 |
79 | - - qtdeclarative5-ubuntu-syncmonitor0.1 |
80 | + # FIXME: bug #1643660 |
81 | - qtdeclarative5-buteo-syncfw0.1 |
82 | - qtdeclarative5-gsettings1.0 |
83 | - - qtdeclarative5-qtcontacts-plugin |
84 | - - qtdeclarative5-qtquick2-plugin |
85 | - qtdeclarative5-ofono0.2 |
86 | - qtdeclarative5-ubuntu-history0.1 |
87 | - qtdeclarative5-ubuntu-keyboard-extensions0.1 |
88 | - qtdeclarative5-ubuntu-telephony-phonenumber0.1 |
89 | - - qtdeclarative5-ubuntu-ui-toolkit-plugin |
90 | - - qtubuntu-desktop |
91 | - - suru-icon-theme |
92 | - - mir-graphics-drivers-desktop |
93 | - # FIXME: This is necessary for now, to detect mouse and keyboard |
94 | - - unity8-private |
95 | - stage: |
96 | - - -usr/share/pkgconfig/xkeyboard-config.pc |
97 | - - -usr/share/pkgconfig/shared-mime-info.pc |
98 | + # FIXME: bug #1643659 |
99 | + - qtdeclarative5-qtcontacts-plugin |
100 | + |
101 | snap: |
102 | - - -usr/lib/python3 |
103 | - - -usr/share/doc |
104 | - - -usr/include |
105 | - after: [desktop-gtk3] |
106 | + #Buteo |
107 | + - usr/share/doc/qtdeclarative5-buteo-syncfw0.1/copyright |
108 | + - usr/lib/*/qt5/qml/Buteo/libbuteo-syncfw-qml.so |
109 | + - usr/lib/*/qt5/qml/Buteo/qmldir |
110 | + |
111 | + #Gsettings |
112 | + - usr/share/doc/qtdeclarative5-gsettings1.0/copyright |
113 | + - usr/lib/*/qt5/qml/GSettings.1.0/plugins.qmltypes |
114 | + - usr/lib/*/qt5/qml/GSettings.1.0/libGSettingsQmlPlugin.so |
115 | + - usr/lib/*/qt5/qml/GSettings.1.0/qmldir |
116 | + - usr/lib/*/libgsettings-qt.so.* |
117 | + |
118 | + #Ofono |
119 | + - usr/share/doc/qtdeclarative5-ofono0.2/copyright |
120 | + - usr/lib/*/qt5/qml/MeeGo/QOfono/qmldir |
121 | + - usr/lib/*/qt5/qml/MeeGo/QOfono/libQOfonoQtDeclarative.so |
122 | + - usr/lib/*/libqofono-qt5.so.* |
123 | + |
124 | + #History |
125 | + - usr/share/doc/qtdeclarative5-ubuntu-history0.1/copyright |
126 | + - usr/lib/*/qt5/qml/Ubuntu/History/libhistory-qml.so |
127 | + - usr/lib/*/qt5/qml/Ubuntu/History/qmldir |
128 | + - usr/lib/*/libhistoryservice.so.* |
129 | + - usr/lib/*/libtelepathy-qt5.so.* |
130 | + |
131 | + #Keyboard |
132 | + - usr/share/doc/qtdeclarative5-ubuntu-keyboard-extensions0.1/copyright |
133 | + - usr/lib/*/qt5/qml/Ubuntu/Keyboard/libubuntu-keyboard-qml.so |
134 | + - usr/lib/*/qt5/qml/Ubuntu/Keyboard/qmldir |
135 | + |
136 | + #PhoneNumber |
137 | + - usr/share/doc/qtdeclarative5-ubuntu-telephony-phonenumber0.1/copyright |
138 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberField.qml |
139 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/libtelephonyservice-phonenumber-qml.so |
140 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumber.js |
141 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberInput.qml |
142 | + - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/qmldir |
143 | + - usr/lib/*/libphonenumber.so.7* |
144 | + |
145 | + #Address-book-app |
146 | + - usr/lib/*/qt5/qml/Ubuntu/AddressBook/Base |
147 | + - usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactView |
148 | + - usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactEditor |
149 | + - usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactShare |
150 | + - usr/lib/*/qt5/qml/Ubuntu/Contacts* |
151 | + - usr/bin/address-book-app |
152 | + - usr/share/address-book-app/artwork |
153 | + - usr/share/address-book-app/imports |
154 | + - usr/share/applications/address-book-app.desktop |
155 | + - usr/share/url-dispatcher/urls/ |
156 | + - usr/share/content-hub/peers/address-book-app |
157 | + - usr/share/locale/*/LC_MESSAGES/address-book-app.mo |
158 | + |
159 | + #QtContacts |
160 | + - usr/lib/*/qt5/qml/QtContacts/libdeclarative_contacts.so |
161 | + - usr/lib/*/qt5/qml/QtContacts/plugins.qmltypes |
162 | + - usr/lib/*/qt5/qml/QtContacts/qmldir |
163 | + |
164 | + |
165 | + after: |
166 | + - desktop-ubuntu-app-platform |
167 | |
168 | environment: |
169 | plugin: dump |
170 | - source: . |
171 | - organize: |
172 | - address-book-app.wrapper: bin/address-book-app |
173 | + source: snap |
FAILED: Continuous integration, rev:651 /jenkins. canonical. com/system- apps/job/ lp-address- book-app- ci/32/ /jenkins. canonical. com/system- apps/job/ build/2017/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/2020 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1850 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1850/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1850 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1850/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1850 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1850/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1850 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1850/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1850/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1850 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1850/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1850 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1850/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1850 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1850/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1850 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1850/ artifact/ output/ *zip*/output. zip
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: /jenkins. canonical. com/system- apps/job/ lp-address- book-app- ci/32/rebuild
https:/