Modernize kb layouts

debian/cinnamon-settings-daemon.install

@@ -4,7 +4,6 @@ usr/lib/*/cinnamon-settings-daemon*/*.so
 usr/lib/*/cinnamon-settings-daemon/
 usr/libexec
 usr/share/applications/*
-usr/share/cinnamon-settings-daemon
 usr/share/dbus-1/*/org.cinnamon.SettingsDaemon.*
 usr/share/glib-2.0/*/org.cinnamon.settings-daemon.*
 usr/share/icons/*/*/*/csd*

debian/control

@@ -13,7 +13,6 @@ Build-Depends:
  libcvc-dev (>= 3.4~),
  libfontconfig1-dev,
  libglib2.0-dev (>= 2.37.3),
- libgnomekbd-dev (>= 3.6.0),
  libgtk-3-dev (>= 3.9.10),
  libgudev-1.0-dev [linux-any],
  liblcms2-dev,
@@ -29,7 +28,6 @@ Build-Depends:
  libx11-dev,
  libxext-dev,
  libxi-dev,
- libxklavier-dev,
  meson (>= 0.47),
  xsltproc,
 Build-Conflicts:
@@ -65,3 +63,14 @@ Multi-Arch: same
 Description: Headers for building applications communicating with cinnamon-settings-daemon
  This package contains header files required to build applications that
  communicate with the Cinnamon settings daemon over D-Bus.
+
+Package: cinnamon-settings-daemon-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ cinnamon-settings-daemon (= ${binary:Version}),
+ ${misc:Depends},
+Description: Debugging symbols for cinnamon-settings-daemon
+ .
+ This package contains the debugging symbols.

debian/rules

@@ -22,4 +22,7 @@ override_dh_makeshlibs:
 	# Disabled, there are no shared libraries, but some plugins that cause this
 	# to fail
 
+override_dh_strip:
+	dh_strip --dbg-package=cinnamon-settings-daemon-dbg
+
 override_dh_dwz:

meson.build

@@ -51,13 +51,9 @@ fontconfig = dependency('fontconfig')
 gio = dependency('gio-2.0', version: '>= 2.40.0')
 gio_unix = dependency('gio-unix-2.0', version: '>= 2.40.0')
 glib = dependency('glib-2.0', version: '>= 2.40.0')
-gnomekbd_required = '>= 3.6.0'
-gnomekbd = dependency('libgnomekbd', version: gnomekbd_required)
-gnomekbdui = dependency('libgnomekbdui', version: gnomekbd_required)
 gtk = dependency('gtk+-3.0', version: '>= 3.14.0')
 gudev = dependency('gudev-1.0', required: get_option('use_gudev'))
 libnotify = dependency('libnotify', version: '>= 0.7.3')
-kbproto = dependency('kbproto')
 nss = dependency('nss', version: '>= 3.11.2', required: get_option('use_smartcard'))
 pango = dependency('pango', version: '>= 1.20.0')
 polkit = dependency('polkit-gobject-1', version: '>= 0.97', required: get_option('use_polkit'))
@@ -69,7 +65,6 @@ x11 = dependency('x11')
 xext = dependency('xext')
 xfixes = dependency('xfixes')
 xi = dependency('xi')
-xklavier = dependency('libxklavier', version: '>= 5.0')
 
 # currently only used for the wacom plugin
 librsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required: wacom.found())

plugins/a11y-settings/csd-a11y-settings-manager.c

@@ -187,7 +187,6 @@ bind_keys (CsdA11ySettingsManager *manager,
 static void
 bind_cinnamon_gnome_a11y_settings (CsdA11ySettingsManager *manager)
 {
-    bind_keys (manager, CINNAMON_A11Y_APP_SCHEMA, "screen-keyboard-enabled", GNOME_A11Y_APP_SCHEMA, "screen-keyboard-enabled");
     bind_keys (manager, CINNAMON_A11Y_APP_SCHEMA, "screen-reader-enabled",   GNOME_A11Y_APP_SCHEMA, "screen-reader-enabled");
     bind_keys (manager, CINNAMON_DESKTOP_SCHEMA,  "toolkit-accessibility",   GNOME_DESKTOP_SCHEMA,  "toolkit-accessibility");