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

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.
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
1=== modified file 'AUTHORS'
2--- AUTHORS 2014-09-27 23:00:31 +0000
3+++ AUTHORS 2016-03-10 14:45:33 +0000
4@@ -95,6 +95,32 @@
5 (c) Copyright 2014 Fernando García
6 License: CC-BY-SA-3.0
7
8+Xenial
9+======
10+Abstract by Mathew
11+(c) Copyright 2016 Mathew
12+License: CC-BY-SA-4.0
13+
14+Climbing Up by Subin
15+(c) Copyright 2016 Subin
16+License: CC-BY-SA-4.0
17+
18+Flower by Albin Kottaram
19+(c) Copyright 2016 Albin Kottaram
20+License: CC-BY-SA-4.0
21+
22+Fruit by Albin Kottaram
23+(c) Copyright 2016 Albin Kottaram
24+License: CC-BY-SA-4.0
25+
26+Sky by Mathew
27+(c) Copyright 2016 Mathew
28+License: CC-BY-SA-4.0
29+
30+Weathercock by BlackBird
31+(c) Copyright 2016 BlackBird
32+License: CC-BY-SA-4.0
33+
34 Copyright: Copyright 2005-2010 Canonical Ltd. and the above mentioned.
35
36 License: CC-BY-SA-3.0
37
38=== added file 'abstract-lock-screen.jpg'
39Binary 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
40=== added file 'climbing-up.jpg'
41Binary files climbing-up.jpg 1970-01-01 00:00:00 +0000 and climbing-up.jpg 2016-03-10 14:45:33 +0000 differ
42=== added file 'contest/xenial.xml'
43--- contest/xenial.xml 1970-01-01 00:00:00 +0000
44+++ contest/xenial.xml 2016-03-10 14:45:33 +0000
45@@ -0,0 +1,74 @@
46+<background>
47+ <starttime>
48+ <year>2009</year>
49+ <month>08</month>
50+ <day>04</day>
51+ <hour>00</hour>
52+ <minute>00</minute>
53+ <second>00</second>
54+ </starttime>
55+<!-- This animation will start at midnight. -->
56+ <static>
57+ <duration>1795.0</duration>
58+ <file>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</file>
59+ </static>
60+ <transition>
61+ <duration>5.0</duration>
62+ <from>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</from>
63+ <to>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</to>
64+ </transition>
65+ <static>
66+ <duration>1795.0</duration>
67+ <file>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</file>
68+ </static>
69+ <transition>
70+ <duration>5.0</duration>
71+ <from>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</from>
72+ <to>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</to>
73+ </transition>
74+ <static>
75+ <duration>1795.0</duration>
76+ <file>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</file>
77+ </static>
78+ <transition>
79+ <duration>5.0</duration>
80+ <from>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</from>
81+ <to>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</to>
82+ </transition>
83+ <static>
84+ <duration>1795.0</duration>
85+ <file>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</file>
86+ </static>
87+ <transition>
88+ <duration>5.0</duration>
89+ <from>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</from>
90+ <to>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</to>
91+ </transition>
92+ <static>
93+ <duration>1795.0</duration>
94+ <file>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</file>
95+ </static>
96+ <transition>
97+ <duration>5.0</duration>
98+ <from>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</from>
99+ <to>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</to>
100+ </transition>
101+ <static>
102+ <duration>1795.0</duration>
103+ <file>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</file>
104+ </static>
105+ <transition>
106+ <duration>5.0</duration>
107+ <from>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</from>
108+ <to>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</to>
109+ </transition>
110+ <static>
111+ <duration>1795.0</duration>
112+ <file>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</file>
113+ </static>
114+ <transition>
115+ <duration>5.0</duration>
116+ <from>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</from>
117+ <to>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</to>
118+ </transition>
119+</background>
120
121=== modified file 'debian/control'
122--- debian/control 2014-09-27 23:00:31 +0000
123+++ debian/control 2016-03-10 14:45:33 +0000
124@@ -1,7 +1,7 @@
125 Source: ubuntu-gnome-wallpapers
126 Section: x11
127 Priority: optional
128-Maintainer: Ubuntu GNOME Artwork Team <ubuntugnome-artwork@lists.launchpad.net>
129+Maintainer: Ubuntu GNOME Marketing Team <ubuntugnome-marketing@lists.launchpad.net>
130 Build-Depends: debhelper (>= 9),
131 python (>= 2.6.6-3~),
132 Build-Depends-Indep: python-distutils-extra,
133@@ -13,7 +13,7 @@
134 Package: ubuntu-gnome-wallpapers
135 Architecture: all
136 Section: metapackages
137-Depends: ubuntu-gnome-wallpapers-utopic,
138+Depends: ubuntu-gnome-wallpapers-xenial,
139 ${misc:Depends}
140 Description: Ubuntu GNOME Wallpapers
141 This is a metapackage depending on the community contest wallpapers
142@@ -30,6 +30,13 @@
143 Architecture: all
144 Depends: ${misc:Depends},
145 Description: Ubuntu GNOME 14.10 Wallpapers
146- This package contains the winning entries from the Ubuntu GNOME 14.04
147+ This package contains the winning entries from the Ubuntu GNOME 14.10
148 community Wallpaper contest.
149
150+Package: ubuntu-gnome-wallpapers-xenial
151+Architecture: all
152+Depends: ${misc:Depends},
153+Description: Ubuntu GNOME 16.04 Wallpapers
154+ This package contains the entries from the Ubuntu GNOME 16.04
155+ Google Code-in Wallpaper contest.
156+
157
158=== modified file 'debian/copyright'
159--- debian/copyright 2014-09-27 23:00:31 +0000
160+++ debian/copyright 2016-03-10 14:45:33 +0000
161@@ -90,6 +90,30 @@
162 (c) Copyright 2014 Fernando García
163 License: CC-BY-SA-3.0
164
165+Abstract by Mathew
166+(c) Copyright 2016 Mathew
167+License: CC-BY-SA-4.0
168+
169+Climbing Up by Subin
170+(c) Copyright 2016 Subin
171+License: CC-BY-SA-4.0
172+
173+Flower by Albin Kottaram
174+(c) Copyright 2016 Albin Kottaram
175+License: CC-BY-SA-4.0
176+
177+Fruit by Albin Kottaram
178+(c) Copyright 2016 Albin Kottaram
179+License: CC-BY-SA-4.0
180+
181+Sky by Mathew
182+(c) Copyright 2016 Mathew
183+License: CC-BY-SA-4.0
184+
185+Weathercock by BlackBird
186+(c) Copyright 2016 BlackBird
187+License: CC-BY-SA-4.0
188+
189 Copyright: Copyright 2005-2010 Canonical Ltd. and the above mentioned.
190
191 License (CC-BY-SA 2.0):
192
193=== added file 'pexels-flower.jpg'
194Binary files pexels-flower.jpg 1970-01-01 00:00:00 +0000 and pexels-flower.jpg 2016-03-10 14:45:33 +0000 differ
195=== added file 'pexels-fruit.jpg'
196Binary files pexels-fruit.jpg 1970-01-01 00:00:00 +0000 and pexels-fruit.jpg 2016-03-10 14:45:33 +0000 differ
197=== added file 'sky-desktop.jpg'
198Binary files sky-desktop.jpg 1970-01-01 00:00:00 +0000 and sky-desktop.jpg 2016-03-10 14:45:33 +0000 differ
199=== added file 'ug-xenial-wallpapers.xml.in'
200--- ug-xenial-wallpapers.xml.in 1970-01-01 00:00:00 +0000
201+++ ug-xenial-wallpapers.xml.in 2016-03-10 14:45:33 +0000
202@@ -0,0 +1,65 @@
203+<?xml version="1.0"?>
204+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
205+<wallpapers>
206+ <wallpaper deleted="false">
207+ <name>Ubuntu GNOME 16.04 Community Wallpapers</name>
208+ <filename>/usr/share/backgrounds/ubuntu-gnome/xenial.xml</filename>
209+ <options>zoom</options>
210+ </wallpaper>
211+ <wallpaper>
212+ <_name>Weathercock</_name>
213+ <filename>/usr/share/backgrounds/ubuntu-gnome/weathercock.jpg</filename>
214+ <options>zoom</options>
215+ <pcolor>#000000</pcolor>
216+ <scolor>#000000</scolor>
217+ <shade_type>solid</shade_type>
218+ </wallpaper>
219+ <wallpaper>
220+ <_name>Sky</_name>
221+ <filename>/usr/share/backgrounds/ubuntu-gnome/sky-desktop.jpg</filename>
222+ <options>zoom</options>
223+ <pcolor>#000000</pcolor>
224+ <scolor>#000000</scolor>
225+ <shade_type>solid</shade_type>
226+ </wallpaper>
227+ <wallpaper>
228+ <_name>Abstract</_name>
229+ <filename>/usr/share/backgrounds/ubuntu-gnome/abstract-lock-screen.jpg</filename>
230+ <options>zoom</options>
231+ <pcolor>#000000</pcolor>
232+ <scolor>#000000</scolor>
233+ <shade_type>solid</shade_type>
234+ </wallpaper>
235+ <wallpaper>
236+ <_name>Climbing Up</_name>
237+ <filename>/usr/share/backgrounds/ubuntu-gnome/climbing-up.jpg</filename>
238+ <options>zoom</options>
239+ <pcolor>#000000</pcolor>
240+ <scolor>#000000</scolor>
241+ <shade_type>solid</shade_type>
242+ </wallpaper>
243+ <wallpaper>
244+ <_name>Fruit</_name>
245+ <filename>/usr/share/backgrounds/ubuntu-gnome/pexels-fruit.jpg</filename>
246+ <options>zoom</options>
247+ <pcolor>#000000</pcolor>
248+ <scolor>#000000</scolor>
249+ <shade_type>solid</shade_type>
250+ </wallpaper>
251+ <wallpaper>
252+ <_name>Weathercock (Black and White)</_name>
253+ <filename>/usr/share/backgrounds/ubuntu-gnome/weathercock-black-white.jpg</filename>
254+ <options>zoom</options>
255+ <pcolor>#000000</pcolor>
256+ <scolor>#000000</scolor>
257+ <shade_type>solid</shade_type>
258+ </wallpaper>
259+ <wallpaper>
260+ <_name>Flower</_name>
261+ <filename>/usr/share/backgrounds/ubuntu-gnome/pexels-flower.jpg</filename>
262+ <options>zoom</options>
263+ <pcolor>#000000</pcolor>
264+ <scolor>#000000</scolor>
265+ <shade_type>solid</shade_type>
266+ </wallpaper>
267+</wallpapers>
268
269=== added file 'weathercock-black-white.jpg'
270Binary 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
271=== added file 'weathercock.jpg'
272Binary 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