Merge lp:~ken-vandine/ubuntu-wallpapers/14_04_wallpapers into lp:ubuntu-wallpapers
- 14_04_wallpapers
- Merge into ubuntu
Status: | Merged |
---|---|
Merged at revision: | 129 |
Proposed branch: | lp:~ken-vandine/ubuntu-wallpapers/14_04_wallpapers |
Merge into: | lp:ubuntu-wallpapers |
Diff against target: |
318 lines (+237/-3) 6 files modified
contest/trusty.xml (+110/-0) debian/changelog (+6/-0) debian/control (+10/-3) debian/ubuntu-wallpapers-trusty.install (+13/-0) po/POTFILES.in (+1/-0) trusty-wallpapers.xml.in (+97/-0) |
To merge this branch: | bzr merge lp:~ken-vandine/ubuntu-wallpapers/14_04_wallpapers |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Ubuntu Artwork Packagers | Pending | ||
Review via email: mp+210616@code.launchpad.net |
- 132. By Ken VanDine
-
Upstream version bump
PS Jenkins bot (ps-jenkins) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:132
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:132
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:132
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === added file 'Backyard_Mushrooms_by_Kurt_Zitzelman.jpg' |
2 | Binary files Backyard_Mushrooms_by_Kurt_Zitzelman.jpg 1970-01-01 00:00:00 +0000 and Backyard_Mushrooms_by_Kurt_Zitzelman.jpg 2014-03-12 14:24:19 +0000 differ |
3 | === added file 'Beach_by_Renato_Giordanelli.jpg' |
4 | Binary files Beach_by_Renato_Giordanelli.jpg 1970-01-01 00:00:00 +0000 and Beach_by_Renato_Giordanelli.jpg 2014-03-12 14:24:19 +0000 differ |
5 | === added file 'Berries_by_Tom_Kijas.jpg' |
6 | Binary files Berries_by_Tom_Kijas.jpg 1970-01-01 00:00:00 +0000 and Berries_by_Tom_Kijas.jpg 2014-03-12 14:24:19 +0000 differ |
7 | === added file 'Foggy_Forest_by_Jake_Stewart.jpg' |
8 | Binary files Foggy_Forest_by_Jake_Stewart.jpg 1970-01-01 00:00:00 +0000 and Foggy_Forest_by_Jake_Stewart.jpg 2014-03-12 14:24:19 +0000 differ |
9 | === added file 'Ibanez_Infinity_by_Jaco_Kok.jpg' |
10 | Binary files Ibanez_Infinity_by_Jaco_Kok.jpg 1970-01-01 00:00:00 +0000 and Ibanez_Infinity_by_Jaco_Kok.jpg 2014-03-12 14:24:19 +0000 differ |
11 | === added file 'Jelly_Fish_by_RaDu_GaLaN.jpg' |
12 | Binary files Jelly_Fish_by_RaDu_GaLaN.jpg 1970-01-01 00:00:00 +0000 and Jelly_Fish_by_RaDu_GaLaN.jpg 2014-03-12 14:24:19 +0000 differ |
13 | === added file 'Mono_Lake_by_Angela_Henderson.jpg' |
14 | Binary files Mono_Lake_by_Angela_Henderson.jpg 1970-01-01 00:00:00 +0000 and Mono_Lake_by_Angela_Henderson.jpg 2014-03-12 14:24:19 +0000 differ |
15 | === added file 'Partitura_by_Vincijun.jpg' |
16 | Binary files Partitura_by_Vincijun.jpg 1970-01-01 00:00:00 +0000 and Partitura_by_Vincijun.jpg 2014-03-12 14:24:19 +0000 differ |
17 | === added file 'Reflections_by_Trenton_Fox.jpg' |
18 | Binary files Reflections_by_Trenton_Fox.jpg 1970-01-01 00:00:00 +0000 and Reflections_by_Trenton_Fox.jpg 2014-03-12 14:24:19 +0000 differ |
19 | === added file 'Sea_Fury_by_Ian_Worrall.jpg' |
20 | Binary files Sea_Fury_by_Ian_Worrall.jpg 1970-01-01 00:00:00 +0000 and Sea_Fury_by_Ian_Worrall.jpg 2014-03-12 14:24:19 +0000 differ |
21 | === added file 'Water_web_by_Tom_Kijas.jpg' |
22 | Binary files Water_web_by_Tom_Kijas.jpg 1970-01-01 00:00:00 +0000 and Water_web_by_Tom_Kijas.jpg 2014-03-12 14:24:19 +0000 differ |
23 | === added file 'contest/trusty.xml' |
24 | --- contest/trusty.xml 1970-01-01 00:00:00 +0000 |
25 | +++ contest/trusty.xml 2014-03-12 14:24:19 +0000 |
26 | @@ -0,0 +1,110 @@ |
27 | +<background> |
28 | + <starttime> |
29 | + <year>2009</year> |
30 | + <month>08</month> |
31 | + <day>04</day> |
32 | + <hour>00</hour> |
33 | + <minute>00</minute> |
34 | + <second>00</second> |
35 | + </starttime> |
36 | +<!-- This animation will start at midnight. --> |
37 | + <static> |
38 | + <duration>1795.0</duration> |
39 | + <file>/usr/share/backgrounds/Sea_Fury_by_Ian_Worrall.jpg</file> |
40 | + </static> |
41 | + <transition> |
42 | + <duration>5.0</duration> |
43 | + <from>/usr/share/backgrounds/Sea_Fury_by_Ian_Worrall.jpg</from> |
44 | + <to>/usr/share/backgrounds/Reflections_by_Trenton_Fox.jpg</to> |
45 | + </transition> |
46 | + <static> |
47 | + <duration>1795.0</duration> |
48 | + <file>/usr/share/backgrounds/Reflections_by_Trenton_Fox.jpg</file> |
49 | + </static> |
50 | + <transition> |
51 | + <duration>5.0</duration> |
52 | + <from>/usr/share/backgrounds/Reflections_by_Trenton_Fox.jpg</from> |
53 | + <to>/usr/share/backgrounds/Partitura_by_Vincijun.jpg</to> |
54 | + </transition> |
55 | + <static> |
56 | + <duration>1795.0</duration> |
57 | + <file>/usr/share/backgrounds/Partitura_by_Vincijun.jpg</file> |
58 | + </static> |
59 | + <transition> |
60 | + <duration>5.0</duration> |
61 | + <from>/usr/share/backgrounds/Partitura_by_Vincijun.jpg</from> |
62 | + <to>/usr/share/backgrounds/Backyard_Mushrooms_by_Kurt_Zitzelman.jpg</to> |
63 | + </transition> |
64 | + <static> |
65 | + <duration>1795.0</duration> |
66 | + <file>/usr/share/backgrounds/Backyard_Mushrooms_by_Kurt_Zitzelman.jpg</file> |
67 | + </static> |
68 | + <transition> |
69 | + <duration>5.0</duration> |
70 | + <from>/usr/share/backgrounds/Backyard_Mushrooms_by_Kurt_Zitzelman.jpg</from> |
71 | + <to>/usr/share/backgrounds/Water_web_by_Tom_Kijas.jpg</to> |
72 | + </transition> |
73 | + <static> |
74 | + <duration>1795.0</duration> |
75 | + <file>/usr/share/backgrounds/Water_web_by_Tom_Kijas.jpg</file> |
76 | + </static> |
77 | + <transition> |
78 | + <duration>5.0</duration> |
79 | + <from>/usr/share/backgrounds/Water_web_by_Tom_Kijas.jpg</from> |
80 | + <to>/usr/share/backgrounds/Mono_Lake_by_Angela_Henderson.jpg</to> |
81 | + </transition> |
82 | + <static> |
83 | + <duration>1795.0</duration> |
84 | + <file>/usr/share/backgrounds/Mono_Lake_by_Angela_Henderson.jpg</file> |
85 | + </static> |
86 | + <transition> |
87 | + <duration>5.0</duration> |
88 | + <from>/usr/share/backgrounds/Mono_Lake_by_Angela_Henderson.jpg</from> |
89 | + <to>/usr/share/backgrounds/Jelly_Fish_by_RaDu_GaLaN.jpg</to> |
90 | + </transition> |
91 | + <static> |
92 | + <duration>1795.0</duration> |
93 | + <file>/usr/share/backgrounds/Jelly_Fish_by_RaDu_GaLaN.jpg</file> |
94 | + </static> |
95 | + <transition> |
96 | + <duration>5.0</duration> |
97 | + <from>/usr/share/backgrounds/Jelly_Fish_by_RaDu_GaLaN.jpg</from> |
98 | + <to>/usr/share/backgrounds/Ibanez_Infinity_by_Jaco_Kok.jpg</to> |
99 | + </transition> |
100 | + <static> |
101 | + <duration>1795.0</duration> |
102 | + <file>/usr/share/backgrounds/Ibanez_Infinity_by_Jaco_Kok.jpg</file> |
103 | + </static> |
104 | + <transition> |
105 | + <duration>5.0</duration> |
106 | + <from>/usr/share/backgrounds/Ibanez_Infinity_by_Jaco_Kok.jpg</from> |
107 | + <to>/usr/share/backgrounds/Foggy_Forest_by_Jake_Stewart.jpg</to> |
108 | + </transition> |
109 | + <static> |
110 | + <duration>1795.0</duration> |
111 | + <file>/usr/share/backgrounds/Foggy_Forest_by_Jake_Stewart.jpg</file> |
112 | + </static> |
113 | + <transition> |
114 | + <duration>5.0</duration> |
115 | + <from>/usr/share/backgrounds/Foggy_Forest_by_Jake_Stewart.jpg</from> |
116 | + <to>/usr/share/backgrounds/Beach_by_Renato_Giordanelli.jpg</to> |
117 | + </transition> |
118 | + <static> |
119 | + <duration>1795.0</duration> |
120 | + <file>/usr/share/backgrounds/Beach_by_Renato_Giordanelli.jpg</file> |
121 | + </static> |
122 | + <transition> |
123 | + <duration>5.0</duration> |
124 | + <from>/usr/share/backgrounds/Beach_by_Renato_Giordanelli.jpg</from> |
125 | + <to>/usr/share/backgrounds/Berries_by_Tom_Kijas.jpg</to> |
126 | + </transition> |
127 | + <static> |
128 | + <duration>1795.0</duration> |
129 | + <file>/usr/share/backgrounds/Berries_by_Tom_Kijas.jpg</file> |
130 | + </static> |
131 | + <transition> |
132 | + <duration>5.0</duration> |
133 | + <from>/usr/share/backgrounds/Berries_by_Tom_Kijas.jpg</from> |
134 | + <to>/usr/share/backgrounds/Sea_Fury_by_Ian_Worrall.jpg</to> |
135 | + </transition> |
136 | +</background> |
137 | |
138 | === modified file 'debian/changelog' |
139 | --- debian/changelog 2014-03-07 23:02:01 +0000 |
140 | +++ debian/changelog 2014-03-12 14:24:19 +0000 |
141 | @@ -1,3 +1,9 @@ |
142 | +ubuntu-wallpapers (14.04.0-0ubuntu1) UNRELEASED; urgency=medium |
143 | + |
144 | + * Upstream version bump |
145 | + |
146 | + -- Ken VanDine <ken.vandine@canonical.com> Wed, 12 Mar 2014 10:23:27 -0400 |
147 | + |
148 | ubuntu-wallpapers (13.04.0+13.10.20130924.1-0ubuntu2) trusty; urgency=medium |
149 | |
150 | [ Ken VanDine ] |
151 | |
152 | === modified file 'debian/control' |
153 | --- debian/control 2013-08-23 09:34:52 +0000 |
154 | +++ debian/control 2014-03-12 14:24:19 +0000 |
155 | @@ -5,7 +5,7 @@ |
156 | Build-Depends: debhelper (>= 9), |
157 | python (>= 2.6.6-3~), |
158 | Build-Depends-Indep: python-distutils-extra, |
159 | -Standards-Version: 3.9.4 |
160 | +Standards-Version: 3.9.5 |
161 | Homepage: https://launchpad.net/ubuntu-wallpapers |
162 | # If you aren't a member of ~ubuntu-art-pkg but need to upload |
163 | # packaging changes, just go ahead. ~ubuntu-art-pkg will notice |
164 | @@ -16,9 +16,10 @@ |
165 | Package: ubuntu-wallpapers |
166 | Architecture: all |
167 | Section: metapackages |
168 | -Depends: ubuntu-wallpapers-saucy, |
169 | +Depends: ubuntu-wallpapers-trusty, |
170 | ${misc:Depends}, |
171 | -Suggests: ubuntu-wallpapers-karmic, |
172 | +Suggests: ubuntu-wallpapers-saucy, |
173 | + ubuntu-wallpapers-karmic, |
174 | ubuntu-wallpapers-lucid, |
175 | ubuntu-wallpapers-maverick, |
176 | ubuntu-wallpapers-natty, |
177 | @@ -83,3 +84,9 @@ |
178 | Depends: ${misc:Depends}, |
179 | Description: Ubuntu 13.10 Wallpapers |
180 | Wallpapers from the Ubuntu 13.10 community contest |
181 | + |
182 | +Package: ubuntu-wallpapers-trusty |
183 | +Architecture: all |
184 | +Depends: ${misc:Depends}, |
185 | +Description: Ubuntu 14.04 Wallpapers |
186 | + Wallpapers from the Ubuntu 14.04 community contest |
187 | |
188 | === added file 'debian/ubuntu-wallpapers-trusty.install' |
189 | --- debian/ubuntu-wallpapers-trusty.install 1970-01-01 00:00:00 +0000 |
190 | +++ debian/ubuntu-wallpapers-trusty.install 2014-03-12 14:24:19 +0000 |
191 | @@ -0,0 +1,13 @@ |
192 | +usr/share/backgrounds/Backyard_Mushrooms_by_Kurt_Zitzelman.jpg |
193 | +usr/share/backgrounds/Beach_by_Renato_Giordanelli.jpg |
194 | +usr/share/backgrounds/Berries_by_Tom_Kijas.jpg |
195 | +usr/share/backgrounds/Foggy_Forest_by_Jake_Stewart.jpg |
196 | +usr/share/backgrounds/Ibanez_Infinity_by_Jaco_Kok.jpg |
197 | +usr/share/backgrounds/Jelly_Fish_by_RaDu_GaLaN.jpg |
198 | +usr/share/backgrounds/Mono_Lake_by_Angela_Henderson.jpg |
199 | +usr/share/backgrounds/Partitura_by_Vincijun.jpg |
200 | +usr/share/backgrounds/Reflections_by_Trenton_Fox.jpg |
201 | +usr/share/backgrounds/Sea_Fury_by_Ian_Worrall.jpg |
202 | +usr/share/backgrounds/Water_web_by_Tom_Kijas.jpg |
203 | +usr/share/backgrounds/contest/trusty.xml |
204 | +usr/share/gnome-background-properties/trusty-wallpapers.xml |
205 | |
206 | === modified file 'po/POTFILES.in' |
207 | --- po/POTFILES.in 2013-08-23 09:39:26 +0000 |
208 | +++ po/POTFILES.in 2014-03-12 14:24:19 +0000 |
209 | @@ -9,3 +9,4 @@ |
210 | quantal-wallpapers.xml.in |
211 | raring-wallpapers.xml.in |
212 | saucy-wallpapers.xml.in |
213 | +trusty-wallpapers.xml.in |
214 | |
215 | === added file 'trusty-wallpapers.xml.in' |
216 | --- trusty-wallpapers.xml.in 1970-01-01 00:00:00 +0000 |
217 | +++ trusty-wallpapers.xml.in 2014-03-12 14:24:19 +0000 |
218 | @@ -0,0 +1,97 @@ |
219 | +<?xml version="1.0"?> |
220 | +<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd"> |
221 | +<wallpapers> |
222 | + <wallpaper deleted="false"> |
223 | + <name>Ubuntu 14.04 Community Wallpapers</name> |
224 | + <filename>/usr/share/backgrounds/contest/trusty.xml</filename> |
225 | + <options>zoom</options> |
226 | + </wallpaper> |
227 | + <wallpaper> |
228 | + <_name>Backyard Mushrooms</_name> |
229 | + <filename>/usr/share/backgrounds/Backyard_Mushrooms_by_Kurt_Zitzelman.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>Beach</_name> |
237 | + <filename>/usr/share/backgrounds/Beach_by_Renato_Giordanelli.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>Berries</_name> |
245 | + <filename>/usr/share/backgrounds/Berries_by_Tom_Kijas.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>Foggy Forest</_name> |
253 | + <filename>/usr/share/backgrounds/Foggy_Forest_by_Jake_Stewart.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>Ibanez Infinity</_name> |
261 | + <filename>/usr/share/backgrounds/Ibanez_Infinity_by_Jaco_Kok.jpg</filename> |
262 | + <options>zoom</options> |
263 | + <pcolor>#000000</pcolor> |
264 | + <scolor>#000000</scolor> |
265 | + <shade_type>solid</shade_type> |
266 | + </wallpaper> |
267 | + <wallpaper> |
268 | + <_name>Jelly Fish</_name> |
269 | + <filename>/usr/share/backgrounds/Jelly_Fish_by_RaDu_GaLaN.jpg</filename> |
270 | + <options>zoom</options> |
271 | + <pcolor>#000000</pcolor> |
272 | + <scolor>#000000</scolor> |
273 | + <shade_type>solid</shade_type> |
274 | + </wallpaper> |
275 | + <wallpaper> |
276 | + <_name>Mono Lake</_name> |
277 | + <filename>/usr/share/backgrounds/Mono_Lake_by_Angela_Henderson.jpg</filename> |
278 | + <options>zoom</options> |
279 | + <pcolor>#000000</pcolor> |
280 | + <scolor>#000000</scolor> |
281 | + <shade_type>solid</shade_type> |
282 | + </wallpaper> |
283 | + <wallpaper> |
284 | + <_name>Partitura</_name> |
285 | + <filename>/usr/share/backgrounds/Partitura_by_Vincijun.jpg</filename> |
286 | + <options>zoom</options> |
287 | + <pcolor>#000000</pcolor> |
288 | + <scolor>#000000</scolor> |
289 | + <shade_type>solid</shade_type> |
290 | + </wallpaper> |
291 | + <wallpaper> |
292 | + <_name>Reflections</_name> |
293 | + <filename>/usr/share/backgrounds/Reflections_by_Trenton_Fox.jpg</filename> |
294 | + <options>zoom</options> |
295 | + <pcolor>#000000</pcolor> |
296 | + <scolor>#000000</scolor> |
297 | + <shade_type>solid</shade_type> |
298 | + </wallpaper> |
299 | + <wallpaper> |
300 | + <_name>Sea Fury</_name> |
301 | + <filename>/usr/share/backgrounds/Sea_Fury_by_Ian_Worrall.jpg</filename> |
302 | + <options>zoom</options> |
303 | + <pcolor>#000000</pcolor> |
304 | + <scolor>#000000</scolor> |
305 | + <shade_type>solid</shade_type> |
306 | + </wallpaper> |
307 | + <wallpaper> |
308 | + <_name>Water web</_name> |
309 | + <filename>/usr/share/backgrounds/Water_web_by_Tom_Kijas.jpg</filename> |
310 | + <options>zoom</options> |
311 | + <pcolor>#000000</pcolor> |
312 | + <scolor>#000000</scolor> |
313 | + <shade_type>solid</shade_type> |
314 | + </wallpaper> |
315 | + </wallpapers> |
316 | |
317 | === modified file 'warty-final-ubuntu.png' |
318 | Binary files warty-final-ubuntu.png 2013-09-20 14:25:38 +0000 and warty-final-ubuntu.png 2014-03-12 14:24:19 +0000 differ |
FAILED: Continuous integration, rev:131 jenkins. qa.ubuntu. com/job/ ubuntu- wallpapers- ci/14/ jenkins. qa.ubuntu. com/job/ ubuntu- wallpapers- trusty- amd64-ci/ 3 jenkins. qa.ubuntu. com/job/ ubuntu- wallpapers- trusty- armhf-ci/ 3/console jenkins. qa.ubuntu. com/job/ ubuntu- wallpapers- trusty- i386-ci/ 3
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- wallpapers- ci/14/rebuild
http://