diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-10-26 15:34:50 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-10-26 15:34:50 +0100 |
| commit | e1573abfd573adb6b02d4f391b0ca105efb6d8da (patch) | |
| tree | 8f53a458082427554055c9323fb476e3d6c453b3 | |
| parent | 51bf806933cb08456cb70bfa1763e2dc2619c935 (diff) | |
| download | arctica-greeter-e1573abfd573adb6b02d4f391b0ca105efb6d8da.tar.gz arctica-greeter-e1573abfd573adb6b02d4f391b0ca105efb6d8da.tar.bz2 arctica-greeter-e1573abfd573adb6b02d4f391b0ca105efb6d8da.zip | |
Drop optionally using unity-settings-daemon with Arctica Greeter.
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 39bd921..b4b007b 100644 --- a/configure.ac +++ b/configure.ac @@ -37,15 +37,7 @@ AC_DEFINE_UNQUOTED([INDICATOR_FILE_DIR], ["${prefix}/share/unity/indicators"], [ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` AC_SUBST(INDICATORDIR) -if $PKG_CONFIG --exists unity-settings-daemon; then - USD_BINARY=`$PKG_CONFIG --variable=binary unity-settings-daemon` - if test -z "$USD_BINARY"; then - AC_MSG_NOTICE([Could not find path to unity-settings-daemon binary]) - else - SD_BINARY="$USD_BINARY" - fi - -elif $PKG_CONFIG --exists gnome-settings-daemon; then +if $PKG_CONFIG --exists gnome-settings-daemon; then GSD_BINARY=`$PKG_CONFIG --variable=binary gnome-settings-daemon` if test -z "$GSD_BINARY"; then AC_MSG_NOTICE([Could not find path to gnome-settings-daemon binary]) @@ -56,9 +48,9 @@ elif $PKG_CONFIG --exists gnome-settings-daemon; then fi if test -z "$SD_BINARY"; then - AC_MSG_ERROR([Could not find any of the supported X11 settings daemons]) + AC_MSG_ERROR([Could not find any supported X11 settings daemon]) else - AC_DEFINE_UNQUOTED([SD_BINARY], ["$SD_BINARY"], [Path to u-s-d/g-s-d]) + AC_DEFINE_UNQUOTED([SD_BINARY], ["$SD_BINARY"], [Path to g-s-d]) fi dnl ########################################################################### diff --git a/debian/control b/debian/control index f53e89a..777a96c 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: at-spi2-core, debhelper (>= 9), dh-autoreconf, gnome-common, - unity-settings-daemon-dev | gnome-settings-daemon-dev, + gnome-settings-daemon-dev, libcanberra-dev, libgnome-desktop-3-dev, libgtk-3-dev, @@ -42,7 +42,7 @@ Recommends: indicator-application, lightdm-remote-session-freerdp, lightdm-remote-session-x2go, remote-logon-service, - unity-settings-daemon | gnome-settings-daemon, + gnome-settings-daemon, xinput, Provides: lightdm-greeter Breaks: |