about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2013-10-23 22:45:29 +0200
committerSjoerd Simons <sjoerd@luon.net>2013-10-25 21:19:41 +0200
commite58711d97cb7f7cb1a7573a8b6e416e515cffe39 (patch)
tree1bc7f98c376c008a8b94b99cd5e1bafd78a7c923 /debian
parentac1b36a3aba0b50ab8b9bad9ff343542bb85634d (diff)
Use systemd for session tracking
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control5
-rwxr-xr-xdebian/rules4
3 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index dbd6ba8f..3880f0ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-network-manager (0.9.8.0-6) UNRELEASED; urgency=low
+network-manager (0.9.8.0-5.1) UNRELEASED; urgency=low
 
   * debian/60-network-manager.rules
     debian/network-manager.install:
     - Install a rules file compatible with experimentals policykit (0.110)
       implementing the same policy as the pkla
 
- -- Sjoerd Simons <sjoerd@debian.org>  Sun, 25 Aug 2013 18:07:41 +0200
+  [ Sjoerd Simons ]
+  * Switch session tracking to systemd.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 23 Oct 2013 22:43:41 +0200
 
 network-manager (0.9.8.0-5) unstable; urgency=low
 
@@ -26,6 +29,7 @@ network-manager (0.9.8.0-4) unstable; urgency=low
 
 network-manager (0.9.8.0-3) unstable; urgency=low
 
+  [ Michael Biebl ]
   * Use gir dh addon instead of calling dh_girepository manually.
   * Upload to unstable.
   * Be more aggressive in cleaning up /var/lib/NetworkManager on purge.
diff --git a/debian/control b/debian/control
index 9a41207f..f53d6942 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,8 @@ Build-Depends:
  libpolkit-gobject-1-dev,
  libgnutls-dev,
  uuid-dev,
+ systemd (>= 185),
+ libsystemd-login-dev (>= 185),
  libudev-dev (>= 165),
  libgudev-1.0-dev (>= 165),
  libgirepository1.0-dev (>= 0.10.7-1~),
@@ -49,7 +51,8 @@ Recommends:
  dnsmasq-base,
  iptables,
  modemmanager,
- crda
+ crda,
+ systemd
 Suggests: avahi-autoipd
 Breaks:
  network-manager-gnome (<< 0.9),
diff --git a/debian/rules b/debian/rules
index 4eeaf9d2..b2f016e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,8 @@ override_dh_auto_configure:
 		--with-iptables=/sbin/iptables \
 		--with-systemdsystemunitdir=/lib/systemd/system \
 		--with-crypto=gnutls \
-		--with-session-tracking=consolekit \
-		--with-suspend-resume=upower \
+		--with-session-tracking=systemd \
+		--with-suspend-resume=systemd \
 		--disable-more-warnings \
 		--disable-modify-system \
 		--enable-polkit \