Merge lp:~pitti/unity-greeter/systemd-indicators into lp:unity-greeter

[Martin Pitt]

* Move indicator launching from upstart to systemd.
* Depend on lightdm with the "no duplicate session D-Bus" fix.

Start the indicators through their systemd user units instead of upstart.

[Robert Ancell (robert-ancell)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-08-18 15:58:43 +0000
+++ debian/changelog	2016-10-26 08:27:48 +0000
@@ -1,3 +1,10 @@
+unity-greeter (17.04.1) UNRELEASED; urgency=medium
+
+  * Move indicator launching from upstart to systemd.
+  * Depend on lightdm with the "no duplicate session D-Bus" fix.
+
+ -- Martin Pitt <[e-mail]>  Tue, 25 Oct 2016 15:04:33 +0200
+
 unity-greeter (16.10.2.1) yakkety; urgency=medium
 
   * Apply the Gtk.ResizeMode.QUEUE fix to another place, so that the shutdown
 
=== modified file 'debian/control'
--- debian/control	2016-08-02 19:23:54 +0000
+++ debian/control	2016-10-26 08:27:48 +0000
@@ -31,7 +31,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         upstart,
+         systemd,
          unity-settings-daemon (>= 15.04.1+16.10.20160615-0ubuntu1)
 Recommends: indicator-application,
             indicator-datetime,
@@ -40,7 +40,7 @@
             indicator-session,
             indicator-sound,
             network-manager-gnome,
-            lightdm,
+            lightdm (>= 1.20.0-0ubuntu2~),
 Suggests: lightdm-remote-session-freerdp,
           lightdm-remote-session-uccsconfigure,
           remote-login-service,
 
=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2016-05-27 09:14:01 +0000
+++ src/unity-greeter.vala	2016-10-26 08:27:48 +0000
@@ -508,7 +508,6 @@
         Environment.set_variable ("GTK_MODULES", "atk-bridge", false);
 
         Pid atspi_pid = 0;
-        Pid upstart_pid = 0;
 
         try
         {
@@ -617,17 +616,17 @@
             {
                 string[] argv;
 
-                Shell.parse_argv ("upstart --user --startup-event indicator-services-start", out argv);
+                Shell.parse_argv ("systemctl --user start indicator-application indicator-power indicator-datetime indicator-keyboard indicator-session indicator-sound", out argv);
                 Process.spawn_async (null,
                                      argv,
                                      null,
                                      SpawnFlags.SEARCH_PATH,
                                      null,
-                                     out upstart_pid);
+                                     null);
             }
             catch (Error e)
             {
-                warning ("Error starting Upstart for indicators: %s", e.message);
+                warning ("Error starting indicators: %s", e.message);
             }
 
             /* Make nm-applet hide items the user does not have permissions to interact with */
@@ -655,18 +654,6 @@
 
         debug ("Cleaning up");
 
-        if (upstart_pid != 0)
-        {
-            Posix.kill (upstart_pid, Posix.SIGTERM);
-            int status;
-            Posix.waitpid (upstart_pid, out status, 0);
-            if (Process.if_exited (status))
-                debug ("Upstart exited with return value %d", Process.exit_status (status));
-            else
-                debug ("Upstart terminated with signal %d", Process.term_sig (status));
-            upstart_pid = 0;
-        }
-
         if (atspi_pid != 0)
         {
             Posix.kill (atspi_pid, Posix.SIGKILL);