Merge lp:~smartboyhw/ubiquity/ubuntustudio-wallpaper-fix into lp:ubiquity

[Howard Chan]

The Ubuntu Studio default wallpaper has changed from ubuntustudio-rock.png to ubuntustudio-1310.png. Unfortunately, while we do the transition we forgot to change the related lines in ubiquity, so when selecting "Install Ubuntu Studio" when booting the Ubuntu Studio 13.10 daily images, the installer's background wallpaper is still the Rock wallpaper. This commit fixes LP: #1229651 and uses the new default wallpaper as the background wallpaper for ubiquity installation.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2013-09-20 19:07:16 +0000
+++ bin/ubiquity-dm	2013-09-24 13:04:40 +0000
@@ -304,7 +304,7 @@
             background_image = None
             for background in (
                     '/usr/share/backgrounds/edubuntu_default.png',
-                    '/usr/share/xfce4/backdrops/ubuntustudio-rock.png',
+                    '/usr/share/xfce4/backdrops/ubuntustudio-1310.png',
                     '/usr/share/xfce4/backdrops/xubuntu-wallpaper.png',
                     '/usr/share/lubuntu/wallpapers/'
                     'lubuntu-default-wallpaper.png',

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-24 09:57:36 +0000
+++ debian/changelog	2013-09-24 13:04:40 +0000
@@ -1,7 +1,11 @@
 ubiquity (2.15.20) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * (Build-)depend on python3-icu rather than transitional python3-pyicu.
 
+  [ Howard Chan ]
+  * Fix the new Ubuntu Studio wallpaper backdrop for ubiquity. (LP: #1229651)
+
  -- Colin Watson <[e-mail]>  Tue, 24 Sep 2013 10:57:15 +0100
 
 ubiquity (2.15.19) saucy; urgency=low