← Back to team overview

ubuntu-gnome-dev team mailing list archive

[Merge] lp:~ubuntugnome-marketing/ubuntu-gnome-wallpapers/ubuntugnome-1604 into lp:ubuntu-gnome-wallpapers

 

Alfredo Hernández has proposed merging lp:~ubuntugnome-marketing/ubuntu-gnome-wallpapers/ubuntugnome-1604 into lp:ubuntu-gnome-wallpapers.

Requested reviews:
  Ubuntu GNOME Developers (ubuntu-gnome-dev)

For more details, see:
https://code.launchpad.net/~ubuntugnome-marketing/ubuntu-gnome-wallpapers/ubuntugnome-1604/+merge/288632
-- 
Your team Ubuntu GNOME Developers is requested to review the proposed merge of lp:~ubuntugnome-marketing/ubuntu-gnome-wallpapers/ubuntugnome-1604 into lp:ubuntu-gnome-wallpapers.
=== added file 'abstract-lock-screen.jpg'
Binary files abstract-lock-screen.jpg	1970-01-01 00:00:00 +0000 and abstract-lock-screen.jpg	2016-03-10 13:00:10 +0000 differ
=== added file 'climbing-up.jpg'
Binary files climbing-up.jpg	1970-01-01 00:00:00 +0000 and climbing-up.jpg	2016-03-10 13:00:10 +0000 differ
=== added file 'contest/xenial.xml'
--- contest/xenial.xml	1970-01-01 00:00:00 +0000
+++ contest/xenial.xml	2016-03-10 13:00:10 +0000
@@ -0,0 +1,74 @@
+<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/ubuntu-gnome/weathercock.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</from>
+    <to>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</from>
+    <to>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</from>
+    <to>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</from>
+    <to>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</from>
+    <to>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</from>
+    <to>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</to>
+  </transition>
+  <static>
+    <duration>1795.0</duration>
+    <file>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</file>
+  </static>
+  <transition>
+    <duration>5.0</duration>
+    <from>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</from>
+    <to>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</to>
+  </transition>
+</background>

=== modified file 'debian/control'
--- debian/control	2014-09-27 23:00:31 +0000
+++ debian/control	2016-03-10 13:00:10 +0000
@@ -1,7 +1,7 @@
 Source: ubuntu-gnome-wallpapers
 Section: x11
 Priority: optional
-Maintainer: Ubuntu GNOME Artwork Team <ubuntugnome-artwork@xxxxxxxxxxxxxxxxxxx>
+Maintainer: Ubuntu GNOME Marketing Team <ubuntugnome-marketing@xxxxxxxxxxxxxxxxxxx>
 Build-Depends: debhelper (>= 9),
                python (>= 2.6.6-3~),
 Build-Depends-Indep: python-distutils-extra,
@@ -13,7 +13,7 @@
 Package: ubuntu-gnome-wallpapers
 Architecture: all
 Section: metapackages
-Depends: ubuntu-gnome-wallpapers-utopic,
+Depends: ubuntu-gnome-wallpapers-xenial,
          ${misc:Depends}
 Description: Ubuntu GNOME Wallpapers
  This is a metapackage depending on  the community contest wallpapers
@@ -30,6 +30,13 @@
 Architecture: all
 Depends: ${misc:Depends},
 Description: Ubuntu GNOME 14.10 Wallpapers
- This package contains the winning entries from the Ubuntu GNOME 14.04
+ This package contains the winning entries from the Ubuntu GNOME 14.10
  community Wallpaper contest.
 
+Package: ubuntu-gnome-wallpapers-xenial
+Architecture: all
+Depends: ${misc:Depends},
+Description: Ubuntu GNOME 16.04 Wallpapers
+ This package contains the entries from the Ubuntu GNOME 16.04
+ Google Code-in Wallpaper contest.
+

=== modified file 'debian/copyright'
--- debian/copyright	2014-09-27 23:00:31 +0000
+++ debian/copyright	2016-03-10 13:00:10 +0000
@@ -90,6 +90,26 @@
 (c) Copyright 2014 Fernando García
 License: CC-BY-SA-3.0
 
