From 97ed54b67575781db0be7fcaf5f8e858ef1a5cdd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 27 Mar 2014 17:12:21 +0100 Subject: 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. --- debian/changelog | 1 - debian/control | 4 ++-- debian/rules | 10 ++-------- 3 files changed, 4 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9c8dba09..481e2255 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,7 +61,6 @@ network-manager (0.9.8.8-1) experimental; urgency=low checking support [ Sjoerd Simons ] - * Use logind for session tracking on linux, consolekit on other systems * Enable usage of the new modem-manager interface * Use bluez 4 diff --git a/debian/control b/debian/control index 659793b6..b4af1875 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: libgnutls-dev, uuid-dev, systemd (>= 185), - libsystemd-login-dev (>= 185) [linux-any], + libsystemd-login-dev (>= 185), libudev-dev (>= 165), libgudev-1.0-dev (>= 165), libgirepository1.0-dev (>= 0.10.7-1~), @@ -55,7 +55,7 @@ Recommends: iptables, modemmanager, crda, - systemd [linux-any] + systemd Suggests: avahi-autoipd Breaks: network-manager-gnome (<< 0.9), 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 \ -- cgit 1.3.0-6-gf8a5