From afe7c28b560c59088173c57fb4bcd130e06e0e21 Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Fri, 18 Oct 2019 19:59:54 -0500 Subject: [PATCH] Fix apt pinning so that bullseye isn't used over stable, fixes #131 --- resources/BuildResources/bullseye.pref | 2 +- .../xfce-config/xflock-xsecurelock.patch | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/BuildResources/bullseye.pref b/resources/BuildResources/bullseye.pref index de52544..501c874 100644 --- a/resources/BuildResources/bullseye.pref +++ b/resources/BuildResources/bullseye.pref @@ -1,5 +1,5 @@ #Stable defaults to 500, and higher priorities are used over lower Package: * -Pin: release a=bullseye +Pin: release a=testing Pin-Priority: 400 diff --git a/resources/InstallResources/xfce-config/xflock-xsecurelock.patch b/resources/InstallResources/xfce-config/xflock-xsecurelock.patch index adc9ab7..40eddcc 100644 --- a/resources/InstallResources/xfce-config/xflock-xsecurelock.patch +++ b/resources/InstallResources/xfce-config/xflock-xsecurelock.patch @@ -1,12 +1,13 @@ diff --git a/usr/bin/xflock4 b/usr/bin/xflock4 -index 32670f4..1e82a40 +index d55cbf7..b7b28c6 --- a/usr/bin/xflock4 +++ b/usr/bin/xflock4 -@@ -26,6 +26,7 @@ LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand) +@@ -26,6 +26,7 @@ export PATH # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running for lock_cmd in \ -+ "env XSECURELOCK_PASSWORD_PROMPT=asterisks xsecurelock" \ - "$LOCK_CMD" \ - "xfce4-screensaver-command --lock" \ ++ "env XSECURELOCK_PASSWORD_PROMPT=asterisks xsecurelock"\ "xscreensaver-command -lock" \ + "light-locker-command --lock" \ + "gnome-screensaver-command --lock" \ +