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
1
#!/bin/sh
6
2
if [ "$SNAP_ARCH" = "amd64" ]; then
7
3
  ARCH="x86_64-linux-gnu"
8
4
elif [ "$SNAP_ARCH" = "armhf" ]; then
9
5
  ARCH="arm-linux-gnueabihf"
10
6
else
11
7
  ARCH="$SNAP_ARCH-linux-gnu"
12
8
fi
13
9
14
10
export QTCHOOSER_NO_GLOBAL_DIR=1
15
11
export QT_SELECT=snappy-qt5
16
12
17
13
# Qt Libs
18
14
export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/qt5/libs:$LD_LIBRARY_PATH
19
15
20
16
# Qt Modules
21
17
export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins
22
18
export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/usr/lib/$ARCH/qt5/qml
23
19
export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/lib/$ARCH
24
20
25
21
# Necessary for the SDK to find the translations directory
26
22
export APP_DIR=$SNAP
27
23
28
24
cd $SNAP
29
25
exec $SNAP/usr/bin/address-book-app "$@" 
30
26
0
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
1
name: address-book-app
1
name: address-book-app
38
2
<<<<<<< TREE
39
2
version: 0.2+17.04.20161124.2-0ubuntu1
3
version: 0.2+17.04.20161124.2-0ubuntu1
40
4
=======
41
5
version: 0.2.17
42
6
>>>>>>> MERGE-SOURCE
43
3
summary: Address Book app
7
summary: Address Book app
44
4
description: Address Book app
8
description: Address Book app
45
5
confinement: devmode  # use "strict" to enforce system access only via declared interfaces
9
confinement: devmode  # use "strict" to enforce system access only via declared interfaces
46
@@ -7,8 +11,15 @@
47
7
11
48
8
apps:
12
apps:
49
9
    address-book-app:
13
    address-book-app:
52
10
        command: desktop-launch $SNAP/bin/address-book-app --desktop_file_hint=unity8 "$@"
14
        command: desktop-launch $SNAP/usr/bin/address-book-app --desktop_file_hint=unity8 "$@"
53
11
        plugs: [gsettings, unity7, opengl] # FIXME: add  'address-book' interface after it get merged on snapd
15
        plugs: [gsettings, unity7, unity8, opengl, platform] # FIXME: add  'address-book' interface after it get merged on snapd
54
16
55
17
plugs:
56
18
    platform:
57
19
        interface: content
58
20
        content: ubuntu-app-platform1
59
21
        target: ubuntu-app-platform
60
22
        default-provider: ubuntu-app-platform
61
12
23
62
13
parts:
24
parts:
63
14
    address-book-app:
25
    address-book-app:
64
@@ -23,42 +34,81 @@
65
23
            - qtdeclarative5-dev
34
            - qtdeclarative5-dev
66
24
            - qtpim5-dev
35
            - qtpim5-dev
67
25
            - libqofono-dev
36
            - libqofono-dev
68
37
69
26
        stage-packages:
38
        stage-packages:
80
27
            - accountsservice
39
            # FIXME: bug #1643660
71
28
            - accountsservice-ubuntu-schemas
72
29
            - account-plugin-google
73
30
            - qmlscene
74
31
            - qml-module-qt-labs-settings
75
32
            - qml-module-ubuntu-components
76
33
            - qml-module-ubuntu-onlineaccounts
77
34
            - qtcontact5-galera
78
35
            - qtdeclarative5-ubuntu-content1
79
36
            - qtdeclarative5-ubuntu-syncmonitor0.1
81
37
            - qtdeclarative5-buteo-syncfw0.1
40
            - qtdeclarative5-buteo-syncfw0.1
82
38
            - qtdeclarative5-gsettings1.0
41
            - qtdeclarative5-gsettings1.0
83
39
            - qtdeclarative5-qtcontacts-plugin
84
40
            - qtdeclarative5-qtquick2-plugin
85
41
            - qtdeclarative5-ofono0.2
42
            - qtdeclarative5-ofono0.2
86
42
            - qtdeclarative5-ubuntu-history0.1
43
            - qtdeclarative5-ubuntu-history0.1
87
43
            - qtdeclarative5-ubuntu-keyboard-extensions0.1
44
            - qtdeclarative5-ubuntu-keyboard-extensions0.1
88
44
            - qtdeclarative5-ubuntu-telephony-phonenumber0.1
45
            - qtdeclarative5-ubuntu-telephony-phonenumber0.1
98
45
            - qtdeclarative5-ubuntu-ui-toolkit-plugin
46
            # FIXME: bug #1643659
99
46
            - qtubuntu-desktop
47
            - qtdeclarative5-qtcontacts-plugin
