New Upstream Release - cinnamon-settings-daemon
There were merge conflicts while merging a new upstream version.
More details
Historical runs
- upstream-merged-conflicts: Merging upstream version 5.8.0 resulted in conflicts.
- nothing-to-do: Last upstream version 5.6.0 already imported.
- run-disappeared: Worker started processing new run f980ddc4-83e6-4523-9c85-3613554b924e rather than 99831090-daa0-4350-8460-0502b0cd91c8
- nothing-to-do: Last upstream version 5.4.5 already imported.
- codemod-command-failed: Script ['deb-new-upstream', '--refresh-patches'] failed to run with code 1
- nothing-to-do: Last upstream version 5.4.2 already imported.
- quilt-refresh-error: An error occurred refreshing quilt patch no-links-to-binaries-and-return-to-use-full-path.patch: Applying patch debian/patches/no-links-to-binaries-and-return-to-use-full-path.patch can't find file to patch at input line 20 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Author: Fabio Fantoni <fantonifabio@tiscali.it> |Date: Sun, 2 Jan 2022 15:24:53 +0100 |Description: [PATCH] don't create links to binaries | |creation of link to binaries done by meson with custom python script |seems to have rare unexpected cases |so remove remove creation of link to binaries with custom script | |Note: |better symlink creation was recently integrated in meson (in 0.61), in |future probably is good try it: |https://mesonbuild.com/Reference-manual_functions.html#install_symlink | |Forwarded: no |--- |diff --git a/plugins/a11y-keyboard/meson.build b/plugins/a11y-keyboard/meson.build |index 26ea28f..4b6c827 100644 |--- a/plugins/a11y-keyboard/meson.build |+++ b/plugins/a11y-keyboard/meson.build -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file plugins/a11y-settings/meson.build patching file plugins/automount/meson.build patching file plugins/background/meson.build patching file plugins/clipboard/meson.build patching file plugins/color/meson.build patching file plugins/common/meson.build Hunk #1 succeeded at 40 (offset 1 line). can't find file to patch at input line 132 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/plugins/cursor/meson.build b/plugins/cursor/meson.build |index ff9c494..61381bc 100644 |--- a/plugins/cursor/meson.build |+++ b/plugins/cursor/meson.build -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file plugins/datetime/meson.build Hunk #1 succeeded at 53 (offset -7 lines). patching file plugins/dummy/meson.build patching file plugins/housekeeping/meson.build patching file plugins/keyboard/meson.build patching file plugins/media-keys/meson.build can't find file to patch at input line 222 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/plugins/mouse/meson.build b/plugins/mouse/meson.build |index 5b58e19..68f48fa 100644 |--- a/plugins/mouse/meson.build |+++ b/plugins/mouse/meson.build -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 250 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/plugins/orientation/meson.build b/plugins/orientation/meson.build |index 7e1ab55..abc3c0a 100644 |--- a/plugins/orientation/meson.build |+++ b/plugins/orientation/meson.build -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file plugins/power/meson.build patching file plugins/print-notifications/cinnamon-settings-daemon-print-notifications.desktop.in patching file plugins/print-notifications/meson.build patching file plugins/screensaver-proxy/meson.build patching file plugins/smartcard/meson.build can't find file to patch at input line 367 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/plugins/sound/meson.build b/plugins/sound/meson.build |index a64abee..ab8148e 100644 |--- a/plugins/sound/meson.build |+++ b/plugins/sound/meson.build -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file plugins/wacom/meson.build can't find file to patch at input line 423 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build |index 3296f1a..3b23712 100644 |--- a/plugins/xrandr/meson.build |+++ b/plugins/xrandr/meson.build -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file plugins/xsettings/meson.build Patch debian/patches/no-links-to-binaries-and-return-to-use-full-path.patch does not apply (enforce with -f)