about summary refs log tree commit diff
path: root/debian/rules
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-03-27 17:12:21 +0100
committerMichael Biebl <biebl@debian.org>2014-03-27 17:12:21 +0100
commit97ed54b67575781db0be7fcaf5f8e858ef1a5cdd (patch)
treee1e7a5100628c46b4841fc1c2cb4162bff63336f /debian/rules
parent3b10d78005b4f11260703f2e986f0f8bfb210298 (diff)
Revert "Use logind for session tracking on linux, consolekit on other systems"
This reverts commit d68fa7dd52a2f38fef9c9873f38d999a333cb041.

network-manager is a linux-any package, so pretending to use consolekit
on other systems doesn't make sense.
Diffstat (limited to 'debian/rules')
-rwxr-xr-xdebian/rules10
1 files changed, 2 insertions, 8 deletions
diff --git a/debian/rules b/debian/rules
index c0335c49..4f4d1707 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,6 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-  SESSION_TRACKING = systemd
-else
-  SESSION_TRACKING = consolekit
-endif
-
-
 %:
 	dh $@ --with gir,systemd
 
@@ -21,7 +14,8 @@ override_dh_auto_configure:
 		--with-iptables=/sbin/iptables \
 		--with-systemdsystemunitdir=/lib/systemd/system \
 		--with-crypto=gnutls \
-		--with-session-tracking=$(SESSION_TRACKING) \
+		--with-session-tracking=systemd \
+		--with-suspend-resume=systemd \
 		--disable-more-warnings \
 		--disable-modify-system \
 		--enable-polkit \