Merge lp:~popey/memories-touch/add-packaging into lp:~sebastijan-kuzner/memories-touch/trunk
- add-packaging
- Merge into trunk
Proposed by
Alan Pope πΊπ§π± π¦
Status: | Approved |
---|---|
Approved by: | mr.incomplete |
Approved revision: | 2 |
Proposed branch: | lp:~popey/memories-touch/add-packaging |
Merge into: | lp:~sebastijan-kuzner/memories-touch/trunk |
Diff against target: |
497 lines (+372/-9) 17 files modified
debian/changelog (+5/-0) debian/compat (+1/-0) debian/control (+14/-0) debian/copyright (+29/-0) debian/files (+1/-0) debian/install (+26/-0) debian/memories-touch.debhelper.log (+45/-0) debian/memories-touch.substvars (+1/-0) debian/memories-touch/DEBIAN/control (+10/-0) debian/memories-touch/DEBIAN/md5sums (+44/-0) debian/memories-touch/usr/share/applications/memories.desktop (+9/-0) debian/memories-touch/usr/share/doc/memories-touch/copyright (+29/-0) debian/rules (+13/-0) debian/source/format (+1/-0) memories.desktop (+7/-5) memories.qmlproject.user (+74/-4) memories.qmlproject.user.b8a2a5b (+63/-0) |
To merge this branch: | bzr merge lp:~popey/memories-touch/add-packaging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
mr.incomplete | Pending | ||
Review via email: mp+160299@code.launchpad.net |
Commit message
Description of the change
Attempt at adding packaging to memories, so we can get it in the collections ppa.
To post a comment you must log in.
Unmerged revisions
- 2. By Alan Pope πΊπ§π± π¦
-
first attempt at packaging
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'debian' | |||
2 | === added file 'debian/changelog' | |||
3 | --- debian/changelog 1970-01-01 00:00:00 +0000 | |||
4 | +++ debian/changelog 2013-04-23 08:48:28 +0000 | |||
5 | @@ -0,0 +1,5 @@ | |||
6 | 1 | memories-touch (0.1) raring; urgency=low | ||
7 | 2 | |||
8 | 3 | * Initial Release. | ||
9 | 4 | |||
10 | 5 | -- Alan Pope <alan.pope@canonical.com> Tue, 23 Apr 2013 09:17:59 +0100 | ||
11 | 0 | 6 | ||
12 | === added file 'debian/compat' | |||
13 | --- debian/compat 1970-01-01 00:00:00 +0000 | |||
14 | +++ debian/compat 2013-04-23 08:48:28 +0000 | |||
15 | @@ -0,0 +1,1 @@ | |||
16 | 1 | 8 | ||
17 | 0 | 2 | ||
18 | === added file 'debian/control' | |||
19 | --- debian/control 1970-01-01 00:00:00 +0000 | |||
20 | +++ debian/control 2013-04-23 08:48:28 +0000 | |||
21 | @@ -0,0 +1,14 @@ | |||
22 | 1 | Source: memories-touch | ||
23 | 2 | Section: games | ||
24 | 3 | Priority: extra | ||
25 | 4 | Maintainer: Alan Pope <alan.pope@canonical.com> | ||
26 | 5 | Build-Depends: debhelper (>= 8.0.0) | ||
27 | 6 | Standards-Version: 3.9.4 | ||
28 | 7 | Vcs-Bzr: https://code.launchpad.net/~sebastijan-kuzner/memories-touch/trunk | ||
29 | 8 | |||
30 | 9 | Package: memories-touch | ||
31 | 10 | Architecture: all | ||
32 | 11 | Depends:${misc:Depends},qtdeclarative5-localstorage-plugin,qtdeclarative5-particles-plugin,qtdeclarative5-qtquick2-plugin,qtdeclarative5-ubuntu-ui-toolkit-plugin|qt-components-ubuntu,qtdeclarative5-window-plugin,qtdeclarative5-xmllistmodel-plugin,${shlibs:Depends},qmlscene | ||
33 | 12 | Description: Simple pairs memory game | ||
34 | 13 | Match pairs of icons by tapping on them. | ||
35 | 14 | |||
36 | 0 | 15 | ||
37 | === added file 'debian/copyright' | |||
38 | --- debian/copyright 1970-01-01 00:00:00 +0000 | |||
39 | +++ debian/copyright 2013-04-23 08:48:28 +0000 | |||
40 | @@ -0,0 +1,29 @@ | |||
41 | 1 | Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | ||
42 | 2 | Upstream-Name: memories-touch | ||
43 | 3 | Source: https://code.launchpad.net/~sebastijan-kuzner/memories-touch/trunk | ||
44 | 4 | |||
45 | 5 | Files: * | ||
46 | 6 | Copyright: 2013 Sebastijan Kuzner <sebastijan.kuzner@gmail.com> | ||
47 | 7 | License: GPL-3.0+ | ||
48 | 8 | |||
49 | 9 | Files: debian/* | ||
50 | 10 | Copyright: 2013 Alan Pope <alan.pope@canonical.com> | ||
51 | 11 | License: GPL-3.0+ | ||
52 | 12 | |||
53 | 13 | License: GPL-3.0+ | ||
54 | 14 | This program is free software: you can redistribute it and/or modify | ||
55 | 15 | it under the terms of the GNU General Public License as published by | ||
56 | 16 | the Free Software Foundation, either version 3 of the License, or | ||
57 | 17 | (at your option) any later version. | ||
58 | 18 | . | ||
59 | 19 | This package is distributed in the hope that it will be useful, | ||
60 | 20 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
61 | 21 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
62 | 22 | GNU General Public License for more details. | ||
63 | 23 | . | ||
64 | 24 | You should have received a copy of the GNU General Public License | ||
65 | 25 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
66 | 26 | . | ||
67 | 27 | On Debian systems, the complete text of the GNU General | ||
68 | 28 | Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". | ||
69 | 29 | |||
70 | 0 | 30 | ||
71 | === added file 'debian/files' | |||
72 | --- debian/files 1970-01-01 00:00:00 +0000 | |||
73 | +++ debian/files 2013-04-23 08:48:28 +0000 | |||
74 | @@ -0,0 +1,1 @@ | |||
75 | 1 | memories-touch_0.1_all.deb games extra | ||
76 | 0 | 2 | ||
77 | === added file 'debian/install' | |||
78 | --- debian/install 1970-01-01 00:00:00 +0000 | |||
79 | +++ debian/install 2013-04-23 08:48:28 +0000 | |||
80 | @@ -0,0 +1,26 @@ | |||
81 | 1 | Surface.qml /usr/share/memories-touch | ||
82 | 2 | memories.qml /usr/share/memories-touch | ||
83 | 3 | gamelogic.js /usr/share/memories-touch | ||
84 | 4 | Images /usr/share/memories-touch | ||
85 | 5 | Images/16.svg /usr/share/memories-touch | ||
86 | 6 | Images/2.png /usr/share/memories-touch | ||
87 | 7 | Images/17.png /usr/share/memories-touch | ||
88 | 8 | Images/14.png /usr/share/memories-touch | ||
89 | 9 | Images/9.png /usr/share/memories-touch | ||
90 | 10 | Images/3.png /usr/share/memories-touch | ||
91 | 11 | Images/11.png /usr/share/memories-touch | ||
92 | 12 | Images/8.png /usr/share/memories-touch | ||
93 | 13 | Images/7.png /usr/share/memories-touch | ||
94 | 14 | Images/12.png /usr/share/memories-touch | ||
95 | 15 | Images/4.png /usr/share/memories-touch | ||
96 | 16 | Images/5.png /usr/share/memories-touch | ||
97 | 17 | Images/6.png /usr/share/memories-touch | ||
98 | 18 | Images/10.png /usr/share/memories-touch | ||
99 | 19 | Images/1.png /usr/share/memories-touch | ||
100 | 20 | Images/13.png /usr/share/memories-touch | ||
101 | 21 | Images/15.png /usr/share/memories-touch | ||
102 | 22 | avatar@8.png /usr/share/memories-touch | ||
103 | 23 | Card.qml /usr/share/memories-touch | ||
104 | 24 | CurrentScore.qml /usr/share/memories-touch | ||
105 | 25 | Result.qml /usr/share/memories-touch | ||
106 | 26 | memories.desktop /usr/share/applications | ||
107 | 0 | 27 | ||
108 | === added directory 'debian/memories-touch' | |||
109 | === added file 'debian/memories-touch.debhelper.log' | |||
110 | --- debian/memories-touch.debhelper.log 1970-01-01 00:00:00 +0000 | |||
111 | +++ debian/memories-touch.debhelper.log 2013-04-23 08:48:28 +0000 | |||
112 | @@ -0,0 +1,45 @@ | |||
113 | 1 | dh_auto_configure | ||
114 | 2 | dh_auto_build | ||
115 | 3 | dh_auto_test | ||
116 | 4 | dh_prep | ||
117 | 5 | dh_installdirs | ||
118 | 6 | dh_auto_install | ||
119 | 7 | dh_install | ||
120 | 8 | dh_installdocs | ||
121 | 9 | dh_installchangelogs | ||
122 | 10 | dh_installexamples | ||
123 | 11 | dh_installman | ||
124 | 12 | dh_installcatalogs | ||
125 | 13 | dh_installcron | ||
126 | 14 | dh_installdebconf | ||
127 | 15 | dh_installemacsen | ||
128 | 16 | dh_installifupdown | ||
129 | 17 | dh_installinfo | ||
130 | 18 | dh_pysupport | ||
131 | 19 | dh_installinit | ||
132 | 20 | dh_installmenu | ||
133 | 21 | dh_installmime | ||
134 | 22 | dh_installmodules | ||
135 | 23 | dh_installlogcheck | ||
136 | 24 | dh_installlogrotate | ||
137 | 25 | dh_installpam | ||
138 | 26 | dh_installppp | ||
139 | 27 | dh_installudev | ||
140 | 28 | dh_installwm | ||
141 | 29 | dh_installxfonts | ||
142 | 30 | dh_installgsettings | ||
143 | 31 | dh_bugfiles | ||
144 | 32 | dh_ucf | ||
145 | 33 | dh_lintian | ||
146 | 34 | dh_gconf | ||
147 | 35 | dh_icons | ||
148 | 36 | dh_perl | ||
149 | 37 | dh_usrlocal | ||
150 | 38 | dh_link | ||
151 | 39 | dh_compress | ||
152 | 40 | dh_fixperms | ||
153 | 41 | dh_installdeb | ||
154 | 42 | dh_gencontrol | ||
155 | 43 | dh_md5sums | ||
156 | 44 | dh_builddeb | ||
157 | 45 | dh_builddeb | ||
158 | 0 | 46 | ||
159 | === added file 'debian/memories-touch.substvars' | |||
160 | --- debian/memories-touch.substvars 1970-01-01 00:00:00 +0000 | |||
161 | +++ debian/memories-touch.substvars 2013-04-23 08:48:28 +0000 | |||
162 | @@ -0,0 +1,1 @@ | |||
163 | 1 | misc:Depends= | ||
164 | 0 | 2 | ||
165 | === added directory 'debian/memories-touch/DEBIAN' | |||
166 | === added file 'debian/memories-touch/DEBIAN/control' | |||
167 | --- debian/memories-touch/DEBIAN/control 1970-01-01 00:00:00 +0000 | |||
168 | +++ debian/memories-touch/DEBIAN/control 2013-04-23 08:48:28 +0000 | |||
169 | @@ -0,0 +1,10 @@ | |||
170 | 1 | Package: memories-touch | ||
171 | 2 | Version: 0.1 | ||
172 | 3 | Architecture: all | ||
173 | 4 | Maintainer: Alan Pope <alan.pope@canonical.com> | ||
174 | 5 | Installed-Size: 203 | ||
175 | 6 | Depends: qtdeclarative5-localstorage-plugin, qtdeclarative5-particles-plugin, qtdeclarative5-qtquick2-plugin, qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu, qtdeclarative5-window-plugin, qtdeclarative5-xmllistmodel-plugin, qmlscene | ||
176 | 7 | Section: games | ||
177 | 8 | Priority: extra | ||
178 | 9 | Description: Simple pairs memory game | ||
179 | 10 | Match pairs of icons by tapping on them. | ||
180 | 0 | 11 | ||
181 | === added file 'debian/memories-touch/DEBIAN/md5sums' | |||
182 | --- debian/memories-touch/DEBIAN/md5sums 1970-01-01 00:00:00 +0000 | |||
183 | +++ debian/memories-touch/DEBIAN/md5sums 2013-04-23 08:48:28 +0000 | |||
184 | @@ -0,0 +1,44 @@ | |||
185 | 1 | ebe5aa57a0236f40c89c53f3f7d2b983 usr/share/applications/memories.desktop | ||
186 | 2 | 1b09d5233fb8b93a7820597ed4a8ae1b usr/share/doc/memories-touch/changelog.gz | ||
187 | 3 | 182a9edd94f70b451a147f75fa0d82ba usr/share/doc/memories-touch/copyright | ||
188 | 4 | ab5304fdea28dd72b5c1c706012092c4 usr/share/memories-touch/1.png | ||
189 | 5 | 90ace301af3dd84f36a64bbabc0a4309 usr/share/memories-touch/10.png | ||
190 | 6 | ee9205c01332b2c9e2f87a849b42f5f9 usr/share/memories-touch/11.png | ||
191 | 7 | 97ed57dc84d1d5ae7e3cab80ba9544d1 usr/share/memories-touch/12.png | ||
192 | 8 | 3461839a45ac97dc48c23b070d770025 usr/share/memories-touch/13.png | ||
193 | 9 | a3a0b5e53ddbf2c158392dd5d1336be3 usr/share/memories-touch/14.png | ||
194 | 10 | 4ec5ddbf3b2431558b2b0d74a1ede74e usr/share/memories-touch/15.png | ||
195 | 11 | 1363e735ec26112890d0275686cd0cfc usr/share/memories-touch/16.svg | ||
196 | 12 | 2b9aef2d2ec1a5d53786282af7b1192e usr/share/memories-touch/17.png | ||
197 | 13 | 49232d45c535a8a3a487a9edb79e92ea usr/share/memories-touch/2.png | ||
198 | 14 | 7525a48ca5c777169bc1d35f940e782f usr/share/memories-touch/3.png | ||
199 | 15 | 8877431f07ae09a1c3f0c075f8a7e6a7 usr/share/memories-touch/4.png | ||
200 | 16 | 49cbfed198c163e1eeddfe7567fac54e usr/share/memories-touch/5.png | ||
201 | 17 | 8416c45613da5414f3a1f92707102283 usr/share/memories-touch/6.png | ||
202 | 18 | 932e4c1a257abf78a7fe2cf76b34746d usr/share/memories-touch/7.png | ||
203 | 19 | fbacf6f2a5857f7999b575103be4db26 usr/share/memories-touch/8.png | ||
204 | 20 | fce613e444b108ff5032af7948b10db7 usr/share/memories-touch/9.png | ||
205 | 21 | 8865b771d4ad37c47f5067bcf8f17abb usr/share/memories-touch/Card.qml | ||
206 | 22 | c2754d2314b751f637be01fc6b17d8f8 usr/share/memories-touch/CurrentScore.qml | ||
207 | 23 | ab5304fdea28dd72b5c1c706012092c4 usr/share/memories-touch/Images/1.png | ||
208 | 24 | 90ace301af3dd84f36a64bbabc0a4309 usr/share/memories-touch/Images/10.png | ||
209 | 25 | ee9205c01332b2c9e2f87a849b42f5f9 usr/share/memories-touch/Images/11.png | ||
210 | 26 | 97ed57dc84d1d5ae7e3cab80ba9544d1 usr/share/memories-touch/Images/12.png | ||
211 | 27 | 3461839a45ac97dc48c23b070d770025 usr/share/memories-touch/Images/13.png | ||
212 | 28 | a3a0b5e53ddbf2c158392dd5d1336be3 usr/share/memories-touch/Images/14.png | ||
213 | 29 | 4ec5ddbf3b2431558b2b0d74a1ede74e usr/share/memories-touch/Images/15.png | ||
214 | 30 | 1363e735ec26112890d0275686cd0cfc usr/share/memories-touch/Images/16.svg | ||
215 | 31 | 2b9aef2d2ec1a5d53786282af7b1192e usr/share/memories-touch/Images/17.png | ||
216 | 32 | 49232d45c535a8a3a487a9edb79e92ea usr/share/memories-touch/Images/2.png | ||
217 | 33 | 7525a48ca5c777169bc1d35f940e782f usr/share/memories-touch/Images/3.png | ||
218 | 34 | 8877431f07ae09a1c3f0c075f8a7e6a7 usr/share/memories-touch/Images/4.png | ||
219 | 35 | 49cbfed198c163e1eeddfe7567fac54e usr/share/memories-touch/Images/5.png | ||
220 | 36 | 8416c45613da5414f3a1f92707102283 usr/share/memories-touch/Images/6.png | ||
221 | 37 | 932e4c1a257abf78a7fe2cf76b34746d usr/share/memories-touch/Images/7.png | ||
222 | 38 | fbacf6f2a5857f7999b575103be4db26 usr/share/memories-touch/Images/8.png | ||
223 | 39 | fce613e444b108ff5032af7948b10db7 usr/share/memories-touch/Images/9.png | ||
224 | 40 | 34d1d7ec280580998f7ed9fe95db3e23 usr/share/memories-touch/Result.qml | ||
225 | 41 | 1338e2977b3a1494977865bf82af9c96 usr/share/memories-touch/Surface.qml | ||
226 | 42 | 940ee629a1cce1a2d48335c76d4d25cd usr/share/memories-touch/avatar@8.png | ||
227 | 43 | 34a97e10d74aa66193619f861d89364d usr/share/memories-touch/gamelogic.js | ||
228 | 44 | 52be1ee617f817b4b2980dbc962a132a usr/share/memories-touch/memories.qml | ||
229 | 0 | 45 | ||
230 | === added directory 'debian/memories-touch/usr' | |||
231 | === added directory 'debian/memories-touch/usr/share' | |||
232 | === added directory 'debian/memories-touch/usr/share/applications' | |||
233 | === added file 'debian/memories-touch/usr/share/applications/memories.desktop' | |||
234 | --- debian/memories-touch/usr/share/applications/memories.desktop 1970-01-01 00:00:00 +0000 | |||
235 | +++ debian/memories-touch/usr/share/applications/memories.desktop 2013-04-23 08:48:28 +0000 | |||
236 | @@ -0,0 +1,9 @@ | |||
237 | 1 | [Desktop Entry] | ||
238 | 2 | Encoding=UTF-8 | ||
239 | 3 | Version=1.0 | ||
240 | 4 | Type=Application | ||
241 | 5 | Terminal=false | ||
242 | 6 | Exec=qmlscene /usr/share/memories-touch/memories.qml | ||
243 | 7 | Name=Memories | ||
244 | 8 | X-Ubuntu-Touch=true | ||
245 | 9 | X-Ubuntu-StageHint=SideStage | ||
246 | 0 | 10 | ||
247 | === added directory 'debian/memories-touch/usr/share/doc' | |||
248 | === added directory 'debian/memories-touch/usr/share/doc/memories-touch' | |||
249 | === added file 'debian/memories-touch/usr/share/doc/memories-touch/changelog.gz' | |||
250 | 1 | Binary files debian/memories-touch/usr/share/doc/memories-touch/changelog.gz 1970-01-01 00:00:00 +0000 and debian/memories-touch/usr/share/doc/memories-touch/changelog.gz 2013-04-23 08:48:28 +0000 differ | 11 | Binary files debian/memories-touch/usr/share/doc/memories-touch/changelog.gz 1970-01-01 00:00:00 +0000 and debian/memories-touch/usr/share/doc/memories-touch/changelog.gz 2013-04-23 08:48:28 +0000 differ |
251 | === added file 'debian/memories-touch/usr/share/doc/memories-touch/copyright' | |||
252 | --- debian/memories-touch/usr/share/doc/memories-touch/copyright 1970-01-01 00:00:00 +0000 | |||
253 | +++ debian/memories-touch/usr/share/doc/memories-touch/copyright 2013-04-23 08:48:28 +0000 | |||
254 | @@ -0,0 +1,29 @@ | |||
255 | 1 | Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | ||
256 | 2 | Upstream-Name: memories-touch | ||
257 | 3 | Source: https://code.launchpad.net/~sebastijan-kuzner/memories-touch/trunk | ||
258 | 4 | |||
259 | 5 | Files: * | ||
260 | 6 | Copyright: 2013 Sebastijan Kuzner <sebastijan.kuzner@gmail.com> | ||
261 | 7 | License: GPL-3.0+ | ||
262 | 8 | |||
263 | 9 | Files: debian/* | ||
264 | 10 | Copyright: 2013 Alan Pope <alan.pope@canonical.com> | ||
265 | 11 | License: GPL-3.0+ | ||
266 | 12 | |||
267 | 13 | License: GPL-3.0+ | ||
268 | 14 | This program is free software: you can redistribute it and/or modify | ||
269 | 15 | it under the terms of the GNU General Public License as published by | ||
270 | 16 | the Free Software Foundation, either version 3 of the License, or | ||
271 | 17 | (at your option) any later version. | ||
272 | 18 | . | ||
273 | 19 | This package is distributed in the hope that it will be useful, | ||
274 | 20 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
275 | 21 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
276 | 22 | GNU General Public License for more details. | ||
277 | 23 | . | ||
278 | 24 | You should have received a copy of the GNU General Public License | ||
279 | 25 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
280 | 26 | . | ||
281 | 27 | On Debian systems, the complete text of the GNU General | ||
282 | 28 | Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". | ||
283 | 29 | |||
284 | 0 | 30 | ||
285 | === added file 'debian/rules' | |||
286 | --- debian/rules 1970-01-01 00:00:00 +0000 | |||
287 | +++ debian/rules 2013-04-23 08:48:28 +0000 | |||
288 | @@ -0,0 +1,13 @@ | |||
289 | 1 | #!/usr/bin/make -f | ||
290 | 2 | # -*- makefile -*- | ||
291 | 3 | # Sample debian/rules that uses debhelper. | ||
292 | 4 | # This file was originally written by Joey Hess and Craig Small. | ||
293 | 5 | # As a special exception, when this file is copied by dh-make into a | ||
294 | 6 | # dh-make output file, you may use that output file without restriction. | ||
295 | 7 | # This special exception was added by Craig Small in version 0.37 of dh-make. | ||
296 | 8 | |||
297 | 9 | # Uncomment this to turn on verbose mode. | ||
298 | 10 | #export DH_VERBOSE=1 | ||
299 | 11 | |||
300 | 12 | %: | ||
301 | 13 | dh $@ | ||
302 | 0 | 14 | ||
303 | === added directory 'debian/source' | |||
304 | === added file 'debian/source/format' | |||
305 | --- debian/source/format 1970-01-01 00:00:00 +0000 | |||
306 | +++ debian/source/format 2013-04-23 08:48:28 +0000 | |||
307 | @@ -0,0 +1,1 @@ | |||
308 | 1 | 3.0 (native) | ||
309 | 0 | 2 | ||
310 | === modified file 'memories.desktop' | |||
311 | --- memories.desktop 2013-04-21 17:20:31 +0000 | |||
312 | +++ memories.desktop 2013-04-23 08:48:28 +0000 | |||
313 | @@ -1,7 +1,9 @@ | |||
314 | 1 | [Desktop Entry] | 1 | [Desktop Entry] |
319 | 2 | Name=memories | 2 | Encoding=UTF-8 |
320 | 3 | Comment=My project description | 3 | Version=1.0 |
321 | 4 | Exec=/usr/bin/qmlscene | 4 | Type=Application |
318 | 5 | Icon=qmlscene | ||
322 | 6 | Terminal=false | 5 | Terminal=false |
324 | 7 | Type=Application | 6 | Exec=qmlscene /usr/share/memories-touch/memories.qml |
325 | 7 | Name=Memories | ||
326 | 8 | X-Ubuntu-Touch=true | ||
327 | 9 | X-Ubuntu-StageHint=SideStage | ||
328 | 8 | 10 | ||
329 | === modified file 'memories.qmlproject.user' | |||
330 | --- memories.qmlproject.user 2013-04-21 17:20:31 +0000 | |||
331 | +++ memories.qmlproject.user 2013-04-23 08:48:28 +0000 | |||
332 | @@ -1,10 +1,10 @@ | |||
333 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
334 | 2 | <!DOCTYPE QtCreatorProject> | 2 | <!DOCTYPE QtCreatorProject> |
336 | 3 | <!-- Written by QtCreator 2.7.0, 2013-04-21T19:05:18. --> | 3 | <!-- Written by QtCreator 2.7.0, 2013-04-23T09:20:28. --> |
337 | 4 | <qtcreator> | 4 | <qtcreator> |
338 | 5 | <data> | 5 | <data> |
339 | 6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> | 6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
341 | 7 | <value type="int">-1</value> | 7 | <value type="int">0</value> |
342 | 8 | </data> | 8 | </data> |
343 | 9 | <data> | 9 | <data> |
344 | 10 | <variable>ProjectExplorer.Project.EditorSettings</variable> | 10 | <variable>ProjectExplorer.Project.EditorSettings</variable> |
345 | @@ -49,12 +49,82 @@ | |||
346 | 49 | <valuemap type="QVariantMap"/> | 49 | <valuemap type="QVariantMap"/> |
347 | 50 | </data> | 50 | </data> |
348 | 51 | <data> | 51 | <data> |
349 | 52 | <variable>ProjectExplorer.Project.Target.0</variable> | ||
350 | 53 | <valuemap type="QVariantMap"> | ||
351 | 54 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> | ||
352 | 55 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> | ||
353 | 56 | <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{1e421ca5-3d01-4332-ab3f-666ec5fe3e38}</value> | ||
354 | 57 | <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value> | ||
355 | 58 | <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | ||
356 | 59 | <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | ||
357 | 60 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value> | ||
358 | 61 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | ||
359 | 62 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
360 | 63 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | ||
361 | 64 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> | ||
362 | 65 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
363 | 66 | <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> | ||
364 | 67 | </valuemap> | ||
365 | 68 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> | ||
366 | 69 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> | ||
367 | 70 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
368 | 71 | <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | ||
369 | 72 | </valuemap> | ||
370 | 73 | <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | ||
371 | 74 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | ||
372 | 75 | <value type="bool" key="Analyzer.Project.UseGlobal">true</value> | ||
373 | 76 | <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> | ||
374 | 77 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> | ||
375 | 78 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> | ||
376 | 79 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> | ||
377 | 80 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> | ||
378 | 81 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> | ||
379 | 82 | <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> | ||
380 | 83 | <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> | ||
381 | 84 | <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> | ||
382 | 85 | <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> | ||
383 | 86 | <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> | ||
384 | 87 | <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> | ||
385 | 88 | <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> | ||
386 | 89 | <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> | ||
387 | 90 | <value type="int">0</value> | ||
388 | 91 | <value type="int">1</value> | ||
389 | 92 | <value type="int">2</value> | ||
390 | 93 | <value type="int">3</value> | ||
391 | 94 | <value type="int">4</value> | ||
392 | 95 | <value type="int">5</value> | ||
393 | 96 | <value type="int">6</value> | ||
394 | 97 | <value type="int">7</value> | ||
395 | 98 | <value type="int">8</value> | ||
396 | 99 | <value type="int">9</value> | ||
397 | 100 | <value type="int">10</value> | ||
398 | 101 | <value type="int">11</value> | ||
399 | 102 | <value type="int">12</value> | ||
400 | 103 | <value type="int">13</value> | ||
401 | 104 | <value type="int">14</value> | ||
402 | 105 | </valuelist> | ||
403 | 106 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> | ||
404 | 107 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value> | ||
405 | 108 | <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value> | ||
406 | 109 | <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value> | ||
407 | 110 | <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value> | ||
408 | 111 | <valuelist type="QVariantList" key="QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges"/> | ||
409 | 112 | <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> | ||
410 | 113 | <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> | ||
411 | 114 | <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> | ||
412 | 115 | <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value> | ||
413 | 116 | <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> | ||
414 | 117 | </valuemap> | ||
415 | 118 | <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> | ||
416 | 119 | </valuemap> | ||
417 | 120 | </data> | ||
418 | 121 | <data> | ||
419 | 52 | <variable>ProjectExplorer.Project.TargetCount</variable> | 122 | <variable>ProjectExplorer.Project.TargetCount</variable> |
421 | 53 | <value type="int">0</value> | 123 | <value type="int">1</value> |
422 | 54 | </data> | 124 | </data> |
423 | 55 | <data> | 125 | <data> |
424 | 56 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | 126 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
426 | 57 | <value type="QString">{b8a2a5b7-b33e-4e33-bd4e-be00d9721ad0}</value> | 127 | <value type="QString">{a7de895d-c4c2-4933-af92-29d0124d9c01}</value> |
427 | 58 | </data> | 128 | </data> |
428 | 59 | <data> | 129 | <data> |
429 | 60 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> | 130 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
430 | 61 | 131 | ||
431 | === added file 'memories.qmlproject.user.b8a2a5b' | |||
432 | --- memories.qmlproject.user.b8a2a5b 1970-01-01 00:00:00 +0000 | |||
433 | +++ memories.qmlproject.user.b8a2a5b 2013-04-23 08:48:28 +0000 | |||
434 | @@ -0,0 +1,63 @@ | |||
435 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
436 | 2 | <!DOCTYPE QtCreatorProject> | ||
437 | 3 | <!-- Written by QtCreator 2.7.0, 2013-04-21T19:05:18. --> | ||
438 | 4 | <qtcreator> | ||
439 | 5 | <data> | ||
440 | 6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> | ||
441 | 7 | <value type="int">-1</value> | ||
442 | 8 | </data> | ||
443 | 9 | <data> | ||
444 | 10 | <variable>ProjectExplorer.Project.EditorSettings</variable> | ||
445 | 11 | <valuemap type="QVariantMap"> | ||
446 | 12 | <value type="bool" key="EditorConfiguration.AutoIndent">true</value> | ||
447 | 13 | <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> | ||
448 | 14 | <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> | ||
449 | 15 | <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> | ||
450 | 16 | <value type="QByteArray" key="language">Cpp</value> | ||
451 | 17 | <valuemap type="QVariantMap" key="value"> | ||
452 | 18 | <value type="QString" key="CurrentPreferences">CppGlobal</value> | ||
453 | 19 | </valuemap> | ||
454 | 20 | </valuemap> | ||
455 | 21 | <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> | ||
456 | 22 | <value type="QByteArray" key="language">QmlJS</value> | ||
457 | 23 | <valuemap type="QVariantMap" key="value"> | ||
458 | 24 | <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> | ||
459 | 25 | </valuemap> | ||
460 | 26 | </valuemap> | ||
461 | 27 | <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> | ||
462 | 28 | <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> | ||
463 | 29 | <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> | ||
464 | 30 | <value type="int" key="EditorConfiguration.IndentSize">4</value> | ||
465 | 31 | <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> | ||
466 | 32 | <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> | ||
467 | 33 | <value type="int" key="EditorConfiguration.PaddingMode">1</value> | ||
468 | 34 | <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> | ||
469 | 35 | <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> | ||
470 | 36 | <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> | ||
471 | 37 | <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> | ||
472 | 38 | <value type="int" key="EditorConfiguration.TabSize">8</value> | ||
473 | 39 | <value type="bool" key="EditorConfiguration.UseGlobal">true</value> | ||
474 | 40 | <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> | ||
475 | 41 | <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> | ||
476 | 42 | <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> | ||
477 | 43 | <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> | ||
478 | 44 | <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> | ||
479 | 45 | </valuemap> | ||
480 | 46 | </data> | ||
481 | 47 | <data> | ||
482 | 48 | <variable>ProjectExplorer.Project.PluginSettings</variable> | ||
483 | 49 | <valuemap type="QVariantMap"/> | ||
484 | 50 | </data> | ||
485 | 51 | <data> | ||
486 | 52 | <variable>ProjectExplorer.Project.TargetCount</variable> | ||
487 | 53 | <value type="int">0</value> | ||
488 | 54 | </data> | ||
489 | 55 | <data> | ||
490 | 56 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | ||
491 | 57 | <value type="QString">{b8a2a5b7-b33e-4e33-bd4e-be00d9721ad0}</value> | ||
492 | 58 | </data> | ||
493 | 59 | <data> | ||
494 | 60 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> | ||
495 | 61 | <value type="int">12</value> | ||
496 | 62 | </data> | ||
497 | 63 | </qtcreator> |