Merge lp:~djfun/ubuntu-wallpapers/fix-spelling-mistake into lp:ubuntu-wallpapers

Proposed by Martin Kaistra
Status: Merged
Merged at revision: 209
Proposed branch: lp:~djfun/ubuntu-wallpapers/fix-spelling-mistake
Merge into: lp:ubuntu-wallpapers
Diff against target: 61 lines (+7/-7)
4 files modified
artful-wallpapers.xml.in (+2/-2)
contest/artful.xml (+3/-3)
debian/copyright (+1/-1)
debian/ubuntu-wallpapers-artful.install (+1/-1)
To merge this branch: bzr merge lp:~djfun/ubuntu-wallpapers/fix-spelling-mistake
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+330935@code.launchpad.net

Description of the change

fixes spelling mistake

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

cheers

This is a really large upload so I won't upload just for this, but the change will be in the next upload that we make.

review: Approve
Revision history for this message
Martin Kaistra (djfun) wrote :

will there be a new upload before release of 17.10 or at least around that time, so users will actually see this fix?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'Bee_on_lavendar_by_Martin.jpg' => 'Bee_on_lavender_by_Martin.jpg'
=== modified file 'artful-wallpapers.xml.in'
--- artful-wallpapers.xml.in 2017-09-14 09:19:32 +0000
+++ artful-wallpapers.xml.in 2017-09-18 19:33:40 +0000
@@ -7,8 +7,8 @@
7 <options>zoom</options>7 <options>zoom</options>
8 </wallpaper>8 </wallpaper>
9 <wallpaper>9 <wallpaper>
10 <_name>Bee on lavendar</_name>10 <_name>Bee on lavender</_name>
11 <filename>/usr/share/backgrounds/Bee_on_lavendar_by_Martin.jpg</filename>11 <filename>/usr/share/backgrounds/Bee_on_lavender_by_Martin.jpg</filename>
12 <options>zoom</options>12 <options>zoom</options>
13 <pcolor>#000000</pcolor>13 <pcolor>#000000</pcolor>
14 <scolor>#000000</scolor>14 <scolor>#000000</scolor>
1515
=== modified file 'contest/artful.xml'
--- contest/artful.xml 2017-09-14 09:19:32 +0000
+++ contest/artful.xml 2017-09-18 19:33:40 +0000
@@ -42,15 +42,15 @@
42 <transition>42 <transition>
43 <duration>5.0</duration>43 <duration>5.0</duration>
44 <from>/usr/share/backgrounds/Lily_of_the_Valley_by_Robert_Slotte.jpg</from>44 <from>/usr/share/backgrounds/Lily_of_the_Valley_by_Robert_Slotte.jpg</from>
45 <to>/usr/share/backgrounds/Bee_on_lavendar_by_Martin.jpg</to>45 <to>/usr/share/backgrounds/Bee_on_lavender_by_Martin.jpg</to>
46 </transition>46 </transition>
47 <static>47 <static>
48 <duration>1795.0</duration>48 <duration>1795.0</duration>
49 <file>/usr/share/backgrounds/Bee_on_lavendar_by_Martin.jpg</file>49 <file>/usr/share/backgrounds/Bee_on_lavender_by_Martin.jpg</file>
50 </static>50 </static>
51 <transition>51 <transition>
52 <duration>5.0</duration>52 <duration>5.0</duration>
53 <from>/usr/share/backgrounds/Bee_on_lavendar_by_Martin.jpg</from>53 <from>/usr/share/backgrounds/Bee_on_lavender_by_Martin.jpg</from>
54 <to>/usr/share/backgrounds/Green_Island_by_Radu_Galan.jpg</to>54 <to>/usr/share/backgrounds/Green_Island_by_Radu_Galan.jpg</to>
55 </transition>55 </transition>
56 <static>56 <static>
5757
=== modified file 'debian/copyright'
--- debian/copyright 2017-09-14 09:19:32 +0000
+++ debian/copyright 2017-09-18 19:33:40 +0000
@@ -42,7 +42,7 @@
42 Purple_Daisy_by_Maria_Scotto.jpg42 Purple_Daisy_by_Maria_Scotto.jpg
43 Some_Light_Reading_by_Brandilyn_Carpenter.jpg43 Some_Light_Reading_by_Brandilyn_Carpenter.jpg
44 there_is_something_human_in_that_stuff_by_Pierre_Cante.jpg44 there_is_something_human_in_that_stuff_by_Pierre_Cante.jpg
45 Bee_on_lavendar_by_Martin.jpg45 Bee_on_lavender_by_Martin.jpg
46 Bloom_by_Victor_Madru.jpg46 Bloom_by_Victor_Madru.jpg
47 Green_Island_by_Radu_Galan.jpg47 Green_Island_by_Radu_Galan.jpg
48 Headstock_by_Bernhard_Hanakam.jpg48 Headstock_by_Bernhard_Hanakam.jpg
4949
=== modified file 'debian/ubuntu-wallpapers-artful.install'
--- debian/ubuntu-wallpapers-artful.install 2017-09-14 09:19:32 +0000
+++ debian/ubuntu-wallpapers-artful.install 2017-09-18 19:33:40 +0000
@@ -1,4 +1,4 @@
1usr/share/backgrounds/Bee_on_lavendar_by_Martin.jpg1usr/share/backgrounds/Bee_on_lavender_by_Martin.jpg
2usr/share/backgrounds/Bloom_by_Victor_Madru.jpg2usr/share/backgrounds/Bloom_by_Victor_Madru.jpg
3usr/share/backgrounds/Grand_Canyon_North_Rim_by_Rihards_Vilks.jpg3usr/share/backgrounds/Grand_Canyon_North_Rim_by_Rihards_Vilks.jpg
4usr/share/backgrounds/Green_Island_by_Radu_Galan.jpg4usr/share/backgrounds/Green_Island_by_Radu_Galan.jpg