Merge lp:~malizor/ubuntu-wallpapers/fix-for-1177260 into lp:ubuntu-wallpapers

Proposed by Nicolas Delvaux
Status: Merged
Merged at revision: 102
Proposed branch: lp:~malizor/ubuntu-wallpapers/fix-for-1177260
Merge into: lp:ubuntu-wallpapers
Diff against target: 25 lines (+7/-0)
2 files modified
contest/karmic.xml (+1/-0)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~malizor/ubuntu-wallpapers/fix-for-1177260
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
Review via email: mp+173269@code.launchpad.net

Commit message

Fix the Karmic slideshow (LP: #1177260)

Description of the change

This fixes a trivial XML error that prevented the Karmic slideshow to work.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'contest/karmic.xml'
--- contest/karmic.xml 2012-02-28 14:39:26 +0000
+++ contest/karmic.xml 2013-07-05 19:48:24 +0000
@@ -151,6 +151,7 @@
151 <duration>5.0</duration>151 <duration>5.0</duration>
152 <from>/usr/share/backgrounds/Sunset.jpg</from>152 <from>/usr/share/backgrounds/Sunset.jpg</from>
153 <to>/usr/share/backgrounds/TheRainbowisDead.jpg</to>153 <to>/usr/share/backgrounds/TheRainbowisDead.jpg</to>
154 </transition>
154 <static>155 <static>
155 <duration>1795.0</duration>156 <duration>1795.0</duration>
156 <file>/usr/share/backgrounds/TheRainbowisDead.jpg</file>157 <file>/usr/share/backgrounds/TheRainbowisDead.jpg</file>
157158
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-30 00:25:10 +0000
+++ debian/changelog 2013-07-05 19:48:24 +0000
@@ -1,3 +1,9 @@
1ubuntu-wallpapers (13.04.0daily13.05.30-0ubuntu2) saucy; urgency=low
2
3 * Fix the Karmic slideshow (LP: #1177260)
4
5 -- Nicolas Delvaux <contact@nicolas-delvaux.org> Fri, 05 Jul 2013 21:37:58 +0200
6
1ubuntu-wallpapers (13.04.0daily13.05.30-0ubuntu1) saucy; urgency=low7ubuntu-wallpapers (13.04.0daily13.05.30-0ubuntu1) saucy; urgency=low
28
3 * Automatic snapshot from revision 1009 * Automatic snapshot from revision 100