+Climbing Up by Subin
+(c) Copyright 2016 Subin
+License: CC-BY-SA-4.0
+
+Flower by Albin Kottaram
+(c) Copyright 2016 Albin Kottaram
+License: CC-BY-SA-4.0
+
+Fruit by Albin Kottaram
+(c) Copyright 2016 Albin Kottaram
+License: CC-BY-SA-4.0
+
+Sky by Mathew
+(c) Copyright 2016 Mathew
+License: CC-BY-SA-4.0
+
+Weathercock by BlackBird
+(c) Copyright 2016 BlackBird
+License: CC-BY-SA-4.0
+
 Copyright: Copyright 2005-2010 Canonical Ltd. and the above mentioned.
 
 License (CC-BY-SA 2.0):

=== added file 'pexels-flower.jpg'
Binary files pexels-flower.jpg	1970-01-01 00:00:00 +0000 and pexels-flower.jpg	2016-03-10 13:00:10 +0000 differ
=== added file 'pexels-fruit.jpg'
Binary files pexels-fruit.jpg	1970-01-01 00:00:00 +0000 and pexels-fruit.jpg	2016-03-10 13:00:10 +0000 differ
=== added file 'sky-desktop.jpg'
Binary files sky-desktop.jpg	1970-01-01 00:00:00 +0000 and sky-desktop.jpg	2016-03-10 13:00:10 +0000 differ
=== added file 'ug-xenial-wallpapers.xml.in'
--- ug-xenial-wallpapers.xml.in	1970-01-01 00:00:00 +0000
+++ ug-xenial-wallpapers.xml.in	2016-03-10 13:00:10 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Ubuntu GNOME 16.04 Community Wallpapers</name>
+    <filename>/usr/share/backgrounds/ubuntu-gnome/xenial.xml</filename>
+    <options>zoom</options>
+  </wallpaper>
+  <wallpaper>
+    <_name>Weathercock</_name>
+    <filename>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</filename>
+    <options>zoom</options>
+    <pcolor>#000000</pcolor>
+    <scolor>#000000</scolor>
+    <shade_type>solid</shade_type>
+  </wallpaper>
+  <wallpaper>
+    <_name>Sky</_name>
+    <filename>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</filename>
+    <options>zoom</options>
+    <pcolor>#000000</pcolor>
+    <scolor>#000000</scolor>
+    <shade_type>solid</shade_type>
+  </wallpaper>
+  <wallpaper>
+    <_name>Abstract</_name>
+    <filename>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</filename>
+    <options>zoom</options>
+    <pcolor>#000000</pcolor>
+    <scolor>#000000</scolor>
+    <shade_type>solid</shade_type>
+  </wallpaper>
+  <wallpaper>
+    <_name>Climbing Up</_name>
+    <filename>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</filename>
+    <options>zoom</options>
+    <pcolor>#000000</pcolor>
+    <scolor>#000000</scolor>
+    <shade_type>solid</shade_type>
+  </wallpaper>
+  <wallpaper>
+    <_name>Fruit</_name>
+    <filename>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</filename>
+    <options>zoom</options>
+    <pcolor>#000000</pcolor>
+    <scolor>#000000</scolor>
+    <shade_type>solid</shade_type>
+  </wallpaper>
+  <wallpaper>
+    <_name>Weathercock (Black and White)</_name>
+    <filename>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</filename>
+    <options>zoom</options>
+    <pcolor>#000000</pcolor>
+    <scolor>#000000</scolor>
+    <shade_type>solid</shade_type>
+  </wallpaper>
+  <wallpaper>
+    <_name>Flower</_name>
+    <filename>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</filename>
+    <options>zoom</options>
+    <pcolor>#000000</pcolor>
+    <scolor>#000000</scolor>
+    <shade_type>solid</shade_type>
+  </wallpaper>
+</wallpapers>

=== added file 'weathercock-black-white.jpg'
Binary files weathercock-black-white.jpg	1970-01-01 00:00:00 +0000 and weathercock-black-white.jpg	2016-03-10 13:00:10 +0000 differ
=== added file 'weathercock.jpg'
Binary files weathercock.jpg	1970-01-01 00:00:00 +0000 and weathercock.jpg	2016-03-10 13:00:10 +0000 differ

Follow ups