[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.10-1-1-g0e78a64

[Enrico Zini]

The following commit has been merged in the master branch:
commit 0e78a64c17ffcac2b01c036f1d45f2ad8fb48bb4
Author: Enrico Zini <enrico at enricozini.org>
Date:   Wed Aug 17 13:37:27 2011 +0200

    Do not require $NODM_XINIT to exist in order to start: that env var is now ignored. Closes: #634901
    
    Do not require that $NODM_XSESSION points to a valid script now: nodm can start without it

diff --git a/debian/changelog b/debian/changelog
index d3b6dff..771e99c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nodm (0.11-1) unstable; urgency=low
+
+  * New upstream version
+  * Do not require $NODM_XINIT to exist in order to start: that env var is now
+    ignored. Closes: #634901
+  * Do not require that $NODM_XSESSION points to a valid script now: nodm can
+    start without it
+
+ -- Enrico Zini <enrico at debian.org>  Wed, 17 Aug 2011 13:35:43 +0200
+
 nodm (0.10-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/nodm.init b/debian/nodm.init
index 1b8bb6e..c09768e 100644
--- a/debian/nodm.init
+++ b/debian/nodm.init
@@ -37,7 +37,7 @@ export NODM_XINIT NODM_XSESSION NODM_X_OPTIONS NODM_USER NODM_MIN_SESSION_TIME N
 # set allowed_users=anybody in /etc/X11/Xwrapper.config
 
 # Gracefully exit if the package or its dependencies have been removed (but not purged).
-[ -x /usr/sbin/nodm -a -x "$NODM_XSESSION" -a -x "$NODM_XINIT" ] || exit 0
+[ -x /usr/sbin/nodm ] || exit 0
 
 
 # Load the VERBOSE setting and other rcS variables

-- 
Automatic Display Manager