100
47
            - suru-icon-theme
48
92
48
            - mir-graphics-drivers-desktop
93
49
            # FIXME: This is necessary for now, to detect mouse and keyboard
94
50
            - unity8-private
95
51
        stage:
96
52
            - -usr/share/pkgconfig/xkeyboard-config.pc
97
53
            - -usr/share/pkgconfig/shared-mime-info.pc
101
54
        snap:
49
        snap:
106
55
            - -usr/lib/python3
50
            #Buteo
107
56
            - -usr/share/doc
51
            - usr/share/doc/qtdeclarative5-buteo-syncfw0.1/copyright
108
57
            - -usr/include           
52
            - usr/lib/*/qt5/qml/Buteo/libbuteo-syncfw-qml.so
109
58
        after: [desktop-gtk3]
53
            - usr/lib/*/qt5/qml/Buteo/qmldir
110
54
111
55
            #Gsettings
112
56
            - usr/share/doc/qtdeclarative5-gsettings1.0/copyright
113
57
            - usr/lib/*/qt5/qml/GSettings.1.0/plugins.qmltypes
114
58
            - usr/lib/*/qt5/qml/GSettings.1.0/libGSettingsQmlPlugin.so
115
59
            - usr/lib/*/qt5/qml/GSettings.1.0/qmldir
116
60
            - usr/lib/*/libgsettings-qt.so.*
117
61
118
62
            #Ofono
119
63
            - usr/share/doc/qtdeclarative5-ofono0.2/copyright
120
64
            - usr/lib/*/qt5/qml/MeeGo/QOfono/qmldir
121
65
            - usr/lib/*/qt5/qml/MeeGo/QOfono/libQOfonoQtDeclarative.so
122
66
            - usr/lib/*/libqofono-qt5.so.*
123
67
124
68
            #History
125
69
            - usr/share/doc/qtdeclarative5-ubuntu-history0.1/copyright
126
70
            - usr/lib/*/qt5/qml/Ubuntu/History/libhistory-qml.so
127
71
            - usr/lib/*/qt5/qml/Ubuntu/History/qmldir
128
72
            - usr/lib/*/libhistoryservice.so.*
129
73
            - usr/lib/*/libtelepathy-qt5.so.*
130
74
131
75
            #Keyboard
132
76
            - usr/share/doc/qtdeclarative5-ubuntu-keyboard-extensions0.1/copyright
133
77
            - usr/lib/*/qt5/qml/Ubuntu/Keyboard/libubuntu-keyboard-qml.so
134
78
            - usr/lib/*/qt5/qml/Ubuntu/Keyboard/qmldir  
135
79
136
80
            #PhoneNumber
137
81
            - usr/share/doc/qtdeclarative5-ubuntu-telephony-phonenumber0.1/copyright
138
82
            - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberField.qml
139
83
            - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/libtelephonyservice-phonenumber-qml.so
140
84
            - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumber.js
141
85
            - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/PhoneNumberInput.qml
142
86
            - usr/lib/*/qt5/qml/Ubuntu/Telephony/PhoneNumber/qmldir
143
87
            - usr/lib/*/libphonenumber.so.7*
144
88
145
89
            #Address-book-app
146
90
            - usr/lib/*/qt5/qml/Ubuntu/AddressBook/Base
147
91
            - usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactView
148
92
            - usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactEditor
149
93
            - usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactShare
150
94
            - usr/lib/*/qt5/qml/Ubuntu/Contacts*
151
95
            - usr/bin/address-book-app
152
96
            - usr/share/address-book-app/artwork
153
97
            - usr/share/address-book-app/imports
154
98
            - usr/share/applications/address-book-app.desktop
155
99
            - usr/share/url-dispatcher/urls/
156
100
            - usr/share/content-hub/peers/address-book-app
157
101
            - usr/share/locale/*/LC_MESSAGES/address-book-app.mo
158
102
159
103
            #QtContacts
160
104
            - usr/lib/*/qt5/qml/QtContacts/libdeclarative_contacts.so
161
105
            - usr/lib/*/qt5/qml/QtContacts/plugins.qmltypes
162
106
            - usr/lib/*/qt5/qml/QtContacts/qmldir
163
107
164
108
165
109
        after: 
166
110
            - desktop-ubuntu-app-platform
167
59
111
168
60
    environment:
112
    environment:
169
61
        plugin: dump
113
        plugin: dump
173
62
        source: .
114
        source: snap        
171
63
        organize:
172
64
            address-book-app.wrapper: bin/address-book-app
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:	Link a bug report
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-11-30
Ubuntu Phablet Team		2016-11-20	Pending
Review via email: mp+311351@code.launchpad.net