diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2023-10-05 14:05:56 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2023-10-05 14:05:56 +0200 |
| commit | df7825b0044a7c6be526e93a263f2f4f2c1143fa (patch) | |
| tree | 1d2cf58f89dcc854a75a42995e9734b68915bf2a | |
| parent | 55cfcc8b789c23b891d32e50e7986bafe9cee280 (diff) | |
| parent | a94b2292e8576ccddf1cbd5159f24f6265c85e73 (diff) | |
| download | arctica-greeter-df7825b0044a7c6be526e93a263f2f4f2c1143fa.tar.gz arctica-greeter-df7825b0044a7c6be526e93a263f2f4f2c1143fa.tar.bz2 arctica-greeter-df7825b0044a7c6be526e93a263f2f4f2c1143fa.zip | |
Merge branch 'sunweaver-mr/libexecdir-debian'
Attributes GH PR #80: https://github.com/ArcticaProject/arctica-greeter/pull/80
| -rw-r--r-- | debian/arctica-greeter-guest-session.install | 4 | ||||
| -rw-r--r-- | debian/arctica-greeter.install | 8 | ||||
| -rwxr-xr-x | debian/rules | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/debian/arctica-greeter-guest-session.install b/debian/arctica-greeter-guest-session.install index b7eaba5..47f1e73 100644 --- a/debian/arctica-greeter-guest-session.install +++ b/debian/arctica-greeter-guest-session.install @@ -1,7 +1,7 @@ etc/lightdm/lightdm.conf.d/91* usr/sbin/arctica-greeter-guest-account-script -usr/lib/*/arctica-greeter/arctica-greeter-guest-session-auto.sh -usr/lib/*/arctica-greeter/arctica-greeter-guest-session-setup.sh +usr/libexec/arctica-greeter/arctica-greeter-guest-session-auto.sh +usr/libexec/arctica-greeter/arctica-greeter-guest-session-setup.sh usr/share/lightdm/lightdm.conf.d/50-arctica-greeter-guest-wrapper.conf usr/share/arctica-greeter/guest-session/skel/.config/autostart/arctica-greeter-guest-session-startup.desktop usr/share/man/man8/ diff --git a/debian/arctica-greeter.install b/debian/arctica-greeter.install index d584959..6ccf84f 100644 --- a/debian/arctica-greeter.install +++ b/debian/arctica-greeter.install @@ -9,8 +9,8 @@ usr/share/locale/ usr/share/man/man1/ usr/share/sounds/ usr/share/xgreeters/ -usr/lib/*/arctica-greeter/lightdm-arctica-greeter-session -usr/lib/*/arctica-greeter/arctica-greeter-check-hidpi -usr/lib/*/arctica-greeter/arctica-greeter-enable-tap-to-click -usr/lib/*/arctica-greeter/arctica-greeter-set-keyboard-layout +usr/libexec/arctica-greeter/lightdm-arctica-greeter-session +usr/libexec/arctica-greeter/arctica-greeter-check-hidpi +usr/libexec/arctica-greeter/arctica-greeter-enable-tap-to-click +usr/libexec/arctica-greeter/arctica-greeter-set-keyboard-layout var/lib/polkit-1/localauthority/10-vendor.d/arctica-greeter.pkla diff --git a/debian/rules b/debian/rules index 76c7912..5a34f02 100755 --- a/debian/rules +++ b/debian/rules @@ -20,11 +20,11 @@ override_dh_autoreconf: override_dh_auto_configure: set -x; if [ -x "$(GUEST_WRAPPER_BINARY_LIBEXEC)" ]; then \ - dh_auto_configure -- GUEST_WRAPPER_BINARY=/usr/libexec/lightdm/lightdm-guest-session; \ + dh_auto_configure -- --libexecdir=/usr/libexec GUEST_WRAPPER_BINARY=/usr/libexec/lightdm/lightdm-guest-session; \ elif [ -x "${GUEST_WRAPPER_BINARY_M_LIB}" ]; then \ - dh_auto_configure -- GUEST_WRAPPER_BINARY=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/lightdm-guest-session; \ + dh_auto_configure -- --libexecdir=/usr/libexec GUEST_WRAPPER_BINARY=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/lightdm-guest-session; \ elif [ -x "${GUEST_WRAPPER_BINARY_LIB}" ]; then \ - dh_auto_configure -- GUEST_WRAPPER_BINARY=/usr/lib/lightdm/lightdm-guest-session; \ + dh_auto_configure -- --libexecdir=/usr/libexec GUEST_WRAPPER_BINARY=/usr/lib/lightdm/lightdm-guest-session; \ else \ echo "Error: GUEST_WRAPPER_BINARY (lightdm-guest-session executable from LightDM) not found!"; \ exit 1; \ |