Merge lp:~gilir/ubiquity/lubuntu-wallpaper into lp:ubiquity

[Julien Lavergne]

Following 2.13.11 release by adding specific Lubuntu items for the wallpaper in ubiquity-dm.

[Dimitri John Ledkov (xnox)]

Despite adding the snippet to launch pcmanfm, there is no background. Also note that I can write click on the blackness and launch a terminal which indicates a defunct pcmanfm. Not sure if it is related.
Am I testing this wrong? or am I missing something?

[Dimitri John Ledkov (xnox)]

Looks like all reverse-dependencies of feh are seeded, maybe we can seed feh into lubuntu and use that?

[lp:~gilir/ubiquity/lubuntu-wallpaper]

5817. By Julien Lavergne on 2013-02-22

Use feh instead of pcmanfm for setting the background.

5818. By Julien Lavergne on 2013-02-22

Use feh instead of pcmanfm for the wallpaper with ubiquity-dm

5819. By Julien Lavergne on 2013-02-22

Update debian/changelog

[Julien Lavergne (gilir)]

You're right, it's not working using pcmanfm, but I don't know why. I'll look at it if I have time, but the solution using feh was also my backup plan. I updated the branch to reflect this change, I'll add also feh to the seed to add it to the live session.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2013-02-21 02:18:33 +0000
+++ bin/ubiquity-dm	2013-02-22 21:48:21 +0000
@@ -326,6 +326,7 @@
                     '/usr/share/backgrounds/edubuntu_default.png',
                     '/usr/share/xfce4/backdrops/macinnis_wallpaper.png',
                     '/usr/share/xfce4/backdrops/xubuntu-precise-right.png',
+                    '/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png',
                     '/usr/share/backgrounds/warty-final-ubuntu.png'):
                 exists = os.access(background, os.R_OK)
                 if exists:
@@ -443,6 +444,14 @@
                     stdin=null, stdout=logfile, stderr=logfile,
                     preexec_fn=self.drop_privileges))
 
+            if (os.path.exists('/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png') and
+                    osextras.find_on_path('feh')):
+                proc = subprocess.Popen(
+                    ['feh', '--bg-max=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png'],
+                    stdin=null, stdout=logfile, stderr=logfile,
+                    preexec_fn=self.drop_privileges)
+                extras.append(proc)
+
             if (os.path.exists('/usr/lib/ubiquity/panel') and
                     "xfwm4" not in wm_cmd):
                 if "openbox-lubuntu" not in wm_cmd and "openbox" not in wm_cmd:

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-21 16:43:03 +0000
+++ debian/changelog	2013-02-22 21:48:21 +0000
@@ -1,9 +1,13 @@
 ubiquity (2.13.13) UNRELEASED; urgency=low
 
+  [ Dmitrijs Ledkovs ]
   * Bump Standards version and override some lintian tags (ubiquity is
     weird).
 
- -- Dmitrijs Ledkovs <[e-mail]>  Thu, 21 Feb 2013 16:42:19 +0000
+  [ Julien Lavergne ]
+  * Use feh to draw the wallpaper on Lubuntu when using ubiquity-dm.
+
+ -- Julien Lavergne <[e-mail]>  Fri, 22 Feb 2013 22:44:40 +0100
 
 ubiquity (2.13.12) raring; urgency=low