Merge lp:~nhaines/ubuntu-wallpapers/yakkety-fcs into lp:ubuntu-wallpapers

Proposed by Nathan Haines
Status: Merged
Merged at revision: 187
Proposed branch: lp:~nhaines/ubuntu-wallpapers/yakkety-fcs
Merge into: lp:ubuntu-wallpapers
Diff against target: 413 lines (+282/-11)
7 files modified
AUTHORS (+17/-0)
contest/yakkety.xml (+119/-0)
debian/changelog (+7/-0)
debian/control (+2/-2)
debian/copyright (+30/-1)
debian/ubuntu-wallpapers-yakkety.install (+14/-0)
yakkety-wallpapers.xml.in (+93/-8)
To merge this branch: bzr merge lp:~nhaines/ubuntu-wallpapers/yakkety-fcs
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+307659@code.launchpad.net

Description of the change

* Add winning entries from the Ubuntu 16.10 Free Culture Showcase.
* AUTHORS: Re-add Iain Lane as a contributor.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2016-04-07 06:57:04 +0000
3+++ AUTHORS 2016-10-05 06:47:52 +0000
4@@ -1,6 +1,7 @@
5 Andrea Cimitan <andrea.cimitan@canonical.com>
6 Otto Greenslade <otto.greenslade@canonical.com>
7 Xi Zhu <xi.zhu@canonical.com>
8+Iain Lane <iain.lane@canonical.com>
9
10 Thanks to:
11 Nathan Haines <nhaines@ubuntu.com>
12@@ -8,6 +9,22 @@
13
14 And authors of the beautiful pictures:
15
16+Yakkety
17+=======
18+
19+Alien Wing by Ralph Crützen
20+Classic Guitar Detail by Sten Jørgen Pettersen
21+DSC3907 by Todor Velichkov
22+Haukland Beach view by Michele Agostini
23+IMG_0081 by Jobin Babu
24+IMG_7632 by Jobin Babu
25+larung gar by night by Geza Radics
26+P1310728 by Ferran Reyes
27+ubuntu16_10 by Khoir Rudin
28+ubuntu_wallpaper_16_10_02 by screen_name_007
29+Wanaka Tree by Stephane Pakula
30+Yala mountain by Geza Radics
31+
32 Xenial
33 ======
34 160218-deux-two by Pierre Cante
35
36=== added file 'Alien_wing_by_Ralph_Crützen.jpg'
37Binary files Alien_wing_by_Ralph_Crützen.jpg 1970-01-01 00:00:00 +0000 and Alien_wing_by_Ralph_Crützen.jpg 2016-10-05 06:47:52 +0000 differ
38=== added file 'Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg'
39Binary files Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg 1970-01-01 00:00:00 +0000 and Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg 2016-10-05 06:47:52 +0000 differ
40=== added file 'DSC3907_by_Todor_Velichkov.jpg'
41Binary files DSC3907_by_Todor_Velichkov.jpg 1970-01-01 00:00:00 +0000 and DSC3907_by_Todor_Velichkov.jpg 2016-10-05 06:47:52 +0000 differ
42=== added file 'Haukland_Beach_view_by_Michele_Agostini.jpg'
43Binary files Haukland_Beach_view_by_Michele_Agostini.jpg 1970-01-01 00:00:00 +0000 and Haukland_Beach_view_by_Michele_Agostini.jpg 2016-10-05 06:47:52 +0000 differ
44=== added file 'IMG_0081_by_Jobin_Babu.jpg'
45Binary files IMG_0081_by_Jobin_Babu.jpg 1970-01-01 00:00:00 +0000 and IMG_0081_by_Jobin_Babu.jpg 2016-10-05 06:47:52 +0000 differ
46=== added file 'IMG_7632_by_Jobin_Babu.jpg'
47Binary files IMG_7632_by_Jobin_Babu.jpg 1970-01-01 00:00:00 +0000 and IMG_7632_by_Jobin_Babu.jpg 2016-10-05 06:47:52 +0000 differ
48=== added file 'P1310728_by_Ferran_Reyes.jpg'
49Binary files P1310728_by_Ferran_Reyes.jpg 1970-01-01 00:00:00 +0000 and P1310728_by_Ferran_Reyes.jpg 2016-10-05 06:47:52 +0000 differ
50=== added file 'Wanaka_Tree_by_Stephane_Pakula.jpg'
51Binary files Wanaka_Tree_by_Stephane_Pakula.jpg 1970-01-01 00:00:00 +0000 and Wanaka_Tree_by_Stephane_Pakula.jpg 2016-10-05 06:47:52 +0000 differ
52=== added file 'Yala_mountain_by_Geza_Radics.jpg'
53Binary files Yala_mountain_by_Geza_Radics.jpg 1970-01-01 00:00:00 +0000 and Yala_mountain_by_Geza_Radics.jpg 2016-10-05 06:47:52 +0000 differ
54=== added file 'contest/yakkety.xml'
55--- contest/yakkety.xml 1970-01-01 00:00:00 +0000
56+++ contest/yakkety.xml 2016-10-05 06:47:52 +0000
57@@ -0,0 +1,119 @@
58+<background>
59+ <starttime>
60+ <year>2009</year>
61+ <month>08</month>
62+ <day>04</day>
63+ <hour>00</hour>
64+ <minute>00</minute>
65+ <second>00</second>
66+ </starttime>
67+<!-- This animation will start at midnight. -->
68+ <static>
69+ <duration>1795.0</duration>
70+ <file>.Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg</file>
71+ </static>
72+ <transition>
73+ <duration>5.0</duration>
74+ <from>.Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg</from>
75+ <to>.Yala_mountain_by_Geza_Radics.jpg</to>
76+ </transition>
77+ <static>
78+ <duration>1795.0</duration>
79+ <file>.Yala_mountain_by_Geza_Radics.jpg</file>
80+ </static>
81+ <transition>
82+ <duration>5.0</duration>
83+ <from>.Yala_mountain_by_Geza_Radics.jpg</from>
84+ <to>.ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg</to>
85+ </transition>
86+ <static>
87+ <duration>1795.0</duration>
88+ <file>.ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg</file>
89+ </static>
90+ <transition>
91+ <duration>5.0</duration>
92+ <from>.ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg</from>
93+ <to>.larung_gar_by_night_by_Geza_Radics.jpg</to>
94+ </transition>
95+ <static>
96+ <duration>1795.0</duration>
97+ <file>.larung_gar_by_night_by_Geza_Radics.jpg</file>
98+ </static>
99+ <transition>
100+ <duration>5.0</duration>
101+ <from>.larung_gar_by_night_by_Geza_Radics.jpg</from>
102+ <to>.DSC3907_by_Todor_Velichkov.jpg</to>
103+ </transition>
104+ <static>
105+ <duration>1795.0</duration>
106+ <file>.DSC3907_by_Todor_Velichkov.jpg</file>
107+ </static>
108+ <transition>
109+ <duration>5.0</duration>
110+ <from>.DSC3907_by_Todor_Velichkov.jpg</from>
111+ <to>.Wanaka_Tree_by_Stephane_Pakula.jpg</to>
112+ </transition>
113+ <static>
114+ <duration>1795.0</duration>
115+ <file>.Wanaka_Tree_by_Stephane_Pakula.jpg</file>
116+ </static>
117+ <transition>
118+ <duration>5.0</duration>
119+ <from>.Wanaka_Tree_by_Stephane_Pakula.jpg</from>
120+ <to>.IMG_7632_by_Jobin_Babu.jpg</to>
121+ </transition>
122+ <static>
123+ <duration>1795.0</duration>
124+ <file>.IMG_7632_by_Jobin_Babu.jpg</file>
125+ </static>
126+ <transition>
127+ <duration>5.0</duration>
128+ <from>.IMG_7632_by_Jobin_Babu.jpg</from>
129+ <to>.IMG_0081_by_Jobin_Babu.jpg</to>
130+ </transition>
131+ <static>
132+ <duration>1795.0</duration>
133+ <file>.IMG_0081_by_Jobin_Babu.jpg</file>
134+ </static>
135+ <transition>
136+ <duration>5.0</duration>
137+ <from>.IMG_0081_by_Jobin_Babu.jpg</from>
138+ <to>.Alien_wing_by_Ralph_Crützen.jpg</to>
139+ </transition>
140+ <static>
141+ <duration>1795.0</duration>
142+ <file>.Alien_wing_by_Ralph_Crützen.jpg</file>
143+ </static>
144+ <transition>
145+ <duration>5.0</duration>
146+ <from>.Alien_wing_by_Ralph_Crützen.jpg</from>
147+ <to>.Haukland_Beach_view_by_Michele_Agostini.jpg</to>
148+ </transition>
149+ <static>
150+ <duration>1795.0</duration>
151+ <file>.Haukland_Beach_view_by_Michele_Agostini.jpg</file>
152+ </static>
153+ <transition>
154+ <duration>5.0</duration>
155+ <from>.Haukland_Beach_view_by_Michele_Agostini.jpg</from>
156+ <to>.P1310728_by_Ferran_Reyes.jpg</to>
157+ </transition>
158+ <static>
159+ <duration>1795.0</duration>
160+ <file>.P1310728_by_Ferran_Reyes.jpg</file>
161+ </static>
162+ <transition>
163+ <duration>5.0</duration>
164+ <from>.P1310728_by_Ferran_Reyes.jpg</from>
165+ <to>.ubuntu16_10_by_Khoir_Rudin.png</to>
166+ </transition>
167+ <static>
168+ <duration>1795.0</duration>
169+ <file>.ubuntu16_10_by_Khoir_Rudin.png</file>
170+ </static>
171+ <transition>
172+ <duration>5.0</duration>
173+ <from>.ubuntu16_10_by_Khoir_Rudin.png</from>
174+ <to>.Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg</to>
175+ </transition>
176+</background>
177
178=== modified file 'debian/changelog'
179--- debian/changelog 2016-09-08 17:57:08 +0000
180+++ debian/changelog 2016-10-05 06:47:52 +0000
181@@ -1,3 +1,10 @@
182+ubuntu-wallpapers (16.10.0-0ubuntu2) UNRELEASED; urgency=medium
183+
184+ * Add winning entries from the Ubuntu 16.10 Free Culture Showcase.
185+ * AUTHORS: Re-add Iain Lane as a contributor.
186+
187+ -- Nathan Haines <nhaines@ubuntu.com> Tue, 04 Oct 2016 23:32:34 -0700
188+
189 ubuntu-wallpapers (16.10.0-0ubuntu1) yakkety; urgency=medium
190
191 * New default wallpapers for 16.10 (LP: #1621413)
192
193=== modified file 'debian/control'
194--- debian/control 2016-09-08 17:39:36 +0000
195+++ debian/control 2016-10-05 06:47:52 +0000
196@@ -16,8 +16,7 @@
197 Package: ubuntu-wallpapers
198 Architecture: all
199 Section: metapackages
200-Depends: ubuntu-wallpapers-xenial,
201- ubuntu-wallpapers-yakkety,
202+Depends: ubuntu-wallpapers-yakkety,
203 ${misc:Depends},
204 Suggests: ubuntu-wallpapers-karmic,
205 ubuntu-wallpapers-lucid,
206@@ -32,6 +31,7 @@
207 ubuntu-wallpapers-utopic,
208 ubuntu-wallpapers-vivid,
209 ubuntu-wallpapers-wily,
210+ ubuntu-wallpapers-xenial,
211 Description: Ubuntu Wallpapers
212 The default Ubuntu wallpaper. This is also a meta-package depending on the
213 other default wallpapers for the current Ubuntu release.
214
215=== modified file 'debian/copyright'
216--- debian/copyright 2016-04-07 06:57:04 +0000
217+++ debian/copyright 2016-10-05 06:47:52 +0000
218@@ -12,6 +12,15 @@
219 Night_lights_by_Alberto_Salvia_Novella.jpg
220 passion_flower_by_Irene_Gr.jpg
221 TCP118v1_by_Tiziano_Consonni.jpg
222+ Alien_wing_by_Ralph_Crützen.jpg
223+ Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg
224+ DSC3907_by_Todor_Velichkov.jpg
225+ Haukland_Beach_view_by_Michele_Agostini.jpg
226+ IMG_0081_by_Jobin_Babu.jpg
227+ IMG_7632_by_Jobin_Babu.jpg
228+ P1310728_by_Ferran_Reyes.jpg
229+ ubuntu16_10_by_Khoir_Rudin.png
230+ Wanaka_Tree_by_Stephane_Pakula.jpg
231 Copyright: Pierre Cante
232 Marek Koteluk
233 Eduardo Diez Viñuela
234@@ -22,6 +31,14 @@
235 Alberto Salvia Novella
236 Irene Gr
237 Tiziano Consonni
238+ Ralph Crützen
239+ Sten Jørgen Pettersen
240+ Todor Velichkov
241+ Michele Agostini
242+ Jobin Babu
243+ Ferran Reyes
244+ Khoir Rudin
245+ Stephane Pakula
246 License: CC-BY-SA-2.0
247 This work is licensed under the Creative Commons Attribution-ShareAlike 2.0
248 Generic License. To view a copy of this license, visit
249@@ -30,7 +47,6 @@
250
251 Files: Spring_by_Peter_Apas.jpg
252 The_Land_of_Edonias_by_Γιωργος_Αργυροπουλος.jpg
253-
254 Copyright: Peter Apas
255 Γιωργος Αργυροπουλος
256 License: CC-BY-2.0
257@@ -39,6 +55,19 @@
258 https://creativecommons.org/licenses/by/2.0/ or send a letter to Creative
259 Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
260
261+Files: larung_gar_by_night_by_Geza_Radics.jpg
262+ Yala_mountain_by_Geza_Radics.jpg
263+ ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg
264+Copyright: Geza Radics
265+ screen_name_007
266+License: CC0
267+ To the extent possible under law, the author(s) have dedicated all copyright
268+ and related and neighboring rights to this software to the public domain
269+ worldwide. This software is distributed without any warranty.
270+
271+ You should have received a copy of the CC0 Public Domain Dedication along with
272+ this software. If not, see http://creativecommons.org/publicdomain/zero/1.0/
273+
274 Files: *
275 debian/*
276 warty-final-ubuntu.png
277
278=== modified file 'debian/ubuntu-wallpapers-yakkety.install'
279--- debian/ubuntu-wallpapers-yakkety.install 2016-09-08 17:39:36 +0000
280+++ debian/ubuntu-wallpapers-yakkety.install 2016-10-05 06:47:52 +0000
281@@ -1,2 +1,16 @@
282 usr/share/backgrounds/Yak_Wallpaper_Grey_4096x2304.png
283+usr/share/backgrounds/Alien_wing_by_Ralph_Crützen.jpg
284+usr/share/backgrounds/Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg
285+usr/share/backgrounds/DSC3907_by_Todor_Velichkov.jpg
286+usr/share/backgrounds/Haukland_Beach_view_by_Michele_Agostini.jpg
287+usr/share/backgrounds/IMG_0081_by_Jobin_Babu.jpg
288+usr/share/backgrounds/IMG_7632_by_Jobin_Babu.jpg
289+usr/share/backgrounds/larung_gar_by_night_by_Geza_Radics.jpg
290+usr/share/backgrounds/P1310728_by_Ferran_Reyes.jpg
291+usr/share/backgrounds/ubuntu16_10_by_Khoir_Rudin.png
292+usr/share/backgrounds/ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg
293+usr/share/backgrounds/Wanaka_Tree_by_Stephane_Pakula.jpg
294+usr/share/backgrounds/Yala_mountain_by_Geza_Radics.jpg
295+usr/share/backgrounds/contest/yakkety.xml
296 usr/share/gnome-background-properties/yakkety-wallpapers.xml
297+
298
299=== added file 'larung_gar_by_night_by_Geza_Radics.jpg'
300Binary files larung_gar_by_night_by_Geza_Radics.jpg 1970-01-01 00:00:00 +0000 and larung_gar_by_night_by_Geza_Radics.jpg 2016-10-05 06:47:52 +0000 differ
301=== added file 'ubuntu16_10_by_Khoir_Rudin.png'
302Binary files ubuntu16_10_by_Khoir_Rudin.png 1970-01-01 00:00:00 +0000 and ubuntu16_10_by_Khoir_Rudin.png 2016-10-05 06:47:52 +0000 differ
303=== added file 'ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg'
304Binary files ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg 1970-01-01 00:00:00 +0000 and ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg 2016-10-05 06:47:52 +0000 differ
305=== modified file 'yakkety-wallpapers.xml.in'
306--- yakkety-wallpapers.xml.in 2016-09-08 17:43:41 +0000
307+++ yakkety-wallpapers.xml.in 2016-10-05 06:47:52 +0000
308@@ -1,12 +1,97 @@
309 <?xml version="1.0"?>
310 <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
311 <wallpapers>
312- <wallpaper>
313- <_name>Ubuntu Greyscale (Yakkety)</_name>
314- <filename>/usr/share/backgrounds/Yak_Wallpaper_Grey_4096x2304.png</filename>
315- <options>zoom</options>
316- <pcolor>#ececec</pcolor>
317- <scolor>#ececec</scolor>
318- <shade_type>solid</shade_type>
319- </wallpaper>
320+ <wallpaper deleted="false">
321+ <name>Ubuntu 16.10 Community Wallpapers</name>
322+ <filename>/usr/share/backgrounds/contest/xenial.xml</filename>
323+ <options>zoom</options>
324+ </wallpaper>
325+ <wallpaper>
326+ <_name>Alien wing</_name>
327+ <filename>/usr/share/backgrounds/Alien_wing_by_Ralph_Crützen.jpg</filename>
328+ <options>zoom</options>
329+ <pcolor>#000000</pcolor>
330+ <scolor>#000000</scolor>
331+ <shade_type>solid</shade_type>
332+ </wallpaper>
333+ <wallpaper>
334+ <_name>Classic Guitar Detail</_name>
335+ <filename>/usr/share/backgrounds/Classic_Guitar_Detail_by_Sten_Jørgen_Pettersen.jpg</filename>
336+ <options>zoom</options>
337+ <pcolor>#000000</pcolor>
338+ <scolor>#000000</scolor>
339+ <shade_type>solid</shade_type>
340+ </wallpaper>
341+ <wallpaper>
342+ <_name>DSC3907</_name>
343+ <filename>/usr/share/backgrounds/DSC3907_by_Todor_Velichkov.jpg</filename>
344+ <options>zoom</options>
345+ <pcolor>#000000</pcolor>
346+ <scolor>#000000</scolor>
347+ <shade_type>solid</shade_type>
348+ </wallpaper>
349+ <wallpaper>
350+ <_name>Haukland Beach view</_name>
351+ <filename>/usr/share/backgrounds/Haukland_Beach_view_by_Michele_Agostini.jpg</filename>
352+ <options>zoom</options>
353+ <pcolor>#000000</pcolor>
354+ <scolor>#000000</scolor>
355+ <shade_type>solid</shade_type>
356+ </wallpaper>
357+ <wallpaper>
358+ <_name>IMG 0081</_name>
359+ <filename>/usr/share/backgrounds/IMG_0081_by_Jobin_Babu.jpg</filename>
360+ <options>zoom</options>
361+ <pcolor>#000000</pcolor>
362+ <scolor>#000000</scolor>
363+ <shade_type>solid</shade_type>
364+ </wallpaper>
365+ <wallpaper>
366+ <_name>IMG 7632</_name>
367+ <filename>/usr/share/backgrounds/IMG_7632_by_Jobin_Babu.jpg</filename>
368+ <options>zoom</options>
369+ <pcolor>#000000</pcolor>
370+ <scolor>#000000</scolor>
371+ <shade_type>solid</shade_type>
372+ </wallpaper>
373+ <wallpaper>
374+ <_name>larung gar by night</_name>
375+ <filename>/usr/share/backgrounds/larung_gar_by_night_by_Geza_Radics.jpg</filename>
376+ <options>zoom</options>
377+ <pcolor>#000000</pcolor>
378+ <scolor>#000000</scolor>
379+ <shade_type>solid</shade_type>
380+ </wallpaper>
381+ <wallpaper>
382+ <_name>P1310728</_name>
383+ <filename>/usr/share/backgrounds/P1310728_by_Ferran_Reyes.jpg</filename>
384+ <options>zoom</options>
385+ <pcolor>#000000</pcolor>
386+ <scolor>#000000</scolor>
387+ <shade_type>solid</shade_type>
388+ </wallpaper>
389+ <wallpaper>
390+ <_name>ubuntu wallpaper 16 10 02</_name>
391+ <filename>/usr/share/backgrounds/ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg</filename>
392+ <options>zoom</options>
393+ <pcolor>#000000</pcolor>
394+ <scolor>#000000</scolor>
395+ <shade_type>solid</shade_type>
396+ </wallpaper>
397+ <wallpaper>
398+ <_name>Wanaka Tree</_name>
399+ <filename>/usr/share/backgrounds/Wanaka_Tree_by_Stephane_Pakula.jpg</filename>
400+ <options>zoom</options>
401+ <pcolor>#000000</pcolor>
402+ <scolor>#000000</scolor>
403+ <shade_type>solid</shade_type>
404+ </wallpaper>
405+ <wallpaper>
406+ <_name>Yala mountain</_name>
407+ <filename>/usr/share/backgrounds/Yala_mountain_by_Geza_Radics.jpg</filename>
408+ <options>zoom</options>
409+ <pcolor>#000000</pcolor>
410+ <scolor>#000000</scolor>
411+ <shade_type>solid</shade_type>
412+ </wallpaper>
413 </wallpapers>