build: Bring back squeekboard as a first class executable

With styles no longer being inconsistent, there's no need to override styles by default. The override script remains for PureOS packaging purposes.

debian/squeekboard.install

@@ -1,2 +1,2 @@
-usr/bin/squeekboard-real /usr/bin
+tools/squeekboard-restyled usr/bin
 usr/bin/squeekboard /usr/bin

debian/squeekboard.lintian-overrides

@@ -1,2 +1,2 @@
 # yaml-rust 0.4.3 shares some roots with libyaml, including the string which lintian checks, creating a false positive
-squeekboard binary: embedded-library usr/bin/squeekboard-real: libyaml
+squeekboard binary: embedded-library usr/bin/squeekboard: libyaml

src/meson.build

@@ -97,20 +97,7 @@ libsqueekboard = static_library('libsqueekboard',
     '-DEEK_COMPILATION=1'],
 )
 
-# the straight binary needs to be demoted in favor of the wrapper script
+squeekboard = executable('squeekboard',
-# due to styling being inconsistent
-bindir = join_paths(prefix, get_option('bindir'))
-wrapper_conf = configuration_data()
-wrapper_conf.set('bindir', bindir)
-configure_file(
-  input: '../tools/squeekboard.in',
-  output: 'squeekboard',
-  install_dir: bindir,
-  configuration: wrapper_conf,
-  install: true,
-)
-
-squeekboard = executable('squeekboard-real',
   'server-main.c',
   wl_proto_sources,
   squeekboard_resources,
@@ -125,6 +112,8 @@ squeekboard = executable('squeekboard-real',
     '-DEEK_COMPILATION=1'],
 )
 
+bindir = join_paths(prefix, get_option('bindir'))
+
 test_layout = custom_target('squeekboard-test-layout',
     build_by_default: true,
     # meson doesn't track all inputs, cargo does

tools/squeekboard-restyled

@@ -12,4 +12,4 @@ for DIR in ${DIRS}; do
   fi;
 done;
 
-exec @bindir@/squeekboard-real
+exec $(which squeekboard)