Merge lp:~gilir/ubiquity/lp-546445 into lp:ubiquity

[Julien Lavergne]

Add support for Lubuntu in ubiquity-dm mode.

[lp:~gilir/ubiquity/lp-546445]

4436. By Evan on 2010-11-23

Do not filter out partitions in migration-assistant anymore.
parted_server is no longer running by the time it starts, but that's
of no matter as it runs long after the partitioning has been
committed.

4437. By Evan on 2010-11-23

Automatic update of included source packages: apt-setup
1:0.49ubuntu1, base-installer 1.114ubuntu1, choose-mirror
2.36ubuntu1, clock-setup 0.105ubuntu1, debian-installer-utils
1.81ubuntu1, grub-installer 1.57ubuntu1, hw-detect 1.81ubuntu1,
migration-assistant 0.6.8, netcfg 1.57ubuntu2, partconf 1.35,
partman-base 146ubuntu2, partman-basicfilesystems 68ubuntu1,
partman-basicmethods 46, partman-btrfs 4, partman-efi 22ubuntu1,
partman-ext3 61ubuntu1, partman-jfs 32, partman-newworld 24,
partman-partitioning 78ubuntu1, partman-reiserfs 49, partman-target
70ubuntu1, partman-xfs 46, preseed 1.47, yaboot-installer
1.1.18ubuntu1.

4438. By Evan on 2010-11-23

releasing version 2.5.1

[Colin Watson (cjwatson)]

Thanks! This looks fine and I'll merge it. My only comment is that debian/oem-config.oem-config.upstart should be kept in sync with debian/ubiquity.ubiquity.upstart; I'll sort this out myself after merging your branch.

review: Approve

[lp:~gilir/ubiquity/lp-546445]

4439. By Colin Watson on 2010-11-29

merge lp:~gilir/ubiquity/lp-546445

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2010-09-21 08:29:43 +0000
+++ bin/ubiquity-dm	2010-11-22 20:26:15 +0000
@@ -350,10 +350,12 @@
                 wm_cmd = ['xfwm4']
             elif osextras.find_on_path('matchbox-window-manager'):
                 wm_cmd = ['matchbox-window-manager']
+            elif osextras.find_on_path('openbox-lubuntu'):
+                wm_cmd = ['openbox-lubuntu']
             else:
                 raise MissingProgramError, \
                     ("No window manager found (tried metacity, xfwm4, "
-                     "matchbox-window-manager)")
+                     "matchbox-window-manager, openbox-lubuntu)")
             wm = subprocess.Popen(wm_cmd,
                 stdin=null, stdout=logfile, stderr=logfile,
                 **maybe_drop_privileges)
@@ -376,6 +378,12 @@
                     stdin=null, stdout=logfile, stderr=logfile,
                     **maybe_drop_privileges))
 
+            if osextras.find_on_path('lxsession'):
+                extras.append(subprocess.Popen(
+                    ['lxsession','-s','Lubuntu', '-e', 'LXDE', '-a'],
+                    stdin=null, stdout=logfile, stderr=logfile,
+                    **maybe_drop_privileges))
+
             if os.path.exists('/usr/lib/ubiquity/panel') and "xfwm4" not in wm_cmd:
                 extras.append(subprocess.Popen(
                     ['/usr/lib/ubiquity/panel'],
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-11-17 11:07:48 +0000
+++ debian/changelog	2010-11-22 20:26:15 +0000
@@ -8,7 +8,12 @@
   * Expose the navigation control in the GTK frontend API.
     Thanks Ying-Chun Liu!
 
- -- Colin Watson <[e-mail]>  Mon, 15 Nov 2010 12:05:19 +0000
+  [ Julien Lavergne ]
+  * debian/ubiquity.ubiquity.upstart:
+   - Add lxdm support.
+  * Add support for openbox-lubuntu and lxsession for ubiquity-dm (LP: #546445)
+
+ -- Julien Lavergne <[e-mail]>  Mon, 22 Nov 2010 19:45:30 +0100
 
 ubiquity (2.5.0) natty; urgency=low
 
 
=== modified file 'debian/ubiquity.ubiquity.upstart'
--- debian/ubiquity.ubiquity.upstart	2010-09-20 09:13:41 +0000
+++ debian/ubiquity.ubiquity.upstart	2010-11-22 20:26:15 +0000
@@ -10,11 +10,13 @@
 start on (starting gdm
 	  or starting kdm
 	  or starting xdm
+	  or starting lxdm
 	  or starting uxlaunch)
 stop on (runlevel [06]
 	 or stopping gdm
 	 or stopping kdm
 	 or stopping xdm
+	 or stopping lxdm
 	 or stopping uxlaunch)
 
 task