Ubuntu GNOME Wallpapers

Merge lp:~registry/ubuntu-gnome-wallpapers/ubuntugnome-1604 into lp:ubuntu-gnome-wallpapers

  1. ubuntugnome-1604
  2. Merge into ubuntu
Proposed by Alfredo Hernández
Status: Merged
Merge reported by: Tim Lunn
Merged at revision: not available
Proposed branch: lp:~registry/ubuntu-gnome-wallpapers/ubuntugnome-1604
Merge into: lp:ubuntu-gnome-wallpapers
Diff against target: 272 lines (+199/-3)
5 files modified
AUTHORS (+26/-0)
contest/xenial.xml (+74/-0)
debian/control (+10/-3)
debian/copyright (+24/-0)
ug-xenial-wallpapers.xml.in (+65/-0)
To merge this branch: bzr merge lp:~registry/ubuntu-gnome-wallpapers/ubuntugnome-1604
Reviewer Review Type Date Requested Status
Tim Lunn Approve
Review via email: mp+288632@code.launchpad.net
To post a comment you must log in.
lp:~registry/ubuntu-gnome-wallpapers/ubuntugnome-1604 updated
13. By Alfredo Hernández

Updated copyright info

14. By Alfredo Hernández

Updated authors info

Revision history for this message
Tim Lunn (darkxst) wrote :

Thanks Alfredo

