Merge lp:~nhaines/ubuntu-wallpapers/xenial-fcs into lp:ubuntu-wallpapers
- xenial-fcs
- Merge into ubuntu
Proposed by
Nathan Haines
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 177 |
Merged at revision: | 177 |
Proposed branch: | lp:~nhaines/ubuntu-wallpapers/xenial-fcs |
Merge into: | lp:ubuntu-wallpapers |
Diff against target: |
510 lines (+363/-32) 7 files modified
AUTHORS (+75/-3) contest/xenial.xml (+119/-0) debian/changelog (+9/-0) debian/control (+8/-1) debian/copyright (+32/-28) debian/ubuntu-wallpapers-xenial.install (+15/-0) xenial-wallpapers.xml.in (+105/-0) |
To merge this branch: | bzr merge lp:~nhaines/ubuntu-wallpapers/xenial-fcs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Approve | ||
Iain Lane | Pending | ||
Review via email: mp+291209@code.launchpad.net |
Commit message
Description of the change
Ubuntu 16.04 Free Culture Showcase wallpapers
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote : | # |
Revision history for this message
Sebastien Bacher (seb128) : | # |
review:
Approve
Revision history for this message
Nathan Haines (nhaines) wrote : | # |
Thanks, Sebastian.
I did notice the debian/copyright file and it seemed a bit odd to me. I corrected the missing credits in the AUTHORS file, but did not have time to research licenses for the copyright file. I will look into it--it should be rather trivial.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file '160218-deux-two_by_Pierre_Cante.jpg' |
2 | Binary files 160218-deux-two_by_Pierre_Cante.jpg 1970-01-01 00:00:00 +0000 and 160218-deux-two_by_Pierre_Cante.jpg 2016-04-07 07:12:27 +0000 differ |
3 | === modified file 'AUTHORS' |
4 | --- AUTHORS 2013-08-23 09:34:52 +0000 |
5 | +++ AUTHORS 2016-04-07 07:12:27 +0000 |
6 | @@ -3,14 +3,86 @@ |
7 | Xi Zhu <xi.zhu@canonical.com> |
8 | |
9 | Thanks to: |
10 | -Iain Farrell <iain@ubuntu.com> |
11 | +Nathan Haines <nhaines@ubuntu.com> |
12 | and everybody else involved in the wallpaper contest, brilliant work! |
13 | |
14 | And authors of the beautiful pictures: |
15 | |
16 | +Xenial |
17 | +====== |
18 | +160218-deux-two by Pierre Cante |
19 | +Black hole by Marek Koteluk |
20 | +Cielo estrellado by Eduardo Diez Viñuela |
21 | +clock by Bernhard Hanakam |
22 | +Dans ma bulle by Christophe Weibel |
23 | +Flora by Marek Koteluk |
24 | +Icy Grass by Raymond Lavoie |
25 | +Night lights by Alberto Salvia Novella |
26 | +passion flower by Irene Gr |
27 | +Spring by Peter Apas |
28 | +TCP118v1 by Tiziano Consonni |
29 | +The Land of Edonias by Γιωργος Αργυροπουλος |
30 | + |
31 | +Wily |
32 | +==== |
33 | +Tramonto a Scalea by Renatvs88 |
34 | +Tranquil by Pat David |
35 | +Light my fire evening sun by Dariusz Duma |
36 | +Sitting Here, Making Fun by Philipp Haegi |
37 | +Moss inflorescence by carmelo75 |
38 | +Breaker by Lyle Nel |
39 | +Blue by dariuskws |
40 | +Hotel by sarcasmrules2011 |
41 | +Mediterranean Sea by simosx |
42 | +Abstract Ubuntu by Marek Koteluk |
43 | + |
44 | +Vivid |
45 | +===== |
46 | +150305-cinqAA by Pierre Cante |
47 | +Cedar Wax Wing by Raymond Lavoie |
48 | +Christmas Lights by RaDu GaLaN |
49 | +Euphoria! by Tomáš Kijas |
50 | +Oyster Catcher in the Rocks by Raymond Lavoie |
51 | +Polka Dots and Moonbeams by SirPecanGum |
52 | +Primavera by Vivian Morales |
53 | +Tenerife Roques de Anaga by Frederik Schulz |
54 | +Tesla by Tomáš Kijas |
55 | +Traviny by Tomáš Kijas |
56 | + |
57 | + |
58 | +Utopic |
59 | +====== |
60 | +Empty Space by Glenn Rayat |
61 | +Golden leaves by Mauro Campanelli |
62 | +Horses on sand dunes by Matthias Siewert |
63 | +Kronach leuchtet 2014 by Brian Fox |
64 | +Music by Tomáš Kijas |
65 | +Night Seascape by Davor Dopar |
66 | +Redes de hilo by Juan Pablo Lauriente |
67 | +salcantayperu by Life Nomadic |
68 | +Sunny Autumn by Joel Heaps |
69 | +Utopic Unicorn by Bedis ElAchКche |
70 | +Warm grasses by dcsearle.t21 |
71 | +xgu472hf2 by lariliikala |
72 | + |
73 | + |
74 | +Trusty |
75 | +====== |
76 | +Backyard Mushrooms by Kurt Zitzelman |
77 | +Beach by Renato Giordanelli |
78 | +Berries by Tom Kijas |
79 | +Foggy Forest by Jake Stewart |
80 | +Ibanez Infinity by Jaco Kok |
81 | +Jelly Fish by RaDu GaLaN |
82 | +Mono Lake by Angela Henderson |
83 | +Partitura by Vincijun |
84 | +Reflections by Trenton Fox |
85 | +Sea Fury by Ian Worrall |
86 | +Water web by Tom Kijas |
87 | +Forever by Shady S |
88 | + |
89 | Saucy |
90 | ===== |
91 | - |
92 | 163 by e4v |
93 | Cyclotron by cyclotron beam |
94 | Gota D'água by Eiti Kimura |
95 | @@ -36,7 +108,7 @@ |
96 | Blue frost by ppaabblloo77 |
97 | Brother typewriter by awdean1 |
98 | Cacomixtle Ubunteño by Carlos and Paula Morales |
99 | -Fleurs de Prunus 24 by Jérôme Boivin |
100 | +Fleurs de Prunus 24 by Jérôme Boivin |
101 | La Gomera by Alfonso Aguirre Arbex |
102 | Landing by Nic Dahlquist |
103 | Last breath… by Francisco Javier Epinoza Pérez |
104 | |
105 | === added file 'Black_hole_by_Marek_Koteluk.jpg' |
106 | Binary files Black_hole_by_Marek_Koteluk.jpg 1970-01-01 00:00:00 +0000 and Black_hole_by_Marek_Koteluk.jpg 2016-04-07 07:12:27 +0000 differ |
107 | === added file 'Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg' |
108 | Binary files Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg 1970-01-01 00:00:00 +0000 and Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg 2016-04-07 07:12:27 +0000 differ |
109 | === added file 'Dans_ma_bulle_by_Christophe_Weibel.jpg' |
110 | Binary files Dans_ma_bulle_by_Christophe_Weibel.jpg 1970-01-01 00:00:00 +0000 and Dans_ma_bulle_by_Christophe_Weibel.jpg 2016-04-07 07:12:27 +0000 differ |
111 | === added file 'Flora_by_Marek_Koteluk.jpg' |
112 | Binary files Flora_by_Marek_Koteluk.jpg 1970-01-01 00:00:00 +0000 and Flora_by_Marek_Koteluk.jpg 2016-04-07 07:12:27 +0000 differ |
113 | === added file 'Icy_Grass_by_Raymond_Lavoie.jpg' |
114 | Binary files Icy_Grass_by_Raymond_Lavoie.jpg 1970-01-01 00:00:00 +0000 and Icy_Grass_by_Raymond_Lavoie.jpg 2016-04-07 07:12:27 +0000 differ |
115 | === added file 'Night_lights_by_Alberto_Salvia_Novella.jpg' |
116 | Binary files Night_lights_by_Alberto_Salvia_Novella.jpg 1970-01-01 00:00:00 +0000 and Night_lights_by_Alberto_Salvia_Novella.jpg 2016-04-07 07:12:27 +0000 differ |
117 | === added file 'Spring_by_Peter_Apas.jpg' |
118 | Binary files Spring_by_Peter_Apas.jpg 1970-01-01 00:00:00 +0000 and Spring_by_Peter_Apas.jpg 2016-04-07 07:12:27 +0000 differ |
119 | === added file 'TCP118v1_by_Tiziano_Consonni.jpg' |
120 | Binary files TCP118v1_by_Tiziano_Consonni.jpg 1970-01-01 00:00:00 +0000 and TCP118v1_by_Tiziano_Consonni.jpg 2016-04-07 07:12:27 +0000 differ |
121 | === added file 'The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg' |
122 | Binary files The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg 1970-01-01 00:00:00 +0000 and The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg 2016-04-07 07:12:27 +0000 differ |
123 | === added file 'clock_by_Bernhard_Hanakam.jpg' |
124 | Binary files clock_by_Bernhard_Hanakam.jpg 1970-01-01 00:00:00 +0000 and clock_by_Bernhard_Hanakam.jpg 2016-04-07 07:12:27 +0000 differ |
125 | === added file 'contest/xenial.xml' |
126 | --- contest/xenial.xml 1970-01-01 00:00:00 +0000 |
127 | +++ contest/xenial.xml 2016-04-07 07:12:27 +0000 |
128 | @@ -0,0 +1,119 @@ |
129 | +<background> |
130 | + <starttime> |
131 | + <year>2009</year> |
132 | + <month>08</month> |
133 | + <day>04</day> |
134 | + <hour>00</hour> |
135 | + <minute>00</minute> |
136 | + <second>00</second> |
137 | + </starttime> |
138 | +<!-- This animation will start at midnight. --> |
139 | + <static> |
140 | + <duration>1795.0</duration> |
141 | + <file>/usr/share/backgrounds/Icy_Grass_by_Raymond_Lavoie.jpg</file> |
142 | + </static> |
143 | + <transition> |
144 | + <duration>5.0</duration> |
145 | + <from>/usr/share/backgrounds/Icy_Grass_by_Raymond_Lavoie.jpg</from> |
146 | + <to>/usr/share/backgrounds/160218-deux-two_by_Pierre_Cante.jpg</to> |
147 | + </transition> |
148 | + <static> |
149 | + <duration>1795.0</duration> |
150 | + <file>/usr/share/backgrounds/160218-deux-two_by_Pierre_Cante.jpg</file> |
151 | + </static> |
152 | + <transition> |
153 | + <duration>5.0</duration> |
154 | + <from>/usr/share/backgrounds/160218-deux-two_by_Pierre_Cante.jpg</from> |
155 | + <to>/usr/share/backgrounds/Spring_by_Peter_Apas.jpg</to> |
156 | + </transition> |
157 | + <static> |
158 | + <duration>1795.0</duration> |
159 | + <file>/usr/share/backgrounds/Spring_by_Peter_Apas.jpg</file> |
160 | + </static> |
161 | + <transition> |
162 | + <duration>5.0</duration> |
163 | + <from>/usr/share/backgrounds/Spring_by_Peter_Apas.jpg</from> |
164 | + <to>/usr/share/backgrounds/The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg</to> |
165 | + </transition> |
166 | + <static> |
167 | + <duration>1795.0</duration> |
168 | + <file>/usr/share/backgrounds/The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg</file> |
169 | + </static> |
170 | + <transition> |
171 | + <duration>5.0</duration> |
172 | + <from>/usr/share/backgrounds/The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg</from> |
173 | + <to>/usr/share/backgrounds/Dans_ma_bulle_by_Christophe_Weibel.jpg</to> |
174 | + </transition> |
175 | + <static> |
176 | + <duration>1795.0</duration> |
177 | + <file>/usr/share/backgrounds/Dans_ma_bulle_by_Christophe_Weibel.jpg</file> |
178 | + </static> |
179 | + <transition> |
180 | + <duration>5.0</duration> |
181 | + <from>/usr/share/backgrounds/Dans_ma_bulle_by_Christophe_Weibel.jpg</from> |
182 | + <to>/usr/share/backgrounds/clock_by_Bernhard_Hanakam.jpg</to> |
183 | + </transition> |
184 | + <static> |
185 | + <duration>1795.0</duration> |
186 | + <file>/usr/share/backgrounds/clock_by_Bernhard_Hanakam.jpg</file> |
187 | + </static> |
188 | + <transition> |
189 | + <duration>5.0</duration> |
190 | + <from>/usr/share/backgrounds/clock_by_Bernhard_Hanakam.jpg</from> |
191 | + <to>/usr/share/backgrounds/Night_lights_by_Alberto_Salvia_Novella.jpg</to> |
192 | + </transition> |
193 | + <static> |
194 | + <duration>1795.0</duration> |
195 | + <file>/usr/share/backgrounds/Night_lights_by_Alberto_Salvia_Novella.jpg</file> |
196 | + </static> |
197 | + <transition> |
198 | + <duration>5.0</duration> |
199 | + <from>/usr/share/backgrounds/Night_lights_by_Alberto_Salvia_Novella.jpg</from> |
200 | + <to>/usr/share/backgrounds/TCP118v1_by_Tiziano_Consonni.jpg</to> |
201 | + </transition> |
202 | + <static> |
203 | + <duration>1795.0</duration> |
204 | + <file>/usr/share/backgrounds/TCP118v1_by_Tiziano_Consonni.jpg</file> |
205 | + </static> |
206 | + <transition> |
207 | + <duration>5.0</duration> |
208 | + <from>/usr/share/backgrounds/TCP118v1_by_Tiziano_Consonni.jpg</from> |
209 | + <to>/usr/share/backgrounds/Flora_by_Marek_Koteluk.jpg</to> |
210 | + </transition> |
211 | + <static> |
212 | + <duration>1795.0</duration> |
213 | + <file>/usr/share/backgrounds/Flora_by_Marek_Koteluk.jpg</file> |
214 | + </static> |
215 | + <transition> |
216 | + <duration>5.0</duration> |
217 | + <from>/usr/share/backgrounds/Flora_by_Marek_Koteluk.jpg</from> |
218 | + <to>/usr/share/backgrounds/Black_hole_by_Marek_Koteluk.jpg</to> |
219 | + </transition> |
220 | + <static> |
221 | + <duration>1795.0</duration> |
222 | + <file>/usr/share/backgrounds/Black_hole_by_Marek_Koteluk.jpg</file> |
223 | + </static> |
224 | + <transition> |
225 | + <duration>5.0</duration> |
226 | + <from>/usr/share/backgrounds/Black_hole_by_Marek_Koteluk.jpg</from> |
227 | + <to>/usr/share/backgrounds/Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg</to> |
228 | + </transition> |
229 | + <static> |
230 | + <duration>1795.0</duration> |
231 | + <file>/usr/share/backgrounds/Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg</file> |
232 | + </static> |
233 | + <transition> |
234 | + <duration>5.0</duration> |
235 | + <from>/usr/share/backgrounds/Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg</from> |
236 | + <to>/usr/share/backgrounds/passion_flower_by_Irene_Gr.jpg</to> |
237 | + </transition> |
238 | + <static> |
239 | + <duration>1795.0</duration> |
240 | + <file>/usr/share/backgrounds/passion_flower_by_Irene_Gr.jpg</file> |
241 | + </static> |
242 | + <transition> |
243 | + <duration>5.0</duration> |
244 | + <from>/usr/share/backgrounds/passion_flower_by_Irene_Gr.jpg</from> |
245 | + <to>/usr/share/backgrounds/Icy_Grass_by_Raymond_Lavoie.jpg</to> |
246 | + </transition> |
247 | +</background> |
248 | |
249 | === modified file 'debian/changelog' |
250 | --- debian/changelog 2016-03-08 13:56:25 +0000 |
251 | +++ debian/changelog 2016-04-07 07:12:27 +0000 |
252 | @@ -1,3 +1,12 @@ |
253 | +ubuntu-wallpapers (16.04.0-0ubuntu2) xenial; urgency=medium |
254 | + |
255 | + * Add winning entries from the Ubuntu 16.04 Free Culture Showcase. |
256 | + * Update AUTHORS to include Ubuntu Free Culture Showcase winners for |
257 | + trusty, utopic, vivid, wily, and xenial. |
258 | + * Update copyright file for community wallpapers and extend year to 2016. |
259 | + |
260 | + -- Nathan Haines <nhaines@ubuntu.com> Wed, 06 Apr 2016 23:56:15 -0700 |
261 | + |
262 | ubuntu-wallpapers (16.04.0-0ubuntu1) xenial; urgency=medium |
263 | |
264 | * New default wallpapers for 16.04 (LP: #1551208) |
265 | |
266 | === modified file 'debian/control' |
267 | --- debian/control 2015-10-06 07:34:28 +0000 |
268 | +++ debian/control 2016-04-07 07:12:27 +0000 |
269 | @@ -16,7 +16,7 @@ |
270 | Package: ubuntu-wallpapers |
271 | Architecture: all |
272 | Section: metapackages |
273 | -Depends: ubuntu-wallpapers-wily, |
274 | +Depends: ubuntu-wallpapers-xenial, |
275 | ${misc:Depends}, |
276 | Suggests: ubuntu-wallpapers-karmic, |
277 | ubuntu-wallpapers-lucid, |
278 | @@ -30,6 +30,7 @@ |
279 | ubuntu-wallpapers-trusty, |
280 | ubuntu-wallpapers-utopic, |
281 | ubuntu-wallpapers-vivid, |
282 | + ubuntu-wallpapers-wily, |
283 | Description: Ubuntu Wallpapers |
284 | The default Ubuntu wallpaper. This is also a meta-package depending on the |
285 | other default wallpapers for the current Ubuntu release. |
286 | @@ -111,3 +112,9 @@ |
287 | Depends: ${misc:Depends}, |
288 | Description: Ubuntu 15.10 Wallpapers |
289 | Wallpapers from the Ubuntu 15.10 community contest |
290 | + |
291 | +Package: ubuntu-wallpapers-xenial |
292 | +Architecture: all |
293 | +Depends: ${misc:Depends}, |
294 | +Description: Ubuntu 16.04 Wallpapers |
295 | + Wallpapers from the Ubuntu 16.04 community contest |
296 | |
297 | === modified file 'debian/copyright' |
298 | --- debian/copyright 2015-10-02 08:49:30 +0000 |
299 | +++ debian/copyright 2016-04-07 07:12:27 +0000 |
300 | @@ -2,38 +2,42 @@ |
301 | Upstream-Name: ubuntu-wallpapers |
302 | Source: https://launchpad.net/ubuntu-wallpapers |
303 | |
304 | -Files: Tramonto_a_Scalea_by_Renatvs88.jpg |
305 | - Tranquil_by_Pat_David.jpg |
306 | - Light_my_fire_evening_sun_by_Dariusz_Duma.jpg |
307 | - Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg |
308 | - Moss_inflorescence_by_carmelo75.jpg |
309 | - Breaker_by_Lyle_Nel.jpg |
310 | - Hotel_by_sarcasmrules2011.jpg |
311 | - Mediterranean_Sea_by_simosx.jpg |
312 | - Abstract_Ubuntu_by_Marek_Koteluk.jpg |
313 | -Copyright: Pat David |
314 | - Renatvs88 |
315 | - Dariusz Duma |
316 | - Philipp Haegi |
317 | - carmelo75 |
318 | - Lyle Nel |
319 | - sarcasmrules2011 |
320 | - simosx |
321 | - Marek Koteluk |
322 | +Files: 160218-deux-two_by_Pierre_Cante.jpg |
323 | + Black_hole_by_Marek_Koteluk.jpg |
324 | + Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg |
325 | + clock_by_Bernhard_Hanakam.jpg |
326 | + Dans_ma_bulle_by_Christophe_Weibel.jpg |
327 | + Flora_by_Marek_Koteluk.jpg |
328 | + Icy_Grass_by_Raymond_Lavoie.jpg |
329 | + Night_lights_by_Alberto_Salvia_Novella.jpg |
330 | + passion_flower_by_Irene_Gr.jpg |
331 | + TCP118v1_by_Tiziano_Consonni.jpg |
332 | +Copyright: Pierre Cante |
333 | + Marek Koteluk |
334 | + Eduardo Diez Viñuela |
335 | + Bernhard Hanakam |
336 | + Christophe Weibel |
337 | + Marek Koteluk |
338 | + Raymond Lavoie |
339 | + Alberto Salvia Novella |
340 | + Irene Gr |
341 | + Tiziano Consonni |
342 | License: CC-BY-SA-2.0 |
343 | This work is licensed under the Creative Commons Attribution-ShareAlike 2.0 |
344 | - Unported License. To view a copy of this license, visit |
345 | - http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative |
346 | + Generic License. To view a copy of this license, visit |
347 | + https://creativecommons.org/licenses/by-sa/2.0/ or send a letter to Creative |
348 | Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. |
349 | |
350 | -Files: Blue_by_dariuskws.jpg |
351 | -Copyright: dariuskws |
352 | -License: CC-0-1.0 |
353 | - This work is licensed under the Creative Commons CC0 1.0 Universal |
354 | +Files: Spring_by_Peter_Apas.jpg |
355 | + The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg |
356 | + |
357 | +Copyright: Peter Apas |
358 | + Γιωργος Αργυροπουλος |
359 | +License: CC-BY-2.0 |
360 | + This work is licensed under the Creative Commons Attribution 2.0 Generic |
361 | License. To view a copy of this license, visit |
362 | - https://creativecommons.org/publicdomain/zero/1.0/ or send a letter to |
363 | - Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, |
364 | - 94041, USA. |
365 | + https://creativecommons.org/licenses/by/2.0/ or send a letter to Creative |
366 | + Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. |
367 | |
368 | Files: * |
369 | debian/* |
370 | @@ -41,7 +45,7 @@ |
371 | Suru_Wallpaper_Desktop_4096x2304_Gray.png |
372 | Copyright: 2004, Nathaniel McCallum <npmccallum@gentoo.org> |
373 | 2006, Daniel Holbach <daniel.holbach@ubuntu.com> |
374 | - 2010-2015 Ubuntu community contributors |
375 | + 2010-2016 Ubuntu community contributors |
376 | License: CC-BY-SA-3.0 |
377 | This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 |
378 | Unported License. To view a copy of this license, visit |
379 | |
380 | === added file 'debian/ubuntu-wallpapers-xenial.install' |
381 | --- debian/ubuntu-wallpapers-xenial.install 1970-01-01 00:00:00 +0000 |
382 | +++ debian/ubuntu-wallpapers-xenial.install 2016-04-07 07:12:27 +0000 |
383 | @@ -0,0 +1,15 @@ |
384 | +usr/share/backgrounds/160218-deux-two_by_Pierre_Cante.jpg |
385 | +usr/share/backgrounds/Black_hole_by_Marek_Koteluk.jpg |
386 | +usr/share/backgrounds/Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg |
387 | +usr/share/backgrounds/clock_by_Bernhard_Hanakam.jpg |
388 | +usr/share/backgrounds/Dans_ma_bulle_by_Christophe_Weibel.jpg |
389 | +usr/share/backgrounds/Flora_by_Marek_Koteluk.jpg |
390 | +usr/share/backgrounds/Icy_Grass_by_Raymond_Lavoie.jpg |
391 | +usr/share/backgrounds/Night_lights_by_Alberto_Salvia_Novella.jpg |
392 | +usr/share/backgrounds/passion_flower_by_Irene_Gr.jpg |
393 | +usr/share/backgrounds/Spring_by_Peter_Apas.jpg |
394 | +usr/share/backgrounds/TCP118v1_by_Tiziano_Consonni.jpg |
395 | +usr/share/backgrounds/The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg |
396 | +usr/share/backgrounds/contest/xenial.xml |
397 | +usr/share/gnome-background-properties/xenial-wallpapers.xml |
398 | + |
399 | |
400 | === added file 'passion_flower_by_Irene_Gr.jpg' |
401 | Binary files passion_flower_by_Irene_Gr.jpg 1970-01-01 00:00:00 +0000 and passion_flower_by_Irene_Gr.jpg 2016-04-07 07:12:27 +0000 differ |
402 | === added file 'xenial-wallpapers.xml.in' |
403 | --- xenial-wallpapers.xml.in 1970-01-01 00:00:00 +0000 |
404 | +++ xenial-wallpapers.xml.in 2016-04-07 07:12:27 +0000 |
405 | @@ -0,0 +1,105 @@ |
406 | +<?xml version="1.0"?> |
407 | +<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd"> |
408 | +<wallpapers> |
409 | + <wallpaper deleted="false"> |
410 | + <name>Ubuntu 16.04 Community Wallpapers</name> |
411 | + <filename>/usr/share/backgrounds/contest/xenial.xml</filename> |
412 | + <options>zoom</options> |
413 | + </wallpaper> |
414 | + <wallpaper> |
415 | + <_name>160218-deux-two</_name> |
416 | + <filename>/usr/share/backgrounds/160218-deux-two_by_Pierre_Cante.jpg</filename> |
417 | + <options>zoom</options> |
418 | + <pcolor>#000000</pcolor> |
419 | + <scolor>#000000</scolor> |
420 | + <shade_type>solid</shade_type> |
421 | + </wallpaper> |
422 | + <wallpaper> |
423 | + <_name>Black hole</_name> |
424 | + <filename>/usr/share/backgrounds/Black_hole_by_Marek_Koteluk.jpg</filename> |
425 | + <options>zoom</options> |
426 | + <pcolor>#000000</pcolor> |
427 | + <scolor>#000000</scolor> |
428 | + <shade_type>solid</shade_type> |
429 | + </wallpaper> |
430 | + <wallpaper> |
431 | + <_name>Cielo estrellado</_name> |
432 | + <filename>/usr/share/backgrounds/Cielo_estrellado_by_Eduardo_Diez_Viñuela.jpg</filename> |
433 | + <options>zoom</options> |
434 | + <pcolor>#000000</pcolor> |
435 | + <scolor>#000000</scolor> |
436 | + <shade_type>solid</shade_type> |
437 | + </wallpaper> |
438 | + <wallpaper> |
439 | + <_name>clock</_name> |
440 | + <filename>/usr/share/backgrounds/clock_by_Bernhard_Hanakam.jpg</filename> |
441 | + <options>zoom</options> |
442 | + <pcolor>#000000</pcolor> |
443 | + <scolor>#000000</scolor> |
444 | + <shade_type>solid</shade_type> |
445 | + </wallpaper> |
446 | + <wallpaper> |
447 | + <_name>Dans ma bulle</_name> |
448 | + <filename>/usr/share/backgrounds/Dans_ma_bulle_by_Christophe_Weibel.jpg</filename> |
449 | + <options>zoom</options> |
450 | + <pcolor>#000000</pcolor> |
451 | + <scolor>#000000</scolor> |
452 | + <shade_type>solid</shade_type> |
453 | + </wallpaper> |
454 | + <wallpaper> |
455 | + <_name>Flora</_name> |
456 | + <filename>/usr/share/backgrounds/Flora_by_Marek_Koteluk.jpg</filename> |
457 | + <options>zoom</options> |
458 | + <pcolor>#000000</pcolor> |
459 | + <scolor>#000000</scolor> |
460 | + <shade_type>solid</shade_type> |
461 | + </wallpaper> |
462 | + <wallpaper> |
463 | + <_name>Icy Grass</_name> |
464 | + <filename>/usr/share/backgrounds/Icy_Grass_by_Raymond_Lavoie.jpg</filename> |
465 | + <options>zoom</options> |
466 | + <pcolor>#000000</pcolor> |
467 | + <scolor>#000000</scolor> |
468 | + <shade_type>solid</shade_type> |
469 | + </wallpaper> |
470 | + <wallpaper> |
471 | + <_name>Night lights</_name> |
472 | + <filename>/usr/share/backgrounds/Night_lights_by_Alberto_Salvia_Novella.jpg</filename> |
473 | + <options>zoom</options> |
474 | + <pcolor>#000000</pcolor> |
475 | + <scolor>#000000</scolor> |
476 | + <shade_type>solid</shade_type> |
477 | + </wallpaper> |
478 | + <wallpaper> |
479 | + <_name>passion flower</_name> |
480 | + <filename>/usr/share/backgrounds/passion_flower_by_Irene_Gr.jpg</filename> |
481 | + <options>zoom</options> |
482 | + <pcolor>#000000</pcolor> |
483 | + <scolor>#000000</scolor> |
484 | + <shade_type>solid</shade_type> |
485 | + </wallpaper> |
486 | + <wallpaper> |
487 | + <_name>Spring</_name> |
488 | + <filename>/usr/share/backgrounds/Spring_by_Peter_Apas.jpg</filename> |
489 | + <options>zoom</options> |
490 | + <pcolor>#000000</pcolor> |
491 | + <scolor>#000000</scolor> |
492 | + <shade_type>solid</shade_type> |
493 | + </wallpaper> |
494 | + <wallpaper> |
495 | + <_name>TCP118v1</_name> |
496 | + <filename>/usr/share/backgrounds/TCP118v1_by_Tiziano_Consonni.jpg</filename> |
497 | + <options>zoom</options> |
498 | + <pcolor>#000000</pcolor> |
499 | + <scolor>#000000</scolor> |
500 | + <shade_type>solid</shade_type> |
501 | + </wallpaper> |
502 | + <wallpaper> |
503 | + <_name>The Land of Edonias</_name> |
504 | + <filename>/usr/share/backgrounds/The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg</filename> |
505 | + <options>zoom</options> |
506 | + <pcolor>#000000</pcolor> |
507 | + <scolor>#000000</scolor> |
508 | + <shade_type>solid</shade_type> |
509 | + </wallpaper> |
510 | +</wallpapers> |
Thanks Nathan, the changes looks good. Unsure why we limiting the debian/copyright to the current set, we keep distributing the old series images so we should have them listed, not that it's something you started, seems we also did that previously but it feels still wrong? In any case I'm not going to block the upload on that but we might want to update the copyright in the vcs for the next upload?