Codebase list cinnamon-settings-daemon / f2f5314
keep .desktop without full path to make debian patch smaller Fabio Fantoni 2 years ago
2 changed file(s) with 15 addition(s) and 312 deletion(s). Raw diff Collapse all Expand all
+3
-3
debian/changelog less more
00 cinnamon-settings-daemon (5.2.0-2~) UNRELEASED; urgency=medium
11
22 * add a path that remove creation of link to binaries using a
3 script and return to use full path for .desktop files
4 * add symlink to /usr/bin using dh_link to make working also
5 customized .desktop that user don't override on upgrade
3 script
4 * add symlink to /usr/bin using dh_link to make working the
5 .desktop files that don't have full path
66
77 -- Fabio Fantoni <fantonifabio@tiscali.it> Sun, 02 Jan 2022 09:42:19 +0100
88
+12
-309
debian/patches/no-links-to-binaries-and-return-to-use-full-path.patch less more
0 From 8a3e85f0e335537259425ff402d70b2d5b358c41 Mon Sep 17 00:00:00 2001
1 From: Fabio Fantoni <fantonifabio@tiscali.it>
0 Author: Fabio Fantoni <fantonifabio@tiscali.it>
21 Date: Sun, 2 Jan 2022 15:24:53 +0100
3 Subject: [PATCH] don't create links to binaries and return to use full path to
4 call them
2 Description: [PATCH] don't create links to binaries
53
4 creation of link to binaries done by meson with custom python script
5 seems to have rare unexpected cases
6 so remove remove creation of link to binaries with custom script
7
8 Note:
9 better symlink creation was recently integrated in meson (in 0.61), in
10 future probably is good try it:
11 https://mesonbuild.com/Reference-manual_functions.html#install_symlink
12
13 Forwarded: no
614 ---
7 ...namon-settings-daemon-a11y-keyboard.desktop.in | 2 +-
8 plugins/a11y-keyboard/meson.build | 5 -----
9 ...namon-settings-daemon-a11y-settings.desktop.in | 2 +-
10 plugins/a11y-settings/meson.build | 5 -----
11 .../cinnamon-settings-daemon-automount.desktop.in | 2 +-
12 plugins/automount/csd-automount.desktop.in | 2 +-
13 plugins/automount/meson.build | 5 -----
14 ...cinnamon-settings-daemon-background.desktop.in | 2 +-
15 plugins/background/meson.build | 5 -----
16 .../cinnamon-settings-daemon-clipboard.desktop.in | 2 +-
17 plugins/clipboard/meson.build | 5 -----
18 .../cinnamon-settings-daemon-color.desktop.in | 2 +-
19 plugins/color/meson.build | 5 -----
20 plugins/common/meson.build | 5 -----
21 .../cinnamon-settings-daemon-cursor.desktop.in | 2 +-
22 plugins/cursor/meson.build | 5 -----
23 plugins/datetime/meson.build | 5 -----
24 plugins/dummy/meson.build | 2 --
25 ...nnamon-settings-daemon-housekeeping.desktop.in | 2 +-
26 plugins/housekeeping/meson.build | 5 -----
27 .../cinnamon-settings-daemon-keyboard.desktop.in | 2 +-
28 plugins/keyboard/meson.build | 5 -----
29 ...cinnamon-settings-daemon-media-keys.desktop.in | 2 +-
30 plugins/media-keys/meson.build | 5 -----
31 .../cinnamon-settings-daemon-mouse.desktop.in | 2 +-
32 plugins/mouse/meson.build | 10 ----------
33 ...innamon-settings-daemon-orientation.desktop.in | 2 +-
34 plugins/orientation/meson.build | 5 -----
35 .../cinnamon-settings-daemon-power.desktop.in | 2 +-
36 plugins/power/meson.build | 10 ----------
37 ...settings-daemon-print-notifications.desktop.in | 2 +-
38 plugins/print-notifications/meson.build | 10 ----------
39 ...n-settings-daemon-screensaver-proxy.desktop.in | 2 +-
40 plugins/screensaver-proxy/meson.build | 5 -----
41 .../cinnamon-settings-daemon-smartcard.desktop.in | 2 +-
42 plugins/smartcard/meson.build | 5 -----
43 .../cinnamon-settings-daemon-sound.desktop.in | 2 +-
44 plugins/sound/meson.build | 5 -----
45 .../cinnamon-settings-daemon-wacom.desktop.in | 2 +-
46 plugins/wacom/meson.build | 15 ---------------
47 .../cinnamon-settings-daemon-xrandr.desktop.in | 2 +-
48 plugins/xrandr/meson.build | 5 -----
49 .../cinnamon-settings-daemon-xsettings.desktop.in | 2 +-
50 plugins/xsettings/meson.build | 5 -----
51 44 files changed, 21 insertions(+), 158 deletions(-)
52
53 diff --git a/plugins/a11y-keyboard/cinnamon-settings-daemon-a11y-keyboard.desktop.in b/plugins/a11y-keyboard/cinnamon-settings-daemon-a11y-keyboard.desktop.in
54 index f134a06..88e5ec4 100644
55 --- a/plugins/a11y-keyboard/cinnamon-settings-daemon-a11y-keyboard.desktop.in
56 +++ b/plugins/a11y-keyboard/cinnamon-settings-daemon-a11y-keyboard.desktop.in
57 @@ -1,7 +1,7 @@
58 [Desktop Entry]
59 Type=Application
60 Name=Cinnamon Settings Daemon - a11y-keyboard
61 -Exec=csd-a11y-keyboard
62 +Exec=@libexecdir@/csd-a11y-keyboard
63 OnlyShowIn=X-Cinnamon;
64 NoDisplay=true
65 X-GNOME-Autostart-Phase=Initialization
6615 diff --git a/plugins/a11y-keyboard/meson.build b/plugins/a11y-keyboard/meson.build
6716 index 26ea28f..4b6c827 100644
6817 --- a/plugins/a11y-keyboard/meson.build
7928 test_a11y_prefs_dialog_sources = [
8029 'csd-a11y-preferences-dialog.c',
8130 'test-a11y-preferences-dialog.c',
82 diff --git a/plugins/a11y-settings/cinnamon-settings-daemon-a11y-settings.desktop.in b/plugins/a11y-settings/cinnamon-settings-daemon-a11y-settings.desktop.in
83 index 10cb331..dfad5e3 100644
84 --- a/plugins/a11y-settings/cinnamon-settings-daemon-a11y-settings.desktop.in
85 +++ b/plugins/a11y-settings/cinnamon-settings-daemon-a11y-settings.desktop.in
86 @@ -1,7 +1,7 @@
87 [Desktop Entry]
88 Type=Application
89 Name=Cinnamon Settings Daemon - a11y-settings
90 -Exec=csd-a11y-settings
91 +Exec=@libexecdir@/csd-a11y-settings
92 OnlyShowIn=X-Cinnamon;
93 NoDisplay=true
94 X-GNOME-Autostart-Phase=Initialization
9531 diff --git a/plugins/a11y-settings/meson.build b/plugins/a11y-settings/meson.build
9632 index 2759250..e902364 100644
9733 --- a/plugins/a11y-settings/meson.build
10844 configure_file(
10945 input: 'cinnamon-settings-daemon-a11y-settings.desktop.in',
11046 output: 'cinnamon-settings-daemon-a11y-settings.desktop',
111 diff --git a/plugins/automount/cinnamon-settings-daemon-automount.desktop.in b/plugins/automount/cinnamon-settings-daemon-automount.desktop.in
112 index ee57192..5188c4e 100644
113 --- a/plugins/automount/cinnamon-settings-daemon-automount.desktop.in
114 +++ b/plugins/automount/cinnamon-settings-daemon-automount.desktop.in
115 @@ -1,7 +1,7 @@
116 [Desktop Entry]
117 Type=Application
118 Name=Cinnamon Settings Daemon - automount
119 -Exec=csd-automount
120 +Exec=@libexecdir@/csd-automount
121 OnlyShowIn=X-Cinnamon;
122 NoDisplay=true
123 X-GNOME-Autostart-Phase=Initialization
124 diff --git a/plugins/automount/csd-automount.desktop.in b/plugins/automount/csd-automount.desktop.in
125 index b306268..14581b3 100644
126 --- a/plugins/automount/csd-automount.desktop.in
127 +++ b/plugins/automount/csd-automount.desktop.in
128 @@ -26,6 +26,6 @@ Name[uk]=Файли
129 Name[zh_CN]=文件
130 Name[zh_HK]=檔案
131 Icon=folder
132 -Exec=csd-automount
133 +Exec=@libexecdir@/csd-automount
134 OnlyShowIn=X-Cinnamon;
135 NoDisplay=true
13647 diff --git a/plugins/automount/meson.build b/plugins/automount/meson.build
13748 index bba6e4c..03ec64b 100644
13849 --- a/plugins/automount/meson.build
14960 test_automount_dialog_sources = [
15061 'test-automount-dialog.c',
15162 'csd-autorun.c',
152 diff --git a/plugins/background/cinnamon-settings-daemon-background.desktop.in b/plugins/background/cinnamon-settings-daemon-background.desktop.in
153 index 81dda14..96ef01a 100644
154 --- a/plugins/background/cinnamon-settings-daemon-background.desktop.in
155 +++ b/plugins/background/cinnamon-settings-daemon-background.desktop.in
156 @@ -1,7 +1,7 @@
157 [Desktop Entry]
158 Type=Application
159 Name=Cinnamon Settings Daemon - background
160 -Exec=csd-background
161 +Exec=@libexecdir@/csd-background
162 OnlyShowIn=X-Cinnamon;
163 NoDisplay=true
164 X-GNOME-Autostart-Phase=Initialization
16563 diff --git a/plugins/background/meson.build b/plugins/background/meson.build
16664 index d17a865..9e82fb3 100644
16765 --- a/plugins/background/meson.build
17876 configure_file(
17977 input: 'cinnamon-settings-daemon-background.desktop.in',
18078 output: 'cinnamon-settings-daemon-background.desktop',
181 diff --git a/plugins/clipboard/cinnamon-settings-daemon-clipboard.desktop.in b/plugins/clipboard/cinnamon-settings-daemon-clipboard.desktop.in
182 index 61a7b5b..b6830a1 100644
183 --- a/plugins/clipboard/cinnamon-settings-daemon-clipboard.desktop.in
184 +++ b/plugins/clipboard/cinnamon-settings-daemon-clipboard.desktop.in
185 @@ -1,7 +1,7 @@
186 [Desktop Entry]
187 Type=Application
188 Name=Cinnamon Settings Daemon - clipboard
189 -Exec=csd-clipboard
190 +Exec=@libexecdir@/csd-clipboard
191 OnlyShowIn=X-Cinnamon;
192 NoDisplay=true
193 X-GNOME-Autostart-Phase=Initialization
19479 diff --git a/plugins/clipboard/meson.build b/plugins/clipboard/meson.build
19580 index 016adca..b83ce67 100644
19681 --- a/plugins/clipboard/meson.build
20792 configure_file(
20893 input: 'cinnamon-settings-daemon-clipboard.desktop.in',
20994 output: 'cinnamon-settings-daemon-clipboard.desktop',
210 diff --git a/plugins/color/cinnamon-settings-daemon-color.desktop.in b/plugins/color/cinnamon-settings-daemon-color.desktop.in
211 index d26c8aa..27488c3 100644
212 --- a/plugins/color/cinnamon-settings-daemon-color.desktop.in
213 +++ b/plugins/color/cinnamon-settings-daemon-color.desktop.in
214 @@ -1,7 +1,7 @@
215 [Desktop Entry]
216 Type=Application
217 Name=Cinnamon Settings Daemon - color
218 -Exec=csd-color
219 +Exec=@libexecdir@/csd-color
220 OnlyShowIn=X-Cinnamon;
221 NoDisplay=true
222 X-GNOME-Autostart-Phase=Initialization
22395 diff --git a/plugins/color/meson.build b/plugins/color/meson.build
22496 index f5dc318..eaff154 100644
22597 --- a/plugins/color/meson.build
252124 install_data(
253125 'input-device-example.sh',
254126 install_dir: join_paths(datadir, '@0@-@1@'.format(pkgname, api_version)),
255 diff --git a/plugins/cursor/cinnamon-settings-daemon-cursor.desktop.in b/plugins/cursor/cinnamon-settings-daemon-cursor.desktop.in
256 index 8df0a15..b52f042 100644
257 --- a/plugins/cursor/cinnamon-settings-daemon-cursor.desktop.in
258 +++ b/plugins/cursor/cinnamon-settings-daemon-cursor.desktop.in
259 @@ -1,7 +1,7 @@
260 [Desktop Entry]
261 Type=Application
262 Name=Cinnamon Settings Daemon - cursor
263 -Exec=csd-cursor
264 +Exec=@libexecdir@/csd-cursor
265 OnlyShowIn=X-Cinnamon;
266 NoDisplay=true
267 X-GNOME-Autostart-Phase=Initialization
268127 diff --git a/plugins/cursor/meson.build b/plugins/cursor/meson.build
269128 index ff9c494..61381bc 100644
270129 --- a/plugins/cursor/meson.build
307166 )
308167 -
309168 -meson.add_install_script(ln_script, libexecdir, bindir, 'csd-dummy')
310 diff --git a/plugins/housekeeping/cinnamon-settings-daemon-housekeeping.desktop.in b/plugins/housekeeping/cinnamon-settings-daemon-housekeeping.desktop.in
311 index 47d8005..ac08426 100644
312 --- a/plugins/housekeeping/cinnamon-settings-daemon-housekeeping.desktop.in
313 +++ b/plugins/housekeeping/cinnamon-settings-daemon-housekeeping.desktop.in
314 @@ -1,7 +1,7 @@
315 [Desktop Entry]
316 Type=Application
317 Name=Cinnamon Settings Daemon - housekeeping
318 -Exec=csd-housekeeping
319 +Exec=@libexecdir@/csd-housekeeping
320 OnlyShowIn=X-Cinnamon;
321 NoDisplay=true
322 X-GNOME-Autostart-Phase=Initialization
323169 diff --git a/plugins/housekeeping/meson.build b/plugins/housekeeping/meson.build
324170 index 6f1e4e9..2f973cb 100644
325171 --- a/plugins/housekeeping/meson.build
336182 test_disk_space_sources = [
337183 'csd-disk-space-test.c',
338184 housekeeping_common_sources,
339 diff --git a/plugins/keyboard/cinnamon-settings-daemon-keyboard.desktop.in b/plugins/keyboard/cinnamon-settings-daemon-keyboard.desktop.in
340 index dc13d6b..a7dac97 100644
341 --- a/plugins/keyboard/cinnamon-settings-daemon-keyboard.desktop.in
342 +++ b/plugins/keyboard/cinnamon-settings-daemon-keyboard.desktop.in
343 @@ -1,7 +1,7 @@
344 [Desktop Entry]
345 Type=Application
346 Name=Cinnamon Settings Daemon - keyboard
347 -Exec=csd-keyboard
348 +Exec=@libexecdir@/csd-keyboard
349 OnlyShowIn=X-Cinnamon;
350 NoDisplay=true
351 X-GNOME-Autostart-Phase=Initialization
352185 diff --git a/plugins/keyboard/meson.build b/plugins/keyboard/meson.build
353186 index 454ffdb..bad3ca9 100644
354187 --- a/plugins/keyboard/meson.build
365198 configure_file(
366199 input: 'cinnamon-settings-daemon-keyboard.desktop.in',
367200 output: 'cinnamon-settings-daemon-keyboard.desktop',
368 diff --git a/plugins/media-keys/cinnamon-settings-daemon-media-keys.desktop.in b/plugins/media-keys/cinnamon-settings-daemon-media-keys.desktop.in
369 index e503b9d..37dbe6b 100644
370 --- a/plugins/media-keys/cinnamon-settings-daemon-media-keys.desktop.in
371 +++ b/plugins/media-keys/cinnamon-settings-daemon-media-keys.desktop.in
372 @@ -1,7 +1,7 @@
373 [Desktop Entry]
374 Type=Application
375 Name=Cinnamon Settings Daemon - media-keys
376 -Exec=csd-media-keys
377 +Exec=@libexecdir@/csd-media-keys
378 OnlyShowIn=X-Cinnamon;
379 NoDisplay=true
380 X-GNOME-Autostart-Phase=Initialization
381201 diff --git a/plugins/media-keys/meson.build b/plugins/media-keys/meson.build
382202 index b57ff44..4385e23 100644
383203 --- a/plugins/media-keys/meson.build
394214 configure_file(
395215 input: 'cinnamon-settings-daemon-media-keys.desktop.in',
396216 output: 'cinnamon-settings-daemon-media-keys.desktop',
397 diff --git a/plugins/mouse/cinnamon-settings-daemon-mouse.desktop.in b/plugins/mouse/cinnamon-settings-daemon-mouse.desktop.in
398 index f7c0f85..f73f297 100644
399 --- a/plugins/mouse/cinnamon-settings-daemon-mouse.desktop.in
400 +++ b/plugins/mouse/cinnamon-settings-daemon-mouse.desktop.in
401 @@ -1,7 +1,7 @@
402 [Desktop Entry]
403 Type=Application
404 Name=Cinnamon Settings Daemon - mouse
405 -Exec=csd-mouse
406 +Exec=@libexecdir@/csd-mouse
407 OnlyShowIn=X-Cinnamon;
408 NoDisplay=true
409 X-GNOME-Autostart-Phase=Initialization
410217 diff --git a/plugins/mouse/meson.build b/plugins/mouse/meson.build
411218 index 5b58e19..68f48fa 100644
412219 --- a/plugins/mouse/meson.build
435242 configure_file(
436243 input: 'cinnamon-settings-daemon-mouse.desktop.in',
437244 output: 'cinnamon-settings-daemon-mouse.desktop',
438 diff --git a/plugins/orientation/cinnamon-settings-daemon-orientation.desktop.in b/plugins/orientation/cinnamon-settings-daemon-orientation.desktop.in
439 index 5df5f81..1621fb4 100644
440 --- a/plugins/orientation/cinnamon-settings-daemon-orientation.desktop.in
441 +++ b/plugins/orientation/cinnamon-settings-daemon-orientation.desktop.in
442 @@ -1,7 +1,7 @@
443 [Desktop Entry]
444 Type=Application
445 Name=Cinnamon Settings Daemon - orientation
446 -Exec=csd-orientation
447 +Exec=@libexecdir@/csd-orientation
448 OnlyShowIn=X-Cinnamon;
449 NoDisplay=true
450 X-GNOME-Autostart-Phase=Initialization
451245 diff --git a/plugins/orientation/meson.build b/plugins/orientation/meson.build
452246 index 7e1ab55..abc3c0a 100644
453247 --- a/plugins/orientation/meson.build
464258 configure_file(
465259 input: 'cinnamon-settings-daemon-orientation.desktop.in',
466260 output: 'cinnamon-settings-daemon-orientation.desktop',
467 diff --git a/plugins/power/cinnamon-settings-daemon-power.desktop.in b/plugins/power/cinnamon-settings-daemon-power.desktop.in
468 index c2900f6..bc0cbd6 100644
469 --- a/plugins/power/cinnamon-settings-daemon-power.desktop.in
470 +++ b/plugins/power/cinnamon-settings-daemon-power.desktop.in
471 @@ -1,7 +1,7 @@
472 [Desktop Entry]
473 Type=Application
474 Name=Cinnamon Settings Daemon - power
475 -Exec=csd-power
476 +Exec=@libexecdir@/csd-power
477 OnlyShowIn=X-Cinnamon;
478 NoDisplay=true
479 X-GNOME-Autostart-Phase=Initialization
480261 diff --git a/plugins/power/meson.build b/plugins/power/meson.build
481262 index 42d00f6..128be68 100644
482263 --- a/plugins/power/meson.build
546327 configure_file(
547328 input: 'cinnamon-settings-daemon-print-notifications.desktop.in',
548329 output: 'cinnamon-settings-daemon-print-notifications.desktop',
549 diff --git a/plugins/screensaver-proxy/cinnamon-settings-daemon-screensaver-proxy.desktop.in b/plugins/screensaver-proxy/cinnamon-settings-daemon-screensaver-proxy.desktop.in
550 index 3ef1ece..d3a457e 100644
551 --- a/plugins/screensaver-proxy/cinnamon-settings-daemon-screensaver-proxy.desktop.in
552 +++ b/plugins/screensaver-proxy/cinnamon-settings-daemon-screensaver-proxy.desktop.in
553 @@ -1,7 +1,7 @@
554 [Desktop Entry]
555 Type=Application
556 Name=Cinnamon Settings Daemon - screensaver-proxy
557 -Exec=csd-screensaver-proxy
558 +Exec=@libexecdir@/csd-screensaver-proxy
559 OnlyShowIn=X-Cinnamon;
560 NoDisplay=true
561 X-GNOME-Autostart-Phase=Initialization
562330 diff --git a/plugins/screensaver-proxy/meson.build b/plugins/screensaver-proxy/meson.build
563331 index 904e7ba..7f243cf 100644
564332 --- a/plugins/screensaver-proxy/meson.build
575343 configure_file(
576344 input: 'cinnamon-settings-daemon-screensaver-proxy.desktop.in',
577345 output: 'cinnamon-settings-daemon-screensaver-proxy.desktop',
578 diff --git a/plugins/smartcard/cinnamon-settings-daemon-smartcard.desktop.in b/plugins/smartcard/cinnamon-settings-daemon-smartcard.desktop.in
579 index 6b09bcd..793e7aa 100644
580 --- a/plugins/smartcard/cinnamon-settings-daemon-smartcard.desktop.in
581 +++ b/plugins/smartcard/cinnamon-settings-daemon-smartcard.desktop.in
582 @@ -1,7 +1,7 @@
583 [Desktop Entry]
584 Type=Application
585 Name=Cinnamon Settings Daemon - smartcard
586 -Exec=csd-smartcard
587 +Exec=@libexecdir@/csd-smartcard
588 OnlyShowIn=X-Cinnamon;
589 NoDisplay=true
590 X-GNOME-Autostart-Phase=Initialization
591346 diff --git a/plugins/smartcard/meson.build b/plugins/smartcard/meson.build
592347 index 0d9fd15..8cfd382 100644
593348 --- a/plugins/smartcard/meson.build
604359 configure_file(
605360 input: 'cinnamon-settings-daemon-smartcard.desktop.in',
606361 output: 'cinnamon-settings-daemon-smartcard.desktop',
607 diff --git a/plugins/sound/cinnamon-settings-daemon-sound.desktop.in b/plugins/sound/cinnamon-settings-daemon-sound.desktop.in
608 index 03515a6..4d202fd 100644
609 --- a/plugins/sound/cinnamon-settings-daemon-sound.desktop.in
610 +++ b/plugins/sound/cinnamon-settings-daemon-sound.desktop.in
611 @@ -1,7 +1,7 @@
612 [Desktop Entry]
613 Type=Application
614 Name=Cinnamon Settings Daemon - sound
615 -Exec=csd-sound
616 +Exec=@libexecdir@/csd-sound
617 OnlyShowIn=X-Cinnamon;
618 NoDisplay=true
619 X-GNOME-Autostart-Phase=Initialization
620362 diff --git a/plugins/sound/meson.build b/plugins/sound/meson.build
621363 index a64abee..ab8148e 100644
622364 --- a/plugins/sound/meson.build
633375 configure_file(
634376 input: 'cinnamon-settings-daemon-sound.desktop.in',
635377 output: 'cinnamon-settings-daemon-sound.desktop',
636 diff --git a/plugins/wacom/cinnamon-settings-daemon-wacom.desktop.in b/plugins/wacom/cinnamon-settings-daemon-wacom.desktop.in
637 index 5d7bb25..6649d08 100644
638 --- a/plugins/wacom/cinnamon-settings-daemon-wacom.desktop.in
639 +++ b/plugins/wacom/cinnamon-settings-daemon-wacom.desktop.in
640 @@ -1,7 +1,7 @@
641 [Desktop Entry]
642 Type=Application
643 Name=Cinnamon Settings Daemon - wacom
644 -Exec=csd-wacom
645 +Exec=@libexecdir@/csd-wacom
646 OnlyShowIn=X-Cinnamon;
647 NoDisplay=true
648 X-GNOME-Autostart-Phase=Initialization
649378 diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
650379 index 72d8363..3df06df 100644
651380 --- a/plugins/wacom/meson.build
686415 configure_file(
687416 input: 'cinnamon-settings-daemon-wacom.desktop.in',
688417 output: 'cinnamon-settings-daemon-wacom.desktop',
689 diff --git a/plugins/xrandr/cinnamon-settings-daemon-xrandr.desktop.in b/plugins/xrandr/cinnamon-settings-daemon-xrandr.desktop.in
690 index 0a00e9a..3ae3d54 100644
691 --- a/plugins/xrandr/cinnamon-settings-daemon-xrandr.desktop.in
692 +++ b/plugins/xrandr/cinnamon-settings-daemon-xrandr.desktop.in
693 @@ -1,7 +1,7 @@
694 [Desktop Entry]
695 Type=Application
696 Name=Cinnamon Settings Daemon - xrandr
697 -Exec=csd-xrandr
698 +Exec=@libexecdir@/csd-xrandr
699 OnlyShowIn=X-Cinnamon;
700 NoDisplay=false
701 X-GNOME-Autostart-Phase=Initialization
702418 diff --git a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build
703419 index 3296f1a..3b23712 100644
704420 --- a/plugins/xrandr/meson.build
715431 configure_file(
716432 input: 'cinnamon-settings-daemon-xrandr.desktop.in',
717433 output: 'cinnamon-settings-daemon-xrandr.desktop',
718 diff --git a/plugins/xsettings/cinnamon-settings-daemon-xsettings.desktop.in b/plugins/xsettings/cinnamon-settings-daemon-xsettings.desktop.in
719 index 0bcbc47..439d3c3 100644
720 --- a/plugins/xsettings/cinnamon-settings-daemon-xsettings.desktop.in
721 +++ b/plugins/xsettings/cinnamon-settings-daemon-xsettings.desktop.in
722 @@ -1,7 +1,7 @@
723 [Desktop Entry]
724 Type=Application
725 Name=Cinnamon Settings Daemon - xsettings
726 -Exec=csd-xsettings
727 +Exec=@libexecdir@/csd-xsettings
728 OnlyShowIn=X-Cinnamon;
729 NoDisplay=true
730 X-GNOME-Autostart-Phase=Initialization
731434 diff --git a/plugins/xsettings/meson.build b/plugins/xsettings/meson.build
732435 index e79dac3..e2fcf87 100644
733436 --- a/plugins/xsettings/meson.build