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

[Daniel Holbach]

Add wily wallpapers from Ubuntu Free Culture Showcase competition.

[Daniel Holbach (dholbach)]

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

[Iain Lane (laney)]

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

[Daniel Holbach (dholbach)]

Sure, putting things into separate directories makes sense.

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

[Nathan Haines (nhaines)]

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

=== added file 'Abstract_Ubuntu_by_Marek_Koteluk.jpg'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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 @@
+<background>
+  <starttime>
+    <year>2009</year>
+    <month>08</month>
+    <day>04</day>
+    <hour>00</hour>
+    <minute>00</minute>
+    <second>00</second>
+  </starttime>
+<!-- This animation will start at midnight. -->
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg</from>
+    <to>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</from>
+    <to>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</from>
+    <to>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</from>
+    <to>/usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg</from>
+    <to>/usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg</from>
+    <to>/usr/share/backgrounds/Blue_by_dariuskws.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Blue_by_dariuskws.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Blue_by_dariuskws.jpg</from>
+    <to>/usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg</from>
+    <to>/usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg</from>
+    <to>/usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg</from>
+    <to>/usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg</to>
+  </transition>
+</background>

=== 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 @@
+ubuntu-wallpapers (15.10.2-0ubuntu1) wily; urgency=medium
+
+  * Add winners of wallpaper competition.
+
+ -- Daniel Holbach <[e-mail]>  Wed, 30 Sep 2015 12:28:09 +0200
+
 ubuntu-wallpapers (15.10.1-0ubuntu1) wily; urgency=medium
 
   * Apply some lossless crushing using optipng.

=== 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 @@
 Build-Depends: debhelper (>= 9),
                python (>= 2.6.6-3~),
 Build-Depends-Indep: python-distutils-extra,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://launchpad.net/ubuntu-wallpapers
 # If you aren't a member of ~ubuntu-art-pkg but need to upload
 # packaging changes, just go ahead. ~ubuntu-art-pkg will notice
@@ -16,7 +16,7 @@
 Package: ubuntu-wallpapers
 Architecture: all
 Section: metapackages
-Depends: ubuntu-wallpapers-vivid,
+Depends: ubuntu-wallpapers-wily,
          ${misc:Depends},
 Suggests: ubuntu-wallpapers-karmic,
           ubuntu-wallpapers-lucid,
@@ -29,6 +29,7 @@
           ubuntu-wallpapers-saucy,
           ubuntu-wallpapers-trusty,
           ubuntu-wallpapers-utopic,
+          ubuntu-wallpapers-vivid,
 Description: Ubuntu Wallpapers
  The default Ubuntu wallpaper. This is also a meta-package depending on the
  other default wallpapers for the current Ubuntu release.
@@ -104,3 +105,9 @@
 Depends: ${misc:Depends},
 Description: Ubuntu 15.04 Wallpapers
  Wallpapers from the Ubuntu 15.04 community contest
+
+Package: ubuntu-wallpapers-wily
+Architecture: all
+Depends: ${misc:Depends},
+Description: Ubuntu 15.04 Wallpapers
+ Wallpapers from the Ubuntu 15.10 community contest

=== 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 @@
 Upstream-Name: ubuntu-wallpapers
 Source: https://launchpad.net/ubuntu-wallpapers
 
+Files: Tramonto_a_Scalea_by_Renatvs88.jpg
+       Tranquil_by_Pat_David.jpg
+       P5160283_by_Dariusz_Duma.jpg
+       Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg
+       Moss_inflorescence_by_carmelo75.jpg
+       Breaker_by_Lyle_Nel.jpg
+       Hotel_by_sarcasmrules2011.jpg
+       Mediterranean_Sea_by_simosx.jpg
+       Abstract_Ubuntu_by_Marek_Koteluk.jpg
+Copyright: Pat David
+           Renatvs88
+           Dariusz Duma
+           Philipp Haegi
+           carmelo75
+           Lyle Nel
+           sarcasmrules2011
+           simosx
+           Marek Koteluk
+License: CC-BY-SA-2.0
+ This work is licensed under the Creative Commons Attribution-ShareAlike 2.0
+ Unported License. To view a copy of this license, visit
+ http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+ Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
+
+Files: Blue_by_dariuskws.jpg
+Copyright: dariuskws
+License: CC-0-1.0
+ This work is licensed under the Creative Commons CC0 1.0 Universal
+ License. To view a copy of this license, visit 
+ https://creativecommons.org/publicdomain/zero/1.0/ or send a letter to 
+ Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 
+ 94041, USA.
+
 Files: *
-Copyright: 2010-2015 Ubuntu community contributors
-License: CC-BY-SA-3.0
- This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 
- Unported License. To view a copy of this license, visit 
- http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative 
- Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
-
-Files: warty-final-ubuntu.png, Suru_Wallpaper_Desktop_4096x2304_Gray.png
-Copyright: 2015 Canonical Ltd
-License: CC-BY-SA-3.0
- This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 
- Unported License. To view a copy of this license, visit 
- http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative 
- Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
-
-Files: debian/*
+       debian/*
+       warty-final-ubuntu.png
+       Suru_Wallpaper_Desktop_4096x2304_Gray.png
 Copyright: 2004, Nathaniel McCallum <[e-mail]>
            2006, Daniel Holbach <[e-mail]>
+           2010-2015 Ubuntu community contributors
 License: CC-BY-SA-3.0
  This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 
  Unported License. To view a copy of this license, visit 

=== 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 @@
+usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg
+usr/share/backgrounds/Tranquil_by_Pat_David.jpg
+usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg
+usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg
+usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg
+usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg
+usr/share/backgrounds/Blue_by_dariuskws.jpg
+usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg
+usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg
+usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg
+usr/share/backgrounds/contest/wily.xml
+usr/share/gnome-background-properties/wily-wallpapers.xml

=== 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 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+ <wallpaper deleted="false">
+   <name>Ubuntu 15.10 Community Wallpapers</name>
+   <filename>/usr/share/backgrounds/contest/wily.xml</filename>
+   <options>zoom</options>
+ </wallpaper>
+ <wallpaper>
+     <_name>Tramonto a Scalea</_name>
+     <filename>/usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>Tranquil</_name>
+     <filename>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>P5160283</_name>
+     <filename>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>Sitting Here, Making Fun</_name>
+     <filename>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>Moss inflorescence</_name>
+     <filename>/usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>Breaker</_name>
+     <filename>/usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>Blue</_name>
+     <filename>/usr/share/backgrounds/Blue_by_dariuskws.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>Hotel</_name>
+     <filename>/usr/share/backgrounds/Hotel_by_sarcasmrules2011.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>Mediterranean Sea</_name>
+     <filename>/usr/share/backgrounds/Mediterranean_Sea_by_simosx.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper>
+     <_name>Abstract Ubuntu</_name>
+     <filename>/usr/share/backgrounds/Abstract_Ubuntu_by_Marek_Koteluk.jpg</filename>
+     <options>zoom</options>
+     <pcolor>#000000</pcolor>
+     <scolor>#000000</scolor>
+     <shade_type>solid</shade_type>
+ </wallpaper>
+</wallpapers>