ubuntu-wallpapers

Merge lp:~dholbach/ubuntu-wallpapers/15.10-ubuntu-free-culture-showcase-contest into lp:ubuntu-wallpapers

  1. 15.10-ubuntu-free-culture-showcase-contest
  2. Merge into ubuntu
Proposed by Daniel Holbach
Status: Merged
Merged at revision: 166
Proposed branch: lp:~dholbach/ubuntu-wallpapers/15.10-ubuntu-free-culture-showcase-contest
Merge into: lp:ubuntu-wallpapers
Diff against target: 357 lines (+254/-18)
6 files modified
contest/wily.xml (+101/-0)
debian/changelog (+6/-0)
debian/control (+9/-2)
debian/copyright (+37/-16)
debian/ubuntu-wallpapers-wily.install (+12/-0)
wily-wallpapers.xml.in (+89/-0)
To merge this branch: bzr merge lp:~dholbach/ubuntu-wallpapers/15.10-ubuntu-free-culture-showcase-contest
Reviewer Review Type Date Requested Status
Nathan Haines (community) Approve
Iain Lane Approve
Review via email: mp+272901@code.launchpad.net

Commit message

Add wily wallpapers from Ubuntu Free Culture Showcase competition.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

To get the files into our size limits, I ran
  convert -adaptive-resize '2560x1600' -quality 90 inputfile outputfile.jpg
on them.

Revision history for this message
Iain Lane (laney) wrote :

I was expecting to do this but it's cool that you did.

Looks good to me in packaging terms.

One thing is that I was going to put the images into release directories, as having them all at the top level is becoming unwieldy.

How come this year's contest has used a different version of the license?

review: Approve
Revision history for this message
Daniel Holbach (dholbach) wrote :

Sure, putting things into separate directories makes sense.

I was just using what I got passed on from Nathan in terms of license.

Revision history for this message
Nathan Haines (nhaines) wrote :

Flickr still uses the 2.0 license explicitly, and this was the only information I had to go on from the authors.

