[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.4-2-g70c5c81

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 70c5c81a90624569c7981927d99d176330a4c556
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Oct 7 20:31:56 2008 +0200

    Package change to nodm

diff --git a/debian/changelog b/debian/changelog
index b74dd85..1dd2795 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nodm (0.1) UNRELEASED; urgency=low
+
+  * Rename to nodm
+  * Removal of zhone-session and matchbox-keyboard-toggle
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 07 Oct 2008 20:33:54 +0200
+
 zhone-session (0.4) pkg-fso; urgency=low
 
   * Use su -l to start session, for a proper environment
diff --git a/debian/control b/debian/control
index 48c586e..71be0cd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,21 @@
-Source: zhone-session
+Source: nodm
 Section: misc
 Priority: extra
 Maintainer: Joachim Breitner <nomeata at debian.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.0
-Vcs-Git: http://git.debian.org/git/pkg-fso/zhone-session.git
-Vcs-Browser: http://git.debian.org/?p=pkg-fso/zhone-session.git;a=summary
+Vcs-Git: http://git.debian.org/git/pkg-fso/nodm.git
+Vcs-Browser: http://git.debian.org/?p=pkg-fso/nodm.git;a=summary
 
-Package: zhone-session
+Package: nodm
 Architecture: all
-Depends: fso-frameworkd, zhone, matchbox-window-manager, matchbox-keyboard, python-dbus, python, xinit, x11-common
-Conflicts: gdm, kdm, x-display-manager
-Description: starts zhone at system start
- This packages prepares the system, which should be a smartphone, to
- automatically start zhone at system start.
+Depends: xinit, x11-common
+Conflicts: gdm, xdm, kdm, x-display-manager
+Description: Automatic Display Manager
+ This packages prepares the system to automatically start an X session at
+ system boot. It is targeted for devices like smartphones, but can be used
+ a regular computer as well, if the security implications are acceptable.
  .
  It should not be installed on a regular Debian system, as it would interfere
  with an installed display manager.
- .
- This package is part of the freesmartphone.org software stack packaging and is
- targeted for smartphones.
 
diff --git a/zhone-session.init b/debian/nodm.init
similarity index 79%
rename from zhone-session.init
rename to debian/nodm.init
index 402d2f8..558f30d 100644
--- a/zhone-session.init
+++ b/debian/nodm.init
@@ -1,20 +1,20 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:       openmoko-fso
-# Required-Start: $remote_fs frameworkd
+# Provides:       nodm
+# Should-Start:   console-screen
+# Required-Start: $remote_fs
 # Required-Stop:
 # Default-Start:  2 3 4 5
 # Default-Stop:
-# Short-Description: Openmoko Framework Testing Image
+# Short-Description: No Display Manager
 ### END INIT INFO
 
 
 set -e
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DESC="Zhone Session Startup"
-NAME=zhone-session
-PROG_FSO=/usr/bin/zhone-session
+DESC="Automatic Display Manager"
+NAME=nodm
 PROG_XSESSION=/etc/X11/Xsession
 PROG_XINIT=/usr/bin/xinit
 X_OPTIONS="vt4 -nolisten tcp"
@@ -25,9 +25,8 @@ USER=root
 # If you change the user to a non-root user, make sure you
 # set allowed_users=anybody in /etc/X11/Xwrapper.config
 
-
 # Gracefully exit if the package or its dependencies have been removed (but not purged).
-[ -x "$PROG_FSO" -a -x "$PROG_XSESSION" -a -x "$PROG_XINIT" ] || exit 0
+[ -x "$PROG_XSESSION" -a -x "$PROG_XINIT" ] || exit 0
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -39,7 +38,7 @@ USER=root
 case "$1" in
     start)
         [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-        start-stop-daemon --start --pidfile ${PIDFILE} --make-pidfile --background --exec /bin/su -- --login --command "${PROG_XINIT} ${PROG_XSESSION} ${PROG_FSO} -- $X_OPTIONS" $USER
+        start-stop-daemon --start --pidfile ${PIDFILE} --make-pidfile --background --exec /bin/su -- --login --command "${PROG_XINIT} ${PROG_XSESSION} -- $X_OPTIONS" $USER
         [ "$VERBOSE" != no ] && log_end_msg $?
         ;;
     stop)
diff --git a/debian/zhone-session.init b/debian/zhone-session.init
deleted file mode 120000
index 41637b3..0000000
--- a/debian/zhone-session.init
+++ /dev/null
@@ -1 +0,0 @@
-../zhone-session.init
\ No newline at end of file
diff --git a/debian/zhone-session.install b/debian/zhone-session.install
deleted file mode 100644
index ff0a925..0000000
--- a/debian/zhone-session.install
+++ /dev/null
@@ -1,2 +0,0 @@
-matchbox-keyboard-toggle /usr/bin
-zhone-session /usr/bin/
diff --git a/zhone-session b/zhone-session
deleted file mode 100644
index df7aae5..0000000
--- a/zhone-session
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-zhone &
-matchbox-keyboard-toggle &
-exec matchbox-window-manager -use_titlebar no -use_cursor no

-- 
Automatic Display Manager