Merge lp:~nhaines/ubuntu-wallpapers/fix-photo-filename into lp:ubuntu-wallpapers

Proposed by Nathan Haines
Status: Merged
Merged at revision: 168
Proposed branch: lp:~nhaines/ubuntu-wallpapers/fix-photo-filename
Merge into: lp:ubuntu-wallpapers
Diff against target: 77 lines (+13/-7)
5 files modified
contest/wily.xml (+3/-3)
debian/changelog (+6/-0)
debian/copyright (+1/-1)
debian/ubuntu-wallpapers-wily.install (+1/-1)
wily-wallpapers.xml.in (+2/-2)
To merge this branch: bzr merge lp:~nhaines/ubuntu-wallpapers/fix-photo-filename
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+273192@code.launchpad.net

Description of the change

The photographer of P5160283 supplied a title, and I've renamed the image and its references accordingly. If you could merge this and rebuild the package it would be greatly appreciated.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

I reapplied 15.10.2-0ubuntu2 and uploaded it to wily. It will be sitting in the review queue now: https://launchpad.net/ubuntu/wily/+queue?queue_state=1&queue_text=ubuntu-wallpapers

review: Approve
Revision history for this message
Iain Lane (laney) wrote :

Daniel, would you please make sure that you push ubuntu2 and this to the VCS?

Revision history for this message
Daniel Holbach (dholbach) wrote :

Done.

Revision history for this message
Iain Lane (laney) wrote :

thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'P5160283_by_Dariusz_Duma.jpg' => 'Light_my_fire_evening_sun_by_Dariusz_Duma.jpg'
2=== modified file 'contest/wily.xml'
3--- contest/wily.xml 2015-09-30 11:04:52 +0000
4+++ contest/wily.xml 2015-10-02 08:52:46 +0000
5@@ -24,15 +24,15 @@
6 <transition>
7 <duration>5.0</duration>
8 <from>/usr/share/backgrounds/Tranquil_by_Pat_David.jpg</from>
9- <to>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</to>
10+ <to>/usr/share/backgrounds/Light_my_fire_evening_sun_by_Dariusz_Duma.jpg</to>
11 </transition>
12 <static>
13 <duration>1795.0</duration>
14- <file>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</file>
15+ <file>/usr/share/backgrounds/Light_my_fire_evening_sun_by_Dariusz_Duma.jpg</file>
16 </static>
17 <transition>
18 <duration>5.0</duration>
19- <from>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</from>
20+ <from>/usr/share/backgrounds/Light_my_fire_evening_sun_by_Dariusz_Duma.jpg</from>
21 <to>/usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg</to>
22 </transition>
23 <static>
24
25=== modified file 'debian/changelog'
26--- debian/changelog 2015-09-30 11:04:52 +0000
27+++ debian/changelog 2015-10-02 08:52:46 +0000
28@@ -1,3 +1,9 @@
29+ubuntu-wallpapers (15.10.3-0ubuntu1) wily; urgency=medium
30+
31+ * Renamed "P5160283" to "Light my fire evening sun" as per photographer.
32+
33+ -- Nathan Haines <nhaines@ubuntu.com> Fri, 02 Oct 2015 01:31:52 -0700
34+
35 ubuntu-wallpapers (15.10.2-0ubuntu1) wily; urgency=medium
36
37 * Add winners of wallpaper competition.
38
39=== modified file 'debian/copyright'
40--- debian/copyright 2015-09-30 11:04:52 +0000
41+++ debian/copyright 2015-10-02 08:52:46 +0000
42@@ -4,7 +4,7 @@
43
44 Files: Tramonto_a_Scalea_by_Renatvs88.jpg
45 Tranquil_by_Pat_David.jpg
46- P5160283_by_Dariusz_Duma.jpg
47+ Light_my_fire_evening_sun_by_Dariusz_Duma.jpg
48 Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg
49 Moss_inflorescence_by_carmelo75.jpg
50 Breaker_by_Lyle_Nel.jpg
51
52=== modified file 'debian/ubuntu-wallpapers-wily.install'
53--- debian/ubuntu-wallpapers-wily.install 2015-09-30 11:04:52 +0000
54+++ debian/ubuntu-wallpapers-wily.install 2015-10-02 08:52:46 +0000
55@@ -1,6 +1,6 @@
56 usr/share/backgrounds/Tramonto_a_Scalea_by_Renatvs88.jpg
57 usr/share/backgrounds/Tranquil_by_Pat_David.jpg
58-usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg
59+usr/share/backgrounds/Light_my_fire_evening_sun_by_Dariusz_Duma.jpg
60 usr/share/backgrounds/Sitting_Here,_Making_Fun_by_Philipp_Haegi.jpg
61 usr/share/backgrounds/Moss_inflorescence_by_carmelo75.jpg
62 usr/share/backgrounds/Breaker_by_Lyle_Nel.jpg
63
64=== modified file 'wily-wallpapers.xml.in'
65--- wily-wallpapers.xml.in 2015-09-30 11:04:52 +0000
66+++ wily-wallpapers.xml.in 2015-10-02 08:52:46 +0000
67@@ -23,8 +23,8 @@
68 <shade_type>solid</shade_type>
69 </wallpaper>
70 <wallpaper>
71- <_name>P5160283</_name>
72- <filename>/usr/share/backgrounds/P5160283_by_Dariusz_Duma.jpg</filename>
73+ <_name>Light my fire evening sun</_name>
74+ <filename>/usr/share/backgrounds/Light_my_fire_evening_sun_by_Dariusz_Duma.jpg</filename>
75 <options>zoom</options>
76 <pcolor>#000000</pcolor>
77 <scolor>#000000</scolor>