Merge lp:~xnox/unity/no-more-upstart-dep into lp:unity

[Dimitri John Ledkov]

Drop libupstart-dev dependency, and simply include verbantim dbus object paths.

Drop libupstart-dev dependency, and simply include verbantim dbus object paths.

As per request from infinity.

[Marco Trevisan (Treviño) (3v1n0)]

Is this going to be removed from the archive?

I didn't use verbatim strings as I preferred to use defined values, but... As you and inifinity wish...

review: Approve

[Dimitri John Ledkov (xnox)]

On 20 April 2017 at 09:59, Marco Trevisan (Treviño) <[e-mail]> wrote:
> Review: Approve
>
> Is this going to be removed from the archive?
>

Yes. As soon as aa-series open

> I didn't use verbatim strings as I preferred to use defined values, but... As you and inifinity wish...

Whilst true, I will be dropping upstart into universe and completely
out of the archive fairly quickly once aa-series open, and definitely
ahead of desktop iso switching from unity7 to gnome.

--
Regards,

Dimitri.

=== modified file 'debian/control'
--- debian/control	2016-10-27 08:40:57 +0000
+++ debian/control	2017-04-10 12:11:43 +0000
@@ -42,7 +42,6 @@
                libunique-dev,
                libunity-dev (>= 7.1.0),
                libunity-misc-dev (>= 4.0.4),
-               libupstart-dev,
                libxcb-icccm4-dev,
                libxfixes-dev (>= 1:5.0.1),
                libxi-dev (>= 2:1.7.1.901),

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2016-10-26 21:19:33 +0000
+++ services/CMakeLists.txt	2017-04-10 12:11:43 +0000
@@ -12,7 +12,6 @@
     indicator3-0.4>=12.10.2
     x11
     libido3-0.1>=13.0.0
-    libupstart
 )
 
 pkg_check_modules(SERVICE_DEPS REQUIRED ${UNITY_PANEL_SERVICE_DEPS})

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2016-08-19 16:11:57 +0000
+++ services/panel-service.c	2017-04-10 12:11:43 +0000
@@ -34,8 +34,6 @@
 #include <X11/XF86keysym.h>
 #include <X11/extensions/XInput2.h>
 
-#include <upstart/upstart-dbus.h>
-
 G_DEFINE_TYPE (PanelService, panel_service, G_TYPE_OBJECT);
 
 #define GET_PRIVATE(o) \
@@ -843,9 +841,9 @@
       return;
     }
 
-  GVariant *result = g_dbus_connection_call_sync (conn, DBUS_SERVICE_UPSTART,
-                                                  DBUS_PATH_UPSTART,
-                                                  DBUS_INTERFACE_UPSTART,
+  GVariant *result = g_dbus_connection_call_sync (conn, "com.ubuntu.Upstart",
+                                                  "/com/ubuntu/Upstart",
+                                                  "com.ubuntu.Upstart0_6",
                                                   "EmitEvent",
                                                   g_variant_new ("(sasb)", event, NULL, 0),
                                                   NULL, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-11-29 16:54:18 +0000
+++ tests/CMakeLists.txt	2017-04-10 12:11:43 +0000
@@ -39,7 +39,7 @@
 #
 # Unit tests
 #
-set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;libupstart;xtst")
+set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;xtst")
 pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${TEST_DEPS})
 
 string (REPLACE ";" " " TEST_UNIT_DEPS_CFLAGS_OTHER "${TEST_UNIT_CFLAGS_OTHER}")

=== modified file 'unity-shared/UpstartWrapper.cpp'
--- unity-shared/UpstartWrapper.cpp	2016-09-02 13:36:37 +0000
+++ unity-shared/UpstartWrapper.cpp	2017-04-10 12:11:43 +0000
@@ -20,7 +20,6 @@
 #include "UpstartWrapper.h"
 
 #include <UnityCore/GLibDBusProxy.h>
-#include <upstart/upstart-dbus.h>
 
 namespace unity
 {
@@ -49,8 +48,8 @@
   auto flags = static_cast<GDBusProxyFlags>(G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
                                             G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS);
 
-  auto proxy = std::make_shared<unity::glib::DBusProxy>(test_mode_ ?  "com.canonical.Unity.Test.Upstart" : DBUS_SERVICE_UPSTART,
-                                                        DBUS_PATH_UPSTART, DBUS_INTERFACE_UPSTART,
+  auto proxy = std::make_shared<unity::glib::DBusProxy>(test_mode_ ?  "com.canonical.Unity.Test.Upstart" : "com.ubuntu.Upstart",
+                                                        "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6",
                                                         G_BUS_TYPE_SESSION, flags);
 
   proxy->CallBegin("EmitEvent", g_variant_new("(sasb)", name.c_str(), nullptr, 0), [proxy] (GVariant*, glib::Error const&) {});