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

Proposed by Julien Lavergne
Status: Merged
Merged at revision: 4439
Proposed branch: lp:~gilir/ubiquity/lp-546445
Merge into: lp:ubiquity
Diff against target: 66 lines (+17/-2)
3 files modified
bin/ubiquity-dm (+9/-1)
debian/changelog (+6/-1)
debian/ubiquity.ubiquity.upstart (+2/-0)
To merge this branch: bzr merge lp:~gilir/ubiquity/lp-546445
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+41509@code.launchpad.net

Description of the change

Add support for Lubuntu in ubiquity-dm mode.

To post a comment you must log in.
lp:~gilir/ubiquity/lp-546445 updated
4436. By Evan

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

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

releasing version 2.5.1

Revision history for this message
Colin Watson (cjwatson) wrote :

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 updated
4439. By Colin Watson

merge lp:~gilir/ubiquity/lp-546445

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubiquity-dm'
2--- bin/ubiquity-dm 2010-09-21 08:29:43 +0000
3+++ bin/ubiquity-dm 2010-11-22 20:26:15 +0000
4@@ -350,10 +350,12 @@
5 wm_cmd = ['xfwm4']
6 elif osextras.find_on_path('matchbox-window-manager'):
7 wm_cmd = ['matchbox-window-manager']
8+ elif osextras.find_on_path('openbox-lubuntu'):
9+ wm_cmd = ['openbox-lubuntu']
10 else:
11 raise MissingProgramError, \
12 ("No window manager found (tried metacity, xfwm4, "
13- "matchbox-window-manager)")
14+ "matchbox-window-manager, openbox-lubuntu)")
15 wm = subprocess.Popen(wm_cmd,
16 stdin=null, stdout=logfile, stderr=logfile,
17 **maybe_drop_privileges)
18@@ -376,6 +378,12 @@
19 stdin=null, stdout=logfile, stderr=logfile,
20 **maybe_drop_privileges))
21
22+ if osextras.find_on_path('lxsession'):
23+ extras.append(subprocess.Popen(
24+ ['lxsession','-s','Lubuntu', '-e', 'LXDE', '-a'],
25+ stdin=null, stdout=logfile, stderr=logfile,
26+ **maybe_drop_privileges))
27+
28 if os.path.exists('/usr/lib/ubiquity/panel') and "xfwm4" not in wm_cmd:
29 extras.append(subprocess.Popen(
30 ['/usr/lib/ubiquity/panel'],
31
32=== modified file 'debian/changelog'
33--- debian/changelog 2010-11-17 11:07:48 +0000
34+++ debian/changelog 2010-11-22 20:26:15 +0000
35@@ -8,7 +8,12 @@
36 * Expose the navigation control in the GTK frontend API.
37 Thanks Ying-Chun Liu!
38
39- -- Colin Watson <cjwatson@ubuntu.com> Mon, 15 Nov 2010 12:05:19 +0000
40+ [ Julien Lavergne ]
41+ * debian/ubiquity.ubiquity.upstart:
42+ - Add lxdm support.
43+ * Add support for openbox-lubuntu and lxsession for ubiquity-dm (LP: #546445)
44+
45+ -- Julien Lavergne <gilir@ubuntu.com> Mon, 22 Nov 2010 19:45:30 +0100
46
47 ubiquity (2.5.0) natty; urgency=low
48
49
50=== modified file 'debian/ubiquity.ubiquity.upstart'
51--- debian/ubiquity.ubiquity.upstart 2010-09-20 09:13:41 +0000
52+++ debian/ubiquity.ubiquity.upstart 2010-11-22 20:26:15 +0000
53@@ -10,11 +10,13 @@
54 start on (starting gdm
55 or starting kdm
56 or starting xdm
57+ or starting lxdm
58 or starting uxlaunch)
59 stop on (runlevel [06]
60 or stopping gdm
61 or stopping kdm
62 or stopping xdm
63+ or stopping lxdm
64 or stopping uxlaunch)
65
66 task

Subscribers

People subscribed via source and target branches

to status/vote changes: