Merge lp:~nhaines/ubuntu-wallpapers/yakkety-fcs into lp:ubuntu-wallpapers

Proposed by Nathan Haines
Status: Merged
Merged at revision: 191
Proposed branch: lp:~nhaines/ubuntu-wallpapers/yakkety-fcs
Merge into: lp:ubuntu-wallpapers
Diff against target: 43 lines (+17/-1)
2 files modified
debian/changelog (+8/-0)
yakkety-wallpapers.xml.in (+9/-1)
To merge this branch: bzr merge lp:~nhaines/ubuntu-wallpapers/yakkety-fcs
Reviewer Review Type Date Requested Status
Iain Lane Pending
Review via email: mp+307787@code.launchpad.net

Description of the change

Noticed that one wallpaper was left out of the yakkety-wallpapers.xml.in file because it had a .png extension, and added that.

The rotation file was still referenced as xenial.xml. Updated to yakkety.xml in the wallpapers list.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-10-05 15:09:12 +0000
+++ debian/changelog 2016-10-06 03:53:11 +0000
@@ -1,3 +1,11 @@
1ubuntu-wallpapers (16.10.1-0ubuntu2) UNRELEASED; urgency=medium
2
3 * Added missing reference for ubuntu16_10_by_Khair_Rudin.png reference
4 to wallpaper list.
5 * Updated rotation list filename for yakkety.
6
7 -- Nathan Haines <nhaines@ubuntu.com> Wed, 05 Oct 2016 20:44:38 -0700
8
1ubuntu-wallpapers (16.10.1-0ubuntu1) yakkety; urgency=medium9ubuntu-wallpapers (16.10.1-0ubuntu1) yakkety; urgency=medium
210
3 * Add winning entries from the Ubuntu 16.10 Free Culture Showcase. (LP:11 * Add winning entries from the Ubuntu 16.10 Free Culture Showcase. (LP:
412
=== modified file 'yakkety-wallpapers.xml.in'
--- yakkety-wallpapers.xml.in 2016-10-05 14:56:53 +0000
+++ yakkety-wallpapers.xml.in 2016-10-06 03:53:11 +0000
@@ -3,7 +3,7 @@
3<wallpapers>3<wallpapers>
4 <wallpaper deleted="false">4 <wallpaper deleted="false">
5 <name>Ubuntu 16.10 Community Wallpapers</name>5 <name>Ubuntu 16.10 Community Wallpapers</name>
6 <filename>/usr/share/backgrounds/contest/xenial.xml</filename>6 <filename>/usr/share/backgrounds/contest/yakkety.xml</filename>
7 <options>zoom</options>7 <options>zoom</options>
8 </wallpaper>8 </wallpaper>
9 <wallpaper>9 <wallpaper>
@@ -79,6 +79,14 @@
79 <shade_type>solid</shade_type>79 <shade_type>solid</shade_type>
80 </wallpaper>80 </wallpaper>
81 <wallpaper>81 <wallpaper>
82 <_name>ubuntu16_10</_name>
83 <filename>/usr/share/backgrounds/ubuntu16_10_by_Khoir_Rudin.png</filename>
84 <options>zoom</options>
85 <pcolor>#000000</pcolor>
86 <scolor>#000000</scolor>
87 <shade_type>solid</shade_type>
88 </wallpaper>
89 <wallpaper>
82 <_name>ubuntu wallpaper 16 10 02</_name>90 <_name>ubuntu wallpaper 16 10 02</_name>
83 <filename>/usr/share/backgrounds/ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg</filename>91 <filename>/usr/share/backgrounds/ubuntu_wallpaper_16_10_02_by_screen_name_007.jpg</filename>
84 <options>zoom</options>92 <options>zoom</options>