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

[Rohan Garg]

Add support for SDDM

[lp:~rohangarg/ubiquity/plasma5]

6205. By Dimitri John Ledkov on 2014-08-07

Remove redundant inactive labels in the user setup page. (LP:
#1283047).

6206. By Colin Watson on 2014-08-12

Automatic update of included source packages: partman-auto-lvm
54ubuntu1, partman-base 175ubuntu1, partman-crypto 74ubuntu1,
partman-lvm 91.

6207. By Colin Watson on 2014-08-12

releasing package ubiquity version 2.19.2

[Rohan Garg (rohangarg)]

Bump? Getting this in for the beta would be highly appreciated :)

[lp:~rohangarg/ubiquity/plasma5]

6208. By Jonathan Riddell on 2014-08-27

* Add support for sddm
* Automatic update of included source packages: flash-kernel
  3.0~rc.4ubuntu51.

6209. By Jonathan Riddell on 2014-08-28

* Revert addition of sddm to upstart job head of Beta 1,
  ubiquity-dm needs some fixes to support it
* Automatic update of included source packages: flash-kernel
  3.0~rc.4ubuntu52.

[Jonathan Riddell (jr)]

Reverted, needs further work to actually make ubiquity-dm transition to sddm correctly

[lp:~rohangarg/ubiquity/plasma5]

6210. By Rohan Garg on 2014-09-01

Accomodate for SDDM

6211. By Rohan Garg on 2014-09-02

* ubiquity/plugins/ubi-console-setup.py: use untranslated keyboard
  names, the GTK side does not translate them and comments say they
  do not work. KDE frontend has crashes due to keyboard names being
  translated so give up for now. LP: #1182784
* Re-add "console output" stanza to the oem-config upstart job to
  re-instate stdin/stdout. (LP: #1361595)
* Automatic update of included source packages: netcfg 1.119ubuntu1.

6212. By Rohan Garg on 2014-09-02

Accomodate for SDDM

=== modified file 'bin/ubiquity'
--- bin/ubiquity	2014-07-17 14:13:42 +0000
+++ bin/ubiquity	2014-09-02 13:48:56 +0000
@@ -67,7 +67,7 @@
     # Reverse actions of user-setup-apply.
     for name in ('/etc/gdm/custom.conf', '/etc/kde4/kdm/kdmrc',
                  '/etc/lxdm/lxdm.conf', '/etc/xdg/lubuntu/lxdm/lxdm.conf',
-                 '/etc/lightdm/lightdm.conf'):
+                 '/etc/lightdm/lightdm.conf', '/etc/sddm.conf'):
         if os.path.exists('%s.oem' % name):
             try:
                 os.rename('%s.oem' % name, name)

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-01 17:08:25 +0000
+++ debian/changelog	2014-09-02 13:48:56 +0000
@@ -1,3 +1,9 @@
+ubiquity (2.19.4ubuntu1) UNRELEASED; urgency=medium
+
+  * Accomodate for SDDM
+
+ -- Rohan Garg <[e-mail]>  Mon, 01 Sep 2014 13:51:49 +0200
+
 ubiquity (2.19.6) utopic; urgency=medium
 
   * ubiquity/plugins/ubi-console-setup.py: use untranslated keyboard

=== modified file 'debian/ubiquity.ubiquity.upstart'
--- debian/ubiquity.ubiquity.upstart	2014-08-28 12:34:47 +0000
+++ debian/ubiquity.ubiquity.upstart	2014-09-02 13:48:56 +0000
@@ -11,13 +11,15 @@
 	  or starting kdm
 	  or starting xdm
 	  or starting lxdm
-	  or starting lightdm)
+	  or starting lightdm
+          or starting sddm)
 stop on (runlevel [06]
 	 or stopping gdm
 	 or stopping kdm
 	 or stopping xdm
 	 or stopping lxdm
-	 or stopping lightdm)
+	 or stopping lightdm
+         or stopping sddm)
 
 task
 normal exit 0 1