ubuntu-wallpapers

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

  1. fix-for-1177260
  2. Merge into ubuntu
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
1=== modified file 'contest/karmic.xml'
2--- contest/karmic.xml 2012-02-28 14:39:26 +0000
3+++ contest/karmic.xml 2013-07-05 19:48:24 +0000
4@@ -151,6 +151,7 @@
5 <duration>5.0</duration>
6 <from>/usr/share/backgrounds/Sunset.jpg</from>
7 <to>/usr/share/backgrounds/TheRainbowisDead.jpg</to>
8+ </transition>
9 <static>
10 <duration>1795.0</duration>
11 <file>/usr/share/backgrounds/TheRainbowisDead.jpg</file>
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2013-05-30 00:25:10 +0000
15+++ debian/changelog 2013-07-05 19:48:24 +0000
16@@ -1,3 +1,9 @@
17+ubuntu-wallpapers (13.04.0daily13.05.30-0ubuntu2) saucy; urgency=low
18+
19+ * Fix the Karmic slideshow (LP: #1177260)
20+
21+ -- Nicolas Delvaux <contact@nicolas-delvaux.org> Fri, 05 Jul 2013 21:37:58 +0200
22+
23 ubuntu-wallpapers (13.04.0daily13.05.30-0ubuntu1) saucy; urgency=low
24
25 * Automatic snapshot from revision 100