Merge ~khurshid-alam/unity:port-media-keys-schemas into unity:master

[Khurshid Alam]

* Port media keys to use com.canonical.unity.settings-daemon. LP: #1842324

* Pick up changes made by Iain Lane from launchpad source

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

Ok, makes sense.

review: Approve

[Khurshid Alam (khurshid-alam)]

This one hasn't merged yet ?

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03bbea3..249b8fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,7 @@ if (BOOT_LOGGER)
     SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
 endif (BOOT_LOGGER)
 
-SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
+SET (MAINTAINER_CXXFLAGS "-Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
 
 option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
 if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
diff --git a/debian/changelog b/debian/changelog
index f6eb327..ebeef1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+unity (7.5.0+19.04.20190827-0ubuntu1) eoan; urgency=medium
+
+  * Disable Werror. It doesn't make sense to fail on compiler warnings for the
+    distro.
+  * Rebuild against libgnome-desktop-3-18
+
+ -- Iain Lane <[e-mail]>  Tue, 27 Aug 2019 11:10:00 +0100
+
 unity (7.5.0+19.04.20190304-0ubuntu1) disco; urgency=medium
 
   [ disco/unity: Failed to merge https://git.launchpad.net/unity. ]
diff --git a/lockscreen/LockScreenAcceleratorController.cpp b/lockscreen/LockScreenAcceleratorController.cpp
index 49dbd3b..ae9c3f0 100644
--- a/lockscreen/LockScreenAcceleratorController.cpp
+++ b/lockscreen/LockScreenAcceleratorController.cpp
@@ -34,7 +34,7 @@ namespace
 {
 DECLARE_LOGGER(logger, "unity.lockscreen.accelerator.controller");
 
-const std::string MEDIA_KEYS_SCHEMA = "org.gnome.settings-daemon.plugins.media-keys";
+const std::string MEDIA_KEYS_SCHEMA = "com.canonical.unity.settings-daemon.plugins.media-keys";
 const std::vector<std::string> ALLOWED_MEDIA_KEYS = {
   "logout",
   "magnifier",
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index fe5dff1..2829cd2 100644
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -34,7 +34,7 @@ set(PANEL_SOURCES
 set(CFLAGS
     ${SERVICE_DEPS_CFLAGS}
     ${SERVICE_DEPS_CFLAGS_OTHER}
-    "-Werror -Wall -Wno-error=deprecated-declarations"
+    "-Wall -Wno-error=deprecated-declarations"
     )
 
 string (REPLACE ";" " " CFLAGS "${CFLAGS}")
diff --git a/shortcuts/ShortcutHint.cpp b/shortcuts/ShortcutHint.cpp
index 8983745..44f26f3 100644
--- a/shortcuts/ShortcutHint.cpp
+++ b/shortcuts/ShortcutHint.cpp
@@ -31,7 +31,7 @@ namespace shortcut
 {
 namespace
 {
-    const std::string GNOME_MEDIA_SETTINGS = "org.gnome.settings-daemon.plugins.media-keys";
+    const std::string GNOME_MEDIA_SETTINGS = "com.canonical.unity.settings-daemon.plugins.media-keys";
     DECLARE_LOGGER(logger, "unity.shortcut");
 }
 // Ctor
diff --git a/tests/data/external.gschema.xml b/tests/data/external.gschema.xml
index 9b7c1a2..4fff60d 100644
--- a/tests/data/external.gschema.xml
+++ b/tests/data/external.gschema.xml
@@ -141,7 +141,7 @@
     </key>
   </schema>
 
-  <schema id="org.gnome.settings-daemon.plugins.media-keys" path="/org/gnome/settings-daemon/plugins/media-keys/">
+  <schema id="com.canonical.unity.settings-daemon.plugins.media-keys" path="/com/canonical/unity/settings-daemon/plugins/media-keys/">
     <key type="s" name="volume-mute">
       <default>'XF86AudioMute'</default>
     </key>