From 898ab01924912809b162d549ec7e471da2a22472 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 27 Jul 2022 19:21:33 -0400
Subject: [PATCH] Organize data files that hook into other packages

---
 .../com.feralinteractive.GameMode.service.in           |  0
 data/meson.build                                       | 10 +++++-----
 data/{ => pam_limits}/10-gamemode.conf.in              |  0
 .../actions}/com.feralinteractive.GameMode.policy.in   |  0
 data/{ => systemd/sysusers.d}/gamemode.conf.in         |  0
 data/{ => systemd/user}/gamemoded.service.in           |  0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename data/{ => dbus}/com.feralinteractive.GameMode.service.in (100%)
 rename data/{ => pam_limits}/10-gamemode.conf.in (100%)
 rename data/{ => polkit/actions}/com.feralinteractive.GameMode.policy.in (100%)
 rename data/{ => systemd/sysusers.d}/gamemode.conf.in (100%)
 rename data/{ => systemd/user}/gamemoded.service.in (100%)

diff --git a/data/com.feralinteractive.GameMode.service.in b/data/dbus/com.feralinteractive.GameMode.service.in
similarity index 100%
rename from data/com.feralinteractive.GameMode.service.in
rename to data/dbus/com.feralinteractive.GameMode.service.in
diff --git a/data/meson.build b/data/meson.build
index f7b1957..88e5879 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,7 +18,7 @@ if sd_bus_provider == 'systemd'
     if with_systemd_unit
         # Install systemd user unit
         configure_file(
-            input: 'gamemoded.service.in',
+            input: 'systemd/user/gamemoded.service.in',
             output: 'gamemoded.service',
             configuration: data_conf,
             install_dir: path_systemd_unit_dir,
@@ -27,7 +27,7 @@ if sd_bus_provider == 'systemd'
     if with_systemd_group
         # Install the sysusers.d file
         configure_file(
-          input: 'gamemode.conf.in',
+          input: 'systemd/sysusers.d/gamemode.conf.in',
           output: 'gamemode.conf',
           configuration: data_conf,
           install_dir: path_systemd_group_dir,
@@ -38,7 +38,7 @@ endif
 if with_pam_renicing
   # Install the limits.d configuration file
   configure_file(
-      input: '10-gamemode.conf.in',
+      input: 'pam_limits/10-gamemode.conf.in',
       output: '10-gamemode.conf',
       configuration: data_conf,
       install_dir: '/etc/security/limits.d',
@@ -47,7 +47,7 @@ endif
 
 # Install the D-BUS service file
 configure_file(
-  input: 'com.feralinteractive.GameMode.service.in',
+  input: 'dbus/com.feralinteractive.GameMode.service.in',
   output: 'com.feralinteractive.GameMode.service',
   configuration: data_conf,
   install_dir: path_dbus_service_dir,
@@ -56,7 +56,7 @@ configure_file(
 
 # Install the Polkit action file in all cases
 configure_file(
-    input: 'com.feralinteractive.GameMode.policy.in',
+    input: 'polkit/actions/com.feralinteractive.GameMode.policy.in',
     output: 'com.feralinteractive.GameMode.policy',
     configuration: data_conf,
     install_dir: path_polkit_action_dir,
diff --git a/data/10-gamemode.conf.in b/data/pam_limits/10-gamemode.conf.in
similarity index 100%
rename from data/10-gamemode.conf.in
rename to data/pam_limits/10-gamemode.conf.in
diff --git a/data/com.feralinteractive.GameMode.policy.in b/data/polkit/actions/com.feralinteractive.GameMode.policy.in
similarity index 100%
rename from data/com.feralinteractive.GameMode.policy.in
rename to data/polkit/actions/com.feralinteractive.GameMode.policy.in
diff --git a/data/gamemode.conf.in b/data/systemd/sysusers.d/gamemode.conf.in
similarity index 100%
rename from data/gamemode.conf.in
rename to data/systemd/sysusers.d/gamemode.conf.in
diff --git a/data/gamemoded.service.in b/data/systemd/user/gamemoded.service.in
similarity index 100%
rename from data/gamemoded.service.in
rename to data/systemd/user/gamemoded.service.in