Merge lp:~osomon/ubuntu-wallpapers/eoan-community-wallpapers into lp:ubuntu-wallpapers

Proposed by Olivier Tilloy on 2019-09-25
Status: Merged
Merged at revision: 292
Proposed branch: lp:~osomon/ubuntu-wallpapers/eoan-community-wallpapers
Merge into: lp:ubuntu-wallpapers
Diff against target: 412 lines (+275/-4)
9 files modified
contest/eoan.xml (+101/-0)
debian/changelog (+8/-0)
debian/control (+11/-1)
debian/copyright (+24/-0)
debian/ubuntu-wallpapers-eoan.install (+12/-0)
debian/ubuntu-wallpapers.install (+0/-2)
eoan-wallpapers.xml.in (+81/-0)
po/POTFILES.in (+1/-0)
po/ubuntu-wallpapers.pot (+37/-1)
To merge this branch: bzr merge lp:~osomon/ubuntu-wallpapers/eoan-community-wallpapers
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers 2019-09-25 Pending
Review via email: mp+373202@code.launchpad.net

Commit message

* Add Free Culture Showcase winners for 19.10 (LP: #1845188).
* Move the greyscale ermine to ubuntu-wallpapers-eoan (add B&R to ubuntu-wallpapers for this file move).

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=== added file 'Beijling_park_burial_path_by_Mattias_Andersson.jpg'
2Binary files Beijling_park_burial_path_by_Mattias_Andersson.jpg 1970-01-01 00:00:00 +0000 and Beijling_park_burial_path_by_Mattias_Andersson.jpg 2019-09-25 13:30:31 +0000 differ
3=== added file 'Ermine_lines_by_Gustavo_Brenner.png'
4Binary files Ermine_lines_by_Gustavo_Brenner.png 1970-01-01 00:00:00 +0000 and Ermine_lines_by_Gustavo_Brenner.png 2019-09-25 13:30:31 +0000 differ
5=== added file 'Flight_dive_by_Nicolas_Silva.png'
6Binary files Flight_dive_by_Nicolas_Silva.png 1970-01-01 00:00:00 +0000 and Flight_dive_by_Nicolas_Silva.png 2019-09-25 13:30:31 +0000 differ
7=== added file 'Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg'
8Binary files Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg 1970-01-01 00:00:00 +0000 and Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg 2019-09-25 13:30:31 +0000 differ
9=== added file 'Origin_of_nature_by_Julian_Tomasini.jpg'
10Binary files Origin_of_nature_by_Julian_Tomasini.jpg 1970-01-01 00:00:00 +0000 and Origin_of_nature_by_Julian_Tomasini.jpg 2019-09-25 13:30:31 +0000 differ
11=== added file 'Sky_Sparkles_by_Joe_Thompson.jpg'
12Binary files Sky_Sparkles_by_Joe_Thompson.jpg 1970-01-01 00:00:00 +0000 and Sky_Sparkles_by_Joe_Thompson.jpg 2019-09-25 13:30:31 +0000 differ
13=== added file 'Stargazing_by_Marcel_Kächele.jpg'
14Binary files Stargazing_by_Marcel_Kächele.jpg 1970-01-01 00:00:00 +0000 and Stargazing_by_Marcel_Kächele.jpg 2019-09-25 13:30:31 +0000 differ
15=== added file 'Ubuntu_80s_glitch_by_Abubakar_NK.jpg'
16Binary files Ubuntu_80s_glitch_by_Abubakar_NK.jpg 1970-01-01 00:00:00 +0000 and Ubuntu_80s_glitch_by_Abubakar_NK.jpg 2019-09-25 13:30:31 +0000 differ
17=== added file 'Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg'
18Binary files Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg 1970-01-01 00:00:00 +0000 and Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg 2019-09-25 13:30:31 +0000 differ
19=== added file 'contest/eoan.xml'
20--- contest/eoan.xml 1970-01-01 00:00:00 +0000
21+++ contest/eoan.xml 2019-09-25 13:30:31 +0000
22@@ -0,0 +1,101 @@
23+<background>
24+ <starttime>
25+ <year>2009</year>
26+ <month>08</month>
27+ <day>04</day>
28+ <hour>00</hour>
29+ <minute>00</minute>
30+ <second>00</second>
31+ </starttime>
32+<!-- This animation will start at midnight. -->
33+ <static>
34+ <duration>1795.0</duration>
35+ <file>/usr/share/backgrounds/Ermine_Wallpaper_Grey_4096x2304.png</file>
36+ </static>
37+ <transition>
38+ <duration>5.0</duration>
39+ <from>/usr/share/backgrounds/Ermine_Wallpaper_Grey_4096x2304.png</from>
40+ <to>/usr/share/backgrounds/Sky_Sparkles_by_Joe_Thompson.jpg</to>
41+ </transition>
42+ <static>
43+ <duration>1795.0</duration>
44+ <file>/usr/share/backgrounds/Sky_Sparkles_by_Joe_Thompson.jpg</file>
45+ </static>
46+ <transition>
47+ <duration>5.0</duration>
48+ <from>/usr/share/backgrounds/Sky_Sparkles_by_Joe_Thompson.jpg</from>
49+ <to>/usr/share/backgrounds/Ubuntu_80s_glitch_by_Abubakar_NK.jpg</to>
50+ </transition>
51+ <static>
52+ <duration>1795.0</duration>
53+ <file>/usr/share/backgrounds/Ubuntu_80s_glitch_by_Abubakar_NK.jpg</file>
54+ </static>
55+ <transition>
56+ <duration>5.0</duration>
57+ <from>/usr/share/backgrounds/Ubuntu_80s_glitch_by_Abubakar_NK.jpg</from>
58+ <to>/usr/share/backgrounds/Origin_of_nature_by_Julian_Tomasini.jpg</to>
59+ </transition>
60+ <static>
61+ <duration>1795.0</duration>
62+ <file>/usr/share/backgrounds/Origin_of_nature_by_Julian_Tomasini.jpg</file>
63+ </static>
64+ <transition>
65+ <duration>5.0</duration>
66+ <from>/usr/share/backgrounds/Origin_of_nature_by_Julian_Tomasini.jpg</from>
67+ <to>/usr/share/backgrounds/Beijling_park_burial_path_by_Mattias_Andersson.jpg</to>
68+ </transition>
69+ <static>
70+ <duration>1795.0</duration>
71+ <file>/usr/share/backgrounds/Beijling_park_burial_path_by_Mattias_Andersson.jpg</file>
72+ </static>
73+ <transition>
74+ <duration>5.0</duration>
75+ <from>/usr/share/backgrounds/Beijling_park_burial_path_by_Mattias_Andersson.jpg</from>
76+ <to>/usr/share/backgrounds/Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg</to>
77+ </transition>
78+ <static>
79+ <duration>1795.0</duration>
80+ <file>/usr/share/backgrounds/Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg</file>
81+ </static>
82+ <transition>
83+ <duration>5.0</duration>
84+ <from>/usr/share/backgrounds/Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg</from>
85+ <to>/usr/share/backgrounds/Stargazing_by_Marcel_Kächele.jpg</to>
86+ </transition>
87+ <static>
88+ <duration>1795.0</duration>
89+ <file>/usr/share/backgrounds/Stargazing_by_Marcel_Kächele.jpg</file>
90+ </static>
91+ <transition>
92+ <duration>5.0</duration>
93+ <from>/usr/share/backgrounds/Stargazing_by_Marcel_Kächele.jpg</from>
94+ <to>/usr/share/backgrounds/Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg</to>
95+ </transition>
96+ <static>
97+ <duration>1795.0</duration>
98+ <file>/usr/share/backgrounds/Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg</file>
99+ </static>
100+ <transition>
101+ <duration>5.0</duration>
102+ <from>/usr/share/backgrounds/Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg</from>
103+ <to>/usr/share/backgrounds/Flight_dive_by_Nicolas_Silva.png</to>
104+ </transition>
105+ <static>
106+ <duration>1795.0</duration>
107+ <file>/usr/share/backgrounds/Flight_dive_by_Nicolas_Silva.png</file>
108+ </static>
109+ <transition>
110+ <duration>5.0</duration>
111+ <from>/usr/share/backgrounds/Flight_dive_by_Nicolas_Silva.png</from>
112+ <to>/usr/share/backgrounds/Ermine_lines_by_Gustavo_Brenner.png</to>
113+ </transition>
114+ <static>
115+ <duration>1795.0</duration>
116+ <file>/usr/share/backgrounds/Ermine_lines_by_Gustavo_Brenner.png</file>
117+ </static>
118+ <transition>
119+ <duration>5.0</duration>
120+ <from>/usr/share/backgrounds/Ermine_lines_by_Gustavo_Brenner.png</from>
121+ <to>/usr/share/backgrounds/Ermine_Wallpaper_Grey_4096x2304.png</to>
122+ </transition>
123+</background>
124
125=== modified file 'debian/changelog'
126--- debian/changelog 2019-09-13 16:20:35 +0000
127+++ debian/changelog 2019-09-25 13:30:31 +0000
128@@ -1,3 +1,11 @@
129+ubuntu-wallpapers (19.10.2-0ubuntu1) UNRELEASED; urgency=medium
130+
131+ * Add Free Culture Showcase winners for 19.10 (LP: #1845188).
132+ * Move the greyscale ermine to ubuntu-wallpapers-eoan (add B&R to
133+ ubuntu-wallpapers for this file move).
134+
135+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Wed, 25 Sep 2019 10:19:29 +0200
136+
137 ubuntu-wallpapers (19.10.1-0ubuntu1) eoan; urgency=medium
138
139 * New default wallpapers for disco (LP: #1843798).
140
141=== modified file 'debian/control'
142--- debian/control 2019-03-27 21:42:08 +0000
143+++ debian/control 2019-09-25 13:30:31 +0000
144@@ -13,7 +13,7 @@
145 Package: ubuntu-wallpapers
146 Architecture: all
147 Section: metapackages
148-Depends: ubuntu-wallpapers-disco,
149+Depends: ubuntu-wallpapers-eoan,
150 ${misc:Depends},
151 Suggests: ubuntu-wallpapers-karmic,
152 ubuntu-wallpapers-lucid,
153@@ -34,6 +34,7 @@
154 ubuntu-wallpapers-artful,
155 ubuntu-wallpapers-bionic,
156 ubuntu-wallpapers-cosmic,
157+ ubuntu-wallpapers-disco,
158 Description: Ubuntu Wallpapers
159 The default Ubuntu wallpaper. This is also a meta-package depending on the
160 other default wallpapers for the current Ubuntu release.
161@@ -169,3 +170,12 @@
162 Description: Ubuntu 19.04 Wallpapers
163 Wallpapers from the Ubuntu 19.04 community contest and a Canonical-created
164 greyscale wallpaper.
165+
166+Package: ubuntu-wallpapers-eoan
167+Architecture: all
168+Depends: ${misc:Depends},
169+Breaks: ubuntu-wallpapers (<= 19.10.2)
170+Replaces: ubuntu-wallpapers (<= 19.10.2)
171+Description: Ubuntu 19.10 Wallpapers
172+ Wallpapers from the Ubuntu 19.10 community contest and a Canonical-created
173+ greyscale wallpaper.
174
175=== modified file 'debian/copyright'
176--- debian/copyright 2019-09-13 16:20:31 +0000
177+++ debian/copyright 2019-09-25 13:30:31 +0000
178@@ -176,25 +176,41 @@
179 Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
180
181 Files: 80s_Disco_Dingo_Simulation_by_Abubakar_NK.jpg
182+ Beijling_park_burial_path_by_Mattias_Andersson.jpg
183 Capucijnengang_by_Artem_Kavalerov.jpg
184 Cramond_Island_by_Keanu_Kerr.jpg
185 Disco_Dingo_Alt_Default_by_Abubakar_NK.png
186+ Ermine_lines_by_Gustavo_Brenner.png
187+ Flight_dive_by_Nicolas_Silva.png
188 Flower_Gate_Bridge_by_Michele_Agostini.jpg
189+ Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg
190 On_the_harbour_by_Víctor_Fernández_Rico.jpg
191+ Origin_of_nature_by_Julian_Tomasini.jpg
192+ Sky_Sparkles_by_Joe_Thompson.jpg
193 Staniel_Cay_by_Joseph_Bylund.jpg
194 Sunset_of_Peloponnesus_by_Simos_Xenitellis.jpg
195 Tennis_ball_by_Artem_Kavalerov.jpg
196+ Ubuntu_80s_glitch_by_Abubakar_NK.jpg
197+ Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg
198 Water_of_Leith_by_Keanu_Kerr.jpg
199 Copyright: Abubakar NK
200 Artem Kavalerov
201+ Gustavo Brenner
202+ Joe Thompson
203 Joseph Bylund
204+ Julian Tomasini
205 Keanu Kerr
206+ Manuel Arslanyan
207+ Mattias Andersson
208 Michele Agostini
209+ Midge Mantissa Sinnaeve
210+ Nicolas Silva
211 Simos Xenitellis
212 Víctor Fernández Rico
213 License: CC-BY-SA-4.0
214
215 Files: Dingo_Wallpaper_Grey_4096x2304.png
216+ Ermine_Wallpaper_Grey_4096x2304.png
217 Copyright: 2019 Canonical Ltd
218 License: CC-BY-SA-4.0
219
220@@ -203,3 +219,11 @@
221 International Public License. To view a copy of this license, visit
222 https://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative
223 Commons, PO Box 1866, Mountain View, CA 94042, USA.
224+
225+Files: Stargazing_by_Marcel_Kächele.jpg
226+Copyright: Marcel Kächele
227+License: CC-BY-4.0
228+ This work is licensed under the Creative Commons Attribution 4.0
229+ International Public License. To view a copy of this license, visit
230+ https://creativecommons.org/licenses/by/4.0/ or send a letter to Creative
231+ Commons, PO Box 1866, Mountain View, CA 94042, USA.
232
233=== added file 'debian/ubuntu-wallpapers-eoan.install'
234--- debian/ubuntu-wallpapers-eoan.install 1970-01-01 00:00:00 +0000
235+++ debian/ubuntu-wallpapers-eoan.install 2019-09-25 13:30:31 +0000
236@@ -0,0 +1,12 @@
237+usr/share/backgrounds/Ermine_Wallpaper_Grey_4096x2304.png
238+usr/share/backgrounds/Beijling_park_burial_path_by_Mattias_Andersson.jpg
239+usr/share/backgrounds/Ermine_lines_by_Gustavo_Brenner.png
240+usr/share/backgrounds/Flight_dive_by_Nicolas_Silva.png
241+usr/share/backgrounds/Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg
242+usr/share/backgrounds/Origin_of_nature_by_Julian_Tomasini.jpg
243+usr/share/backgrounds/Sky_Sparkles_by_Joe_Thompson.jpg
244+usr/share/backgrounds/Stargazing_by_Marcel_Kächele.jpg
245+usr/share/backgrounds/Ubuntu_80s_glitch_by_Abubakar_NK.jpg
246+usr/share/backgrounds/Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg
247+usr/share/gnome-background-properties/eoan-wallpapers.xml
248+usr/share/backgrounds/contest/eoan.xml
249
250=== modified file 'debian/ubuntu-wallpapers.install'
251--- debian/ubuntu-wallpapers.install 2019-09-13 16:18:56 +0000
252+++ debian/ubuntu-wallpapers.install 2019-09-25 13:30:31 +0000
253@@ -1,5 +1,3 @@
254 usr/share/backgrounds/warty-final-ubuntu.png
255 usr/share/gnome-background-properties/ubuntu-wallpapers.xml
256 usr/share/locale
257-
258-usr/share/backgrounds/Ermine_Wallpaper_Grey_4096x2304.png
259
260=== added file 'eoan-wallpapers.xml.in'
261--- eoan-wallpapers.xml.in 1970-01-01 00:00:00 +0000
262+++ eoan-wallpapers.xml.in 2019-09-25 13:30:31 +0000
263@@ -0,0 +1,81 @@
264+<?xml version="1.0"?>
265+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
266+<wallpapers>
267+ <wallpaper deleted="false">
268+ <name>Ubuntu 19.10 Community Wallpapers</name>
269+ <filename>/usr/share/backgrounds/contest/eoan.xml</filename>
270+ <options>zoom</options>
271+ </wallpaper>
272+ <wallpaper>
273+ <_name>Beijling park burial path</_name>
274+ <filename>/usr/share/backgrounds/Beijling_park_burial_path_by_Mattias_Andersson.jpg</filename>
275+ <options>zoom</options>
276+ <pcolor>#000000</pcolor>
277+ <scolor>#000000</scolor>
278+ <shade_type>solid</shade_type>
279+ </wallpaper>
280+ <wallpaper>
281+ <_name>Frozen sunset on the lake</_name>
282+ <filename>/usr/share/backgrounds/Frozen_sunset_on_the_lake_by_Manuel_Arslanyan.jpg</filename>
283+ <options>zoom</options>
284+ <pcolor>#000000</pcolor>
285+ <scolor>#000000</scolor>
286+ <shade_type>solid</shade_type>
287+ </wallpaper>
288+ <wallpaper>
289+ <_name>Origin of nature</_name>
290+ <filename>/usr/share/backgrounds/Origin_of_nature_by_Julian_Tomasini.jpg</filename>
291+ <options>zoom</options>
292+ <pcolor>#000000</pcolor>
293+ <scolor>#000000</scolor>
294+ <shade_type>solid</shade_type>
295+ </wallpaper>
296+ <wallpaper>
297+ <_name>Sky Sparkles</_name>
298+ <filename>/usr/share/backgrounds/Sky_Sparkles_by_Joe_Thompson.jpg</filename>
299+ <options>zoom</options>
300+ <pcolor>#000000</pcolor>
301+ <scolor>#000000</scolor>
302+ <shade_type>solid</shade_type>
303+ </wallpaper>
304+ <wallpaper>
305+ <_name>Stargazing</_name>
306+ <filename>/usr/share/backgrounds/Stargazing_by_Marcel_Kächele.jpg</filename>
307+ <options>zoom</options>
308+ <pcolor>#000000</pcolor>
309+ <scolor>#000000</scolor>
310+ <shade_type>solid</shade_type>
311+ </wallpaper>
312+ <wallpaper>
313+ <_name>Ubuntu 80s glitch</_name>
314+ <filename>/usr/share/backgrounds/Ubuntu_80s_glitch_by_Abubakar_NK.jpg</filename>
315+ <options>zoom</options>
316+ <pcolor>#000000</pcolor>
317+ <scolor>#000000</scolor>
318+ <shade_type>solid</shade_type>
319+ </wallpaper>
320+ <wallpaper>
321+ <_name>Ubuntu gel</_name>
322+ <filename>/usr/share/backgrounds/Ubuntu_gel_by_Midge_Mantissa_Sinnaeve.jpg</filename>
323+ <options>zoom</options>
324+ <pcolor>#000000</pcolor>
325+ <scolor>#000000</scolor>
326+ <shade_type>solid</shade_type>
327+ </wallpaper>
328+ <wallpaper>
329+ <_name>Ermine lines</_name>
330+ <filename>/usr/share/backgrounds/Ermine_lines_by_Gustavo_Brenner.png</filename>
331+ <options>zoom</options>
332+ <pcolor>#000000</pcolor>
333+ <scolor>#000000</scolor>
334+ <shade_type>solid</shade_type>
335+ </wallpaper>
336+ <wallpaper>
337+ <_name>Flight dive</_name>
338+ <filename>/usr/share/backgrounds/Flight_dive_by_Nicolas_Silva.png</filename>
339+ <options>zoom</options>
340+ <pcolor>#000000</pcolor>
341+ <scolor>#000000</scolor>
342+ <shade_type>solid</shade_type>
343+ </wallpaper>
344+</wallpapers>
345
346=== modified file 'po/POTFILES.in'
347--- po/POTFILES.in 2019-03-27 21:42:08 +0000
348+++ po/POTFILES.in 2019-09-25 13:30:31 +0000
349@@ -3,6 +3,7 @@
350 bionic-wallpapers.xml.in
351 cosmic-wallpapers.xml.in
352 disco-wallpapers.xml.in
353+eoan-wallpapers.xml.in
354 karmic-wallpapers.xml.in
355 lucid-wallpapers.xml.in
356 maverick-wallpapers.xml.in
357
358=== modified file 'po/ubuntu-wallpapers.pot'
359--- po/ubuntu-wallpapers.pot 2019-03-27 21:42:08 +0000
360+++ po/ubuntu-wallpapers.pot 2019-09-25 13:30:31 +0000
361@@ -8,7 +8,7 @@
362 msgstr ""
363 "Project-Id-Version: PACKAGE VERSION\n"
364 "Report-Msgid-Bugs-To: \n"
365-"POT-Creation-Date: 2019-03-27 22:32+0100\n"
366+"POT-Creation-Date: 2019-09-25 11:57+0200\n"
367 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
368 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
369 "Language-Team: LANGUAGE <LL@li.org>\n"
370@@ -205,6 +205,42 @@
371 msgid "Disco Dingo Alt Default"
372 msgstr ""
373
374+#: ../eoan-wallpapers.xml.in.h:1
375+msgid "Beijling park burial path"
376+msgstr ""
377+
378+#: ../eoan-wallpapers.xml.in.h:2
379+msgid "Frozen sunset on the lake"
380+msgstr ""
381+
382+#: ../eoan-wallpapers.xml.in.h:3
383+msgid "Origin of nature"
384+msgstr ""
385+
386+#: ../eoan-wallpapers.xml.in.h:4
387+msgid "Sky Sparkles"
388+msgstr ""
389+
390+#: ../eoan-wallpapers.xml.in.h:5
391+msgid "Stargazing"
392+msgstr ""
393+
394+#: ../eoan-wallpapers.xml.in.h:6
395+msgid "Ubuntu 80s glitch"
396+msgstr ""
397+
398+#: ../eoan-wallpapers.xml.in.h:7
399+msgid "Ubuntu gel"
400+msgstr ""
401+
402+#: ../eoan-wallpapers.xml.in.h:8
403+msgid "Ermine lines"
404+msgstr ""
405+
406+#: ../eoan-wallpapers.xml.in.h:9
407+msgid "Flight dive"
408+msgstr ""
409+
410 #: ../karmic-wallpapers.xml.in.h:1
411 msgid "White Orchid"
412 msgstr ""