[Debian-olpc-devel] [SCM] sugar Debian packaging branch, master, updated. debian/0.96.1-2.1-1-g692bab5

[Martin Pitt]

The following commit has been merged in the master branch:
commit 692bab50801dadf00ca9506ec333e550e2ec0ab4
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Apr 29 13:53:40 2013 -0700

    Add logind_check.patch: Properly check for logind. Patch taken from curren upstream git head.

diff --git a/debian/changelog b/debian/changelog
index 962aea1..5d410b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sugar-0.96 (0.96.1-2.2) UNRELEASED; urgency=low
+
+  * Add logind_check.patch: Properly check for logind. Patch taken from
+    curren upstream git head.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 29 Apr 2013 13:53:00 -0700
+
 sugar-0.96 (0.96.1-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/logind_check.patch b/debian/patches/logind_check.patch
new file mode 100644
index 0000000..df3a2bb
--- /dev/null
+++ b/debian/patches/logind_check.patch
@@ -0,0 +1,34 @@
+From d513315fcac11dc228f04fbff69696beaf72fbd3 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Thu, 21 Mar 2013 14:56:24 +0100
+Subject: [PATCH] Session: Properly check for logind
+Origin: https://git.sugarlabs.org/sugar/mainline/commit/d513315f
+
+session.py talks to logind, so it needs to specifically check if logind is
+running. /sys/fs/cgroup/systemd will be present also when systemd was built
+without logind (--disable-logind).
+
+For details, see:
+<https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00092.html
+
+Acked-by: Simon Schampijer <simon at laptop.org>
+---
+ src/jarabe/model/session.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py
+index a5cd4a4..7394ef0 100644
+--- a/src/jarabe/model/session.py
++++ b/src/jarabe/model/session.py
+@@ -29,7 +29,7 @@ _session_manager = None
+ 
+ 
+ def have_systemd():
+-    return os.access("/sys/fs/cgroup/systemd", 0) >= 0
++    return os.access("/run/systemd/seats", 0) >= 0
+ 
+ 
+ class SessionManager(session.SessionManager):
+-- 
+1.7.9.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 009cd22..ebb927e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+logind_check.patch
 empy_from_system.patch
 #fix_tz_config_path.patch
 empy_from_system_autotools.patch

-- 
sugar Debian packaging