Thanks, Daniel, for getting everything packaged up. All the images are correct and look great.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'Abstract_Ubuntu_by_Marek_Koteluk.jpg'
0Binary files Abstract_Ubuntu_by_Marek_Koteluk.jpg 1970-01-01 00:00:00 +0000 and Abstract_Ubuntu_by_Marek_Koteluk.jpg 2015-09-30 12:24:07 +0000 differ0Binary files Abstract_Ubuntu_by_Marek_Koteluk.jpg 1970-01-01 00:00:00 +0000 and Abstract_Ubuntu_by_Marek_Koteluk.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'Blue_by_dariuskws.jpg'
1Binary files Blue_by_dariuskws.jpg 1970-01-01 00:00:00 +0000 and Blue_by_dariuskws.jpg 2015-09-30 12:24:07 +0000 differ1Binary files Blue_by_dariuskws.jpg 1970-01-01 00:00:00 +0000 and Blue_by_dariuskws.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'Breaker_by_Lyle_Nel.jpg'
2Binary files Breaker_by_Lyle_Nel.jpg 1970-01-01 00:00:00 +0000 and Breaker_by_Lyle_Nel.jpg 2015-09-30 12:24:07 +0000 differ2Binary files Breaker_by_Lyle_Nel.jpg 1970-01-01 00:00:00 +0000 and Breaker_by_Lyle_Nel.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'Hotel_by_sarcasmrules2011.jpg'
3Binary files Hotel_by_sarcasmrules2011.jpg 1970-01-01 00:00:00 +0000 and Hotel_by_sarcasmrules2011.jpg 2015-09-30 12:24:07 +0000 differ3Binary files Hotel_by_sarcasmrules2011.jpg 1970-01-01 00:00:00 +0000 and Hotel_by_sarcasmrules2011.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'Mediterranean_Sea_by_simosx.jpg'
4Binary files Mediterranean_Sea_by_simosx.jpg 1970-01-01 00:00:00 +0000 and Mediterranean_Sea_by_simosx.jpg 2015-09-30 12:24:07 +0000 differ4Binary files Mediterranean_Sea_by_simosx.jpg 1970-01-01 00:00:00 +0000 and Mediterranean_Sea_by_simosx.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'Moss_inflorescence_by_carmelo75.jpg'
5Binary files Moss_inflorescence_by_carmelo75.jpg 1970-01-01 00:00:00 +0000 and Moss_inflorescence_by_carmelo75.jpg 2015-09-30 12:24:07 +0000 differ5Binary files Moss_inflorescence_by_carmelo75.jpg 1970-01-01 00:00:00 +0000 and Moss_inflorescence_by_carmelo75.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'P5160283_by_Dariusz_Duma.jpg'
6Binary files P5160283_by_Dariusz_Duma.jpg 1970-01-01 00:00:00 +0000 and P5160283_by_Dariusz_Duma.jpg 2015-09-30 12:24:07 +0000 differ6Binary files P5160283_by_Dariusz_Duma.jpg 1970-01-01 00:00:00 +0000 and P5160283_by_Dariusz_Duma.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg'
7Binary files Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg 1970-01-01 00:00:00 +0000 and Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg 2015-09-30 12:24:07 +0000 differ7Binary files Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg 1970-01-01 00:00:00 +0000 and Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'Tramonto_a_Scalea_by_Renatvs88.jpg'
8Binary files Tramonto_a_Scalea_by_Renatvs88.jpg 1970-01-01 00:00:00 +0000 and Tramonto_a_Scalea_by_Renatvs88.jpg 2015-09-30 12:24:07 +0000 differ8Binary files Tramonto_a_Scalea_by_Renatvs88.jpg 1970-01-01 00:00:00 +0000 and Tramonto_a_Scalea_by_Renatvs88.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'Tranquil_by_Pat_David.jpg'
9Binary files Tranquil_by_Pat_David.jpg 1970-01-01 00:00:00 +0000 and Tranquil_by_Pat_David.jpg 2015-09-30 12:24:07 +0000 differ9Binary files Tranquil_by_Pat_David.jpg 1970-01-01 00:00:00 +0000 and Tranquil_by_Pat_David.jpg 2015-09-30 12:24:07 +0000 differ
=== added file 'contest/wily.xml'
--- contest/wily.xml 1970-01-01 00:00:00 +0000
+++ contest/wily.xml 2015-09-30 12:24:07 +0000
@@ -0,0 +1,101 @@
1<background>
2 <starttime>
3 <year>2009</year>
4 <month>08</month>
5 <day>04</day>
6 <hour>00</hour>
7 <minute>00</minute>
8 <second>00</second>
9 </starttime>
10<!-- This animation will start at midnight. -->
11 <static>
12 <duration>1795.0</duration>
13 <file>/usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg</file>
14 </static>
15 <transition>
16 <duration>5.0</duration>
17 <from>/usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg</from>
18 <to>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</to>
19 </transition>
20 <static>
21 <duration>1795.0</duration>
22 <file>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</file>
23 </static>
24 <transition>
25 <duration>5.0</duration>
26 <from>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</from>
27 <to>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</to>
28 </transition>
29 <static>
30 <duration>1795.0</duration>
31 <file>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</file>
32 </static>
33 <transition>
34 <duration>5.0</duration>
35 <from>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</from>
36 <to>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</to>
37 </transition>
38 <static>
39 <duration>1795.0</duration>
40 <file>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</file>
41 </static>
42 <transition>
43 <duration>5.0</duration>
44 <from>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</from>
45 <to>/usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg</to>
46 </transition>
47 <static>
48 <duration>1795.0</duration>
49 <file>/usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg</file>
50 </static>
51 <transition>
52 <duration>5.0</duration>
53 <from>/usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg</from>
54 <to>/usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg</to>
55 </transition>
56 <static>
57 <duration>1795.0</duration>
58 <file>/usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg</file>
59 </static>
60 <transition>
61 <duration>5.0</duration>
62 <from>/usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg</from>
63 <to>/usr/share/backgrounds/Blue_by_dariuskws.jpg</to>
64 </transition>
65 <static>
66 <duration>1795.0</duration>
67 <file>/usr/share/backgrounds/Blue_by_dariuskws.jpg</file>
68 </static>
69 <transition>
70 <duration>5.0</duration>
71 <from>/usr/share/backgrounds/Blue_by_dariuskws.jpg</from>
72 <to>/usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg</to>
73 </transition>
74 <static>
75 <duration>1795.0</duration>
76 <file>/usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg</file>
77 </static>
78 <transition>
79 <duration>5.0</duration>
80 <from>/usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg</from>
81 <to>/usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg</to>
82 </transition>
83 <static>
84 <duration>1795.0</duration>
85 <file>/usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg</file>
86 </static>
87 <transition>
88 <duration>5.0</duration>
89 <from>/usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg</from>
90 <to>/usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg</to>
91 </transition>
92 <static>
93 <duration>1795.0</duration>
94 <file>/usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg</file>
95 </static>
96 <transition>
97 <duration>5.0</duration>
98 <from>/usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg</from>
99 <to>/usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg</to>
100 </transition>
101</background>
0102
=== modified file 'debian/changelog'
--- debian/changelog 2015-09-29 16:59:59 +0000
+++ debian/changelog 2015-09-30 12:24:07 +0000
@@ -1,3 +1,9 @@
1ubuntu-wallpapers (15.10.2-0ubuntu1) wily; urgency=medium
2
3 * Add winners of wallpaper competition.
4
5 -- Daniel Holbach <daniel.holbach@ubuntu.com> Wed, 30 Sep 2015 12:28:09 +0200
6
1ubuntu-wallpapers (15.10.1-0ubuntu1) wily; urgency=medium7ubuntu-wallpapers (15.10.1-0ubuntu1) wily; urgency=medium
28
3 * Apply some lossless crushing using optipng.9 * Apply some lossless crushing using optipng.
410
=== modified file 'debian/control'
--- debian/control 2015-03-11 15:44:52 +0000
+++ debian/control 2015-09-30 12:24:07 +0000
@@ -5,7 +5,7 @@
5Build-Depends: debhelper (>= 9),5Build-Depends: debhelper (>= 9),
6 python (>= 2.6.6-3~),6 python (>= 2.6.6-3~),
7Build-Depends-Indep: python-distutils-extra,7Build-Depends-Indep: python-distutils-extra,
8Standards-Version: 3.9.58Standards-Version: 3.9.6
9Homepage: https://launchpad.net/ubuntu-wallpapers9Homepage: https://launchpad.net/ubuntu-wallpapers
10# If you aren't a member of ~ubuntu-art-pkg but need to upload10# If you aren't a member of ~ubuntu-art-pkg but need to upload
11# packaging changes, just go ahead. ~ubuntu-art-pkg will notice11# packaging changes, just go ahead. ~ubuntu-art-pkg will notice
@@ -16,7 +16,7 @@
16Package: ubuntu-wallpapers16Package: ubuntu-wallpapers
17Architecture: all17Architecture: all
18Section: metapackages18Section: metapackages
19Depends: ubuntu-wallpapers-vivid,19Depends: ubuntu-wallpapers-wily,
20 ${misc:Depends},20 ${misc:Depends},
21Suggests: ubuntu-wallpapers-karmic,21Suggests: ubuntu-wallpapers-karmic,
22 ubuntu-wallpapers-lucid,22 ubuntu-wallpapers-lucid,
@@ -29,6 +29,7 @@
29 ubuntu-wallpapers-saucy,29 ubuntu-wallpapers-saucy,
30 ubuntu-wallpapers-trusty,30 ubuntu-wallpapers-trusty,
31 ubuntu-wallpapers-utopic,31 ubuntu-wallpapers-utopic,
32 ubuntu-wallpapers-vivid,
32Description: Ubuntu Wallpapers33Description: Ubuntu Wallpapers
33 The default Ubuntu wallpaper. This is also a meta-package depending on the34 The default Ubuntu wallpaper. This is also a meta-package depending on the
34 other default wallpapers for the current Ubuntu release.35 other default wallpapers for the current Ubuntu release.
@@ -104,3 +105,9 @@
104Depends: ${misc:Depends},105Depends: ${misc:Depends},
105Description: Ubuntu 15.04 Wallpapers106Description: Ubuntu 15.04 Wallpapers
106 Wallpapers from the Ubuntu 15.04 community contest107 Wallpapers from the Ubuntu 15.04 community contest
108
109Package: ubuntu-wallpapers-wily
110Architecture: all
111Depends: ${misc:Depends},
112Description: Ubuntu 15.04 Wallpapers
113 Wallpapers from the Ubuntu 15.10 community contest
107114
=== modified file 'debian/copyright'
--- debian/copyright 2015-03-11 16:31:54 +0000
+++ debian/copyright 2015-09-30 12:24:07 +0000
@@ -2,25 +2,46 @@
2Upstream-Name: ubuntu-wallpapers2Upstream-Name: ubuntu-wallpapers
3Source: https://launchpad.net/ubuntu-wallpapers3Source: https://launchpad.net/ubuntu-wallpapers
44
5Files: Tramonto_a_Scalea_by_Renatvs88.jpg
6 Tranquil_by_Pat_David.jpg
7 P5160283_by_Dariusz_Duma.jpg
8 Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg
9 Moss_inflorescence_by_carmelo75.jpg
10 Breaker_by_Lyle_Nel.jpg
11 Hotel_by_sarcasmrules2011.jpg
12 Mediterranean_Sea_by_simosx.jpg
13 Abstract_Ubuntu_by_Marek_Koteluk.jpg
14Copyright: Pat David
15 Renatvs88
16 Dariusz Duma
17 Philipp Haegi
18 carmelo75
19 Lyle Nel
20 sarcasmrules2011
21 simosx
22 Marek Koteluk
23License: CC-BY-SA-2.0
24 This work is licensed under the Creative Commons Attribution-ShareAlike 2.0
25 Unported License. To view a copy of this license, visit
26 http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
27 Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
28
29Files: Blue_by_dariuskws.jpg
30Copyright: dariuskws
31License: CC-0-1.0
32 This work is licensed under the Creative Commons CC0 1.0 Universal
33 License. To view a copy of this license, visit
34 https://creativecommons.org/publicdomain/zero/1.0/ or send a letter to
35 Creative Commons, 444 Castro Street, Suite 900, Mountain View, California,
36 94041, USA.
37
5Files: *38Files: *
6Copyright: 2010-2015 Ubuntu community contributors39 debian/*
7License: CC-BY-SA-3.040 warty-final-ubuntu.png
8 This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 41 Suru_Wallpaper_Desktop_4096x2304_Gray.png
9 Unported License. To view a copy of this license, visit
10 http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
11 Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
12
13Files: warty-final-ubuntu.png, Suru_Wallpaper_Desktop_4096x2304_Gray.png
14Copyright: 2015 Canonical Ltd
15License: CC-BY-SA-3.0
16 This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
17 Unported License. To view a copy of this license, visit
18 http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
19 Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
20
21Files: debian/*
22Copyright: 2004, Nathaniel McCallum <npmccallum@gentoo.org>42Copyright: 2004, Nathaniel McCallum <npmccallum@gentoo.org>
23 2006, Daniel Holbach <daniel.holbach@ubuntu.com>43 2006, Daniel Holbach <daniel.holbach@ubuntu.com>
44 2010-2015 Ubuntu community contributors
24License: CC-BY-SA-3.045License: CC-BY-SA-3.0
25 This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 46 This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
26 Unported License. To view a copy of this license, visit 47 Unported License. To view a copy of this license, visit
2748
=== added file 'debian/ubuntu-wallpapers-wily.install'
--- debian/ubuntu-wallpapers-wily.install 1970-01-01 00:00:00 +0000
+++ debian/ubuntu-wallpapers-wily.install 2015-09-30 12:24:07 +0000
@@ -0,0 +1,12 @@
1usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg
2usr/share/backgrounds/Tranquil_by_Pat_David.jpg
3usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg
4usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg
5usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg
6usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg
7usr/share/backgrounds/Blue_by_dariuskws.jpg
8usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg
9usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg
10usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg
11usr/share/backgrounds/contest/wily.xml
12usr/share/gnome-background-properties/wily-wallpapers.xml
013
=== added file 'wily-wallpapers.xml.in'
--- wily-wallpapers.xml.in 1970-01-01 00:00:00 +0000
+++ wily-wallpapers.xml.in 2015-09-30 12:24:07 +0000
@@ -0,0 +1,89 @@
1<?xml version="1.0"?>
2<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
3<wallpapers>
4 <wallpaper deleted="false">
5 <name>Ubuntu 15.10 Community Wallpapers</name>
6 <filename>/usr/share/backgrounds/contest/wily.xml</filename>
7 <options>zoom</options>
8 </wallpaper>
9 <wallpaper>
10 <_name>Tramonto a Scalea</_name>
11 <filename>/usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg</filename>
12 <options>zoom</options>
13 <pcolor>#000000</pcolor>
14 <scolor>#000000</scolor>
15 <shade_type>solid</shade_type>
16 </wallpaper>
17 <wallpaper>
18 <_name>Tranquil</_name>
19 <filename>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</filename>
20 <options>zoom</options>
21 <pcolor>#000000</pcolor>
22 <scolor>#000000</scolor>
23 <shade_type>solid</shade_type>
24 </wallpaper>
25 <wallpaper>
26 <_name>P5160283</_name>
27 <filename>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</filename>
28 <options>zoom</options>
29 <pcolor>#000000</pcolor>
30 <scolor>#000000</scolor>
31 <shade_type>solid</shade_type>
32 </wallpaper>
33 <wallpaper>
34 <_name>Sitting Here, Making Fun</_name>
35 <filename>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</filename>
36 <options>zoom</options>
37 <pcolor>#000000</pcolor>
38 <scolor>#000000</scolor>
39 <shade_type>solid</shade_type>
40 </wallpaper>
41 <wallpaper>
42 <_name>Moss inflorescence</_name>
43 <filename>/usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg</filename>
44 <options>zoom</options>
45 <pcolor>#000000</pcolor>
46 <scolor>#000000</scolor>
47 <shade_type>solid</shade_type>
48 </wallpaper>
49 <wallpaper>
50 <_name>Breaker</_name>
51 <filename>/usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg</filename>
52 <options>zoom</options>
53 <pcolor>#000000</pcolor>
54 <scolor>#000000</scolor>
55 <shade_type>solid</shade_type>
56 </wallpaper>
57 <wallpaper>
58 <_name>Blue</_name>
59 <filename>/usr/share/backgrounds/Blue_by_dariuskws.jpg</filename>
60 <options>zoom</options>
61 <pcolor>#000000</pcolor>
62 <scolor>#000000</scolor>
63 <shade_type>solid</shade_type>
64 </wallpaper>
65 <wallpaper>
66 <_name>Hotel</_name>
67 <filename>/usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg</filename>
68 <options>zoom</options>
69 <pcolor>#000000</pcolor>
70 <scolor>#000000</scolor>
71 <shade_type>solid</shade_type>
72 </wallpaper>
73 <wallpaper>
74 <_name>Mediterranean Sea</_name>
75 <filename>/usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg</filename>
76 <options>zoom</options>
77 <pcolor>#000000</pcolor>
78 <scolor>#000000</scolor>
79 <shade_type>solid</shade_type>
80 </wallpaper>
81 <wallpaper>
82 <_name>Abstract Ubuntu</_name>
83 <filename>/usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg</filename>
84 <options>zoom</options>
85 <pcolor>#000000</pcolor>
86 <scolor>#000000</scolor>
87 <shade_type>solid</shade_type>
88 </wallpaper>
89</wallpapers>