ubiquity

Merge lp:~rohangarg/ubiquity/plasma5 into lp:ubiquity

  1. plasma5
  2. Merge into trunk
Proposed by Rohan Garg
Status: Merged
Merged at revision: 6199
Proposed branch: lp:~rohangarg/ubiquity/plasma5
Merge into: lp:ubiquity
Diff against target: 44 lines (+12/-2)
3 files modified
bin/ubiquity-dm (+5/-1)
debian/changelog (+6/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~rohangarg/ubiquity/plasma5
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+227341@code.launchpad.net

Description of the change

Make sure ubiquity works with plasma 5 kwin as well.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
lp:~rohangarg/ubiquity/plasma5 updated
6199. By Colin Watson

Make sure ubiquity-dm works on Plasma 5 KWin.

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 2014-07-16 12:22:57 +0000
3+++ bin/ubiquity-dm 2014-07-18 14:53:42 +0000
4@@ -575,8 +575,12 @@
5 log("add_ubiquity_kdedir")
6 add_ubiquity_kdedir()
7 log('start kwin')
8+ if osextras.find_on_path('kwin'):
9+ wm_cmd = [ 'kwin']
10+ elif osextras.find_on_path('kwin_x11'):
11+ wm_cmd = [ 'kwin_x11' ]
12 wm = subprocess.Popen(
13- 'kwin', stdin=null, stdout=logfile, stderr=logfile,
14+ wm_cmd, stdin=null, stdout=logfile, stderr=logfile,
15 preexec_fn=self.drop_privileges)
16
17 log('start greeter')
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2014-07-18 08:57:47 +0000
21+++ debian/changelog 2014-07-18 14:53:42 +0000
22@@ -1,3 +1,9 @@
23+ubiquity (2.18.11ubuntu1) UNRELEASED; urgency=medium
24+
25+ * Make sure ubiquity-dm works on Plasma 5 KWin
26+
27+ -- Rohan Garg <rohangarg@kubuntu.org> Fri, 18 Jul 2014 16:43:56 +0200
28+
29 ubiquity (2.18.11) utopic; urgency=medium
30
31 [ Martin Wimpress ]
32
33=== modified file 'debian/control'
34--- debian/control 2014-07-09 11:51:36 +0000
35+++ debian/control 2014-07-18 14:53:42 +0000
36@@ -56,7 +56,7 @@
37
38 Package: ubiquity-frontend-kde
39 Architecture: all
40-Depends: ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-pyqt4, kde-window-manager, xauth, python3-dbus, python3-dbus.mainloop.qt
41+Depends: ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-pyqt4, kde-window-manager | kwin, xauth, python2-dbus, python3-dbus.mainloop.qt
42 Provides: ubiquity-frontend-${mangled-version}
43 Description: KDE frontend for Ubiquity live installer
44 This package provides a KDE-based user interface frontend for the Ubiquity

Subscribers

People subscribed via source and target branches

to status/vote changes: