Merge lp:~darkxst/ubuntu/utopic/ubiquity/lp1318621 into lp:ubiquity

[Tim Lunn]

[Dimitri John Ledkov (xnox)]

(a) i cannot merge this as the branch does not appear to be based on lp:ubiquity and even though the diff looks sane I'm getting:
bzr: ERROR: Revision {<email address hidden>} not present in "Graph(StackedParentsProvider(bzrlib.repository._LazyListJoin(([CachingParentsProvider(None)], []))))".

(b) the patch looks correct so I will apply it by hand.

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-23 08:37:15 +0000
+++ debian/changelog	2014-05-13 02:20:57 +0000
@@ -1,3 +1,11 @@
+ubiquity (2.18.9) UNRELEASED; urgency=medium
+
+  * scripts/plugininstall.py: Remove obsolete code to generate wallpaper
+    cache, unity-settings-daemon/gnome-settings-daemon now run in install
+    mode (LP: #1318621) 
+
+ -- Tim Lunn <[e-mail]>  Tue, 13 May 2014 08:33:16 +1000
+
 ubiquity (2.18.8) trusty-proposed; urgency=medium
 
   [ Rohan Garg ]

=== modified file 'scripts/plugininstall.py'
--- scripts/plugininstall.py	2014-04-09 21:34:01 +0000
+++ scripts/plugininstall.py	2014-05-13 02:20:57 +0000
@@ -1617,13 +1617,8 @@
         target_user_wallpaper_cache_dir = os.path.join(target_user_cache_dir,
                                                        'wallpaper')
         if (not os.path.isdir(target_user_wallpaper_cache_dir) and
-            os.path.isfile('/usr/lib/gnome-settings-daemon/'
-                           'gnome-update-wallpaper-cache')):
-            # installer mode (else, g-s-d created it)
-            if not os.path.isdir(casper_user_wallpaper_cache_dir):
-                subprocess.call(['sudo', '-u', casper_user, '-i', 'DISPLAY=:0',
-                                 '/usr/lib/gnome-settings-daemon/'
-                                 'gnome-update-wallpaper-cache'])
+                os.path.isdir(casper_user_wallpaper_cache_dir)):
+
             # copy to targeted user
             uid = subprocess.Popen(
                 ['chroot', self.target, 'sudo', '-u', target_user, '--',