You missed the .install file, but have fixed that up and uploaded

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AUTHORS'
--- AUTHORS 2014-09-27 23:00:31 +0000
+++ AUTHORS 2016-03-10 14:45:33 +0000
@@ -95,6 +95,32 @@
95(c) Copyright 2014 Fernando García95(c) Copyright 2014 Fernando García
96License: CC-BY-SA-3.096License: CC-BY-SA-3.0
9797
98Xenial
99======
100Abstract by Mathew
101(c) Copyright 2016 Mathew
102License: CC-BY-SA-4.0
103
104Climbing Up by Subin
105(c) Copyright 2016 Subin
106License: CC-BY-SA-4.0
107
108Flower by Albin Kottaram
109(c) Copyright 2016 Albin Kottaram
110License: CC-BY-SA-4.0
111
112Fruit by Albin Kottaram
113(c) Copyright 2016 Albin Kottaram
114License: CC-BY-SA-4.0
115
116Sky by Mathew
117(c) Copyright 2016 Mathew
118License: CC-BY-SA-4.0
119
120Weathercock by BlackBird
121(c) Copyright 2016 BlackBird
122License: CC-BY-SA-4.0
123
98Copyright: Copyright 2005-2010 Canonical Ltd. and the above mentioned.124Copyright: Copyright 2005-2010 Canonical Ltd. and the above mentioned.
99125
100License: CC-BY-SA-3.0126License: CC-BY-SA-3.0
101127
=== added file 'abstract-lock-screen.jpg'
102Binary files abstract-lock-screen.jpg 1970-01-01 00:00:00 +0000 and abstract-lock-screen.jpg 2016-03-10 14:45:33 +0000 differ128Binary files abstract-lock-screen.jpg 1970-01-01 00:00:00 +0000 and abstract-lock-screen.jpg 2016-03-10 14:45:33 +0000 differ
=== added file 'climbing-up.jpg'
103Binary files climbing-up.jpg 1970-01-01 00:00:00 +0000 and climbing-up.jpg 2016-03-10 14:45:33 +0000 differ129Binary files climbing-up.jpg 1970-01-01 00:00:00 +0000 and climbing-up.jpg 2016-03-10 14:45:33 +0000 differ
=== added file 'contest/xenial.xml'
--- contest/xenial.xml 1970-01-01 00:00:00 +0000
+++ contest/xenial.xml 2016-03-10 14:45:33 +0000
@@ -0,0 +1,74 @@
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/ubuntu-gnome/weathercock.jpg</file>
14 </static>
15 <transition>
16 <duration>5.0</duration>
17 <from>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</from>
18 <to>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</to>
19 </transition>
20 <static>
21 <duration>1795.0</duration>
22 <file>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</file>
23 </static>
24 <transition>
25 <duration>5.0</duration>
26 <from>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</from>
27 <to>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</to>
28 </transition>
29 <static>
30 <duration>1795.0</duration>
31 <file>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</file>
32 </static>
33 <transition>
34 <duration>5.0</duration>
35 <from>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</from>
36 <to>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</to>
37 </transition>
38 <static>
39 <duration>1795.0</duration>
40 <file>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</file>
41 </static>
42 <transition>
43 <duration>5.0</duration>
44 <from>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</from>
45 <to>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</to>
46 </transition>
47 <static>
48 <duration>1795.0</duration>
49 <file>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</file>
50 </static>
51 <transition>
52 <duration>5.0</duration>
53 <from>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</from>
54 <to>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</to>
55 </transition>
56 <static>
57 <duration>1795.0</duration>
58 <file>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</file>
59 </static>
60 <transition>
61 <duration>5.0</duration>
62 <from>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</from>
63 <to>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</to>
64 </transition>
65 <static>
66 <duration>1795.0</duration>
67 <file>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</file>
68 </static>
69 <transition>
70 <duration>5.0</duration>
71 <from>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</from>
72 <to>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</to>
73 </transition>
74</background>
075
=== modified file 'debian/control'
--- debian/control 2014-09-27 23:00:31 +0000
+++ debian/control 2016-03-10 14:45:33 +0000
@@ -1,7 +1,7 @@
1Source: ubuntu-gnome-wallpapers1Source: ubuntu-gnome-wallpapers
2Section: x112Section: x11
3Priority: optional3Priority: optional
4Maintainer: Ubuntu GNOME Artwork Team <ubuntugnome-artwork@lists.launchpad.net>4Maintainer: Ubuntu GNOME Marketing Team <ubuntugnome-marketing@lists.launchpad.net>
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,
@@ -13,7 +13,7 @@
13Package: ubuntu-gnome-wallpapers13Package: ubuntu-gnome-wallpapers
14Architecture: all14Architecture: all
15Section: metapackages15Section: metapackages
16Depends: ubuntu-gnome-wallpapers-utopic,16Depends: ubuntu-gnome-wallpapers-xenial,
17 ${misc:Depends}17 ${misc:Depends}
18Description: Ubuntu GNOME Wallpapers18Description: Ubuntu GNOME Wallpapers
19 This is a metapackage depending on the community contest wallpapers19 This is a metapackage depending on the community contest wallpapers
@@ -30,6 +30,13 @@
30Architecture: all30Architecture: all
31Depends: ${misc:Depends},31Depends: ${misc:Depends},
32Description: Ubuntu GNOME 14.10 Wallpapers32Description: Ubuntu GNOME 14.10 Wallpapers
33 This package contains the winning entries from the Ubuntu GNOME 14.0433 This package contains the winning entries from the Ubuntu GNOME 14.10
34 community Wallpaper contest.34 community Wallpaper contest.
3535
36Package: ubuntu-gnome-wallpapers-xenial
37Architecture: all
38Depends: ${misc:Depends},
39Description: Ubuntu GNOME 16.04 Wallpapers
40 This package contains the entries from the Ubuntu GNOME 16.04
41 Google Code-in Wallpaper contest.
42
3643
=== modified file 'debian/copyright'
--- debian/copyright 2014-09-27 23:00:31 +0000
+++ debian/copyright 2016-03-10 14:45:33 +0000
@@ -90,6 +90,30 @@
90(c) Copyright 2014 Fernando García90(c) Copyright 2014 Fernando García
91License: CC-BY-SA-3.091License: CC-BY-SA-3.0
9292
93Abstract by Mathew
94(c) Copyright 2016 Mathew
95License: CC-BY-SA-4.0
96
97Climbing Up by Subin
98(c) Copyright 2016 Subin
99License: CC-BY-SA-4.0
100
101Flower by Albin Kottaram
102(c) Copyright 2016 Albin Kottaram
103License: CC-BY-SA-4.0
104
105Fruit by Albin Kottaram
106(c) Copyright 2016 Albin Kottaram
107License: CC-BY-SA-4.0
108
109Sky by Mathew
110(c) Copyright 2016 Mathew
111License: CC-BY-SA-4.0
112
113Weathercock by BlackBird
114(c) Copyright 2016 BlackBird
115License: CC-BY-SA-4.0
116
93Copyright: Copyright 2005-2010 Canonical Ltd. and the above mentioned.117Copyright: Copyright 2005-2010 Canonical Ltd. and the above mentioned.
94118
95License (CC-BY-SA 2.0):119License (CC-BY-SA 2.0):
96120
=== added file 'pexels-flower.jpg'
97Binary files pexels-flower.jpg 1970-01-01 00:00:00 +0000 and pexels-flower.jpg 2016-03-10 14:45:33 +0000 differ121Binary files pexels-flower.jpg 1970-01-01 00:00:00 +0000 and pexels-flower.jpg 2016-03-10 14:45:33 +0000 differ
=== added file 'pexels-fruit.jpg'
98Binary files pexels-fruit.jpg 1970-01-01 00:00:00 +0000 and pexels-fruit.jpg 2016-03-10 14:45:33 +0000 differ122Binary files pexels-fruit.jpg 1970-01-01 00:00:00 +0000 and pexels-fruit.jpg 2016-03-10 14:45:33 +0000 differ
=== added file 'sky-desktop.jpg'
99Binary files sky-desktop.jpg 1970-01-01 00:00:00 +0000 and sky-desktop.jpg 2016-03-10 14:45:33 +0000 differ123Binary files sky-desktop.jpg 1970-01-01 00:00:00 +0000 and sky-desktop.jpg 2016-03-10 14:45:33 +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 14:45:33 +0000
@@ -0,0 +1,65 @@
1<?xml version="1.0"?>
2<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
3<wallpapers>
4 <wallpaper deleted="false">
5 <name>Ubuntu GNOME 16.04 Community Wallpapers</name>
6 <filename>/usr/share/backgrounds/ubuntu-gnome/xenial.xml</filename>
7 <options>zoom</options>
8 </wallpaper>
9 <wallpaper>
10 <_name>Weathercock</_name>
11 <filename>/usr/share/backgrounds/ubuntu-gnome/weathercock.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>Sky</_name>
19 <filename>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.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>Abstract</_name>
27 <filename>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.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>Climbing Up</_name>
35 <filename>/usr/share/backgrounds/ubuntu-gnome/climbing-up.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>Fruit</_name>
43 <filename>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.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>Weathercock (Black and White)</_name>
51 <filename>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.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>Flower</_name>
59 <filename>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</filename>
60 <options>zoom</options>
61 <pcolor>#000000</pcolor>
62 <scolor>#000000</scolor>
63 <shade_type>solid</shade_type>
64 </wallpaper>
65</wallpapers>
066
=== added file 'weathercock-black-white.jpg'
1Binary files weathercock-black-white.jpg 1970-01-01 00:00:00 +0000 and weathercock-black-white.jpg 2016-03-10 14:45:33 +0000 differ67Binary files weathercock-black-white.jpg 1970-01-01 00:00:00 +0000 and weathercock-black-white.jpg 2016-03-10 14:45:33 +0000 differ
=== added file 'weathercock.jpg'
2Binary files weathercock.jpg 1970-01-01 00:00:00 +0000 and weathercock.jpg 2016-03-10 14:45:33 +0000 differ68Binary files weathercock.jpg 1970-01-01 00:00:00 +0000 and weathercock.jpg 2016-03-10 14:45:33 +0000 differ

Subscribers

People subscribed via source and target branches