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

[Enrico Zini]

The following commit has been merged in the master branch:
commit 2f593f3de82a679af9eecd8dc99de67819583659
Author: Enrico Zini <enrico at enricozini.org>
Date:   Wed Aug 17 13:56:14 2011 +0200

    Removed nodm/xinit form debconf and updated debconf templates

diff --git a/debian/changelog b/debian/changelog
index a7321fe..093722e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ nodm (0.11-1) unstable; urgency=low
     ignored. Closes: #634901
   * Do not require that $NODM_XSESSION points to a valid script now: nodm can
     start without it
+  * Removed nodm/xinit form debconf and updated debconf templates
 
- -- Enrico Zini <enrico at debian.org>  Wed, 17 Aug 2011 13:39:20 +0200
+ -- Enrico Zini <enrico at debian.org>  Wed, 17 Aug 2011 13:55:54 +0200
 
 nodm (0.10-1) unstable; urgency=low
 
diff --git a/debian/nodm.config b/debian/nodm.config
index 6c40b5f..f810330 100644
--- a/debian/nodm.config
+++ b/debian/nodm.config
@@ -14,6 +14,12 @@ if [ -s /etc/default/nodm ] ; then
 		db_set nodm/user "$NODM_USER"
 	fi
 
+	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.10"
+	then
+		# After 0.10 nodm/xinit is not needed anymore
+		dh_unregister nodm/xinit
+	fi
+
 	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.5"
 	then
 		# If I'm coming from <0.5, remove vtN from NODM_X_OPTIONS and
@@ -41,17 +47,12 @@ if [ -s /etc/default/nodm ] ; then
 			db_set nodm/first_vt "$NODM_FIRST_VT"
 		fi
 		if [ -n "$NODM_X_OPTIONS" ] ; then
-			# If I'm  going from <0.5 to >= 0.5, remove vt? from the line
-			# And set first_vt to vtN
 			db_set nodm/x_options "$NODM_X_OPTIONS"
 		fi
 	fi
 	if [ -n "$NODM_MIN_SESSION_TIME" ]; then
 		db_set nodm/min_session_time "$NODM_MIN_SESSION_TIME"
 	fi
-	if [ -n "$NODM_XINIT" ]; then
-		db_set nodm/xinit "$NODM_XINIT"
-	fi
 	if [ -n "$NODM_XSESSION" ]; then
 		db_set nodm/xsession "$NODM_XSESSION"
 	fi
@@ -76,9 +77,6 @@ if [ "x$START" = "xtrue" ] ; then
 	db_input low nodm/min_session_time || true
 	db_go
 
-	db_input low nodm/xinit || true
-	db_go
-
 	db_input low nodm/xsession || true
 	db_go
 fi
diff --git a/debian/nodm.postinst b/debian/nodm.postinst
index 9ec548e..3957d61 100644
--- a/debian/nodm.postinst
+++ b/debian/nodm.postinst
@@ -37,8 +37,6 @@ EOF
 	NODM_X_OPTIONS="$RET"
 	db_get nodm/min_session_time
 	NODM_MIN_SESSION_TIME="$RET"
-	db_get nodm/xinit
-	NODM_XINIT="$RET"
 	db_get nodm/xsession
 	NODM_XSESSION="$RET"
 
@@ -48,7 +46,6 @@ EOF
 			-e "s,^NODM_FIRST_VT=.*,NODM_FIRST_VT='$NODM_FIRST_VT'," \
 			-e "s,^NODM_X_OPTIONS=.*,NODM_X_OPTIONS='$NODM_X_OPTIONS'," \
 			-e "s,^NODM_MIN_SESSION_TIME=.*,NODM_MIN_SESSION_TIME=$NODM_MIN_SESSION_TIME," \
-			-e "s,^NODM_XINIT=.*,NODM_XINIT=$NODM_XINIT," \
 			-e "s,^NODM_XSESSION=.*,NODM_XSESSION=$NODM_XSESSION," \
 			/etc/default/nodm
 	else
@@ -61,9 +58,6 @@ NODM_ENABLED=$NODM_ENABLED
 # User to autologin for
 NODM_USER=$NODM_USER
 
-# xinit program
-NODM_XINIT=$NODM_XINIT
-
 # First vt to try when looking for free VTs
 NODM_FIRST_VT=$NODM_FIRST_VT
 
diff --git a/debian/nodm.templates b/debian/nodm.templates
index 79cba0b..91e593e 100644
--- a/debian/nodm.templates
+++ b/debian/nodm.templates
@@ -38,14 +38,12 @@ _Description: Lowest numbered vt on which X may start:
 
 Template: nodm/x_options
 Type: string
-Default: vt7 -nolisten tcp
+Default: -nolisten tcp
 #flag:translate!:3
 _Description: Options for the X server:
- Please enter the options to pass to the X server when starting the session.
- These options will be used in the NODM_X_OPTIONS variable in the command line used
- by nodm to start the X session:
+ Please enter the options to pass to the X server when starting it.
  .
- $NODM_XINIT $NODM_XSESSION -- $NODM_X_OPTIONS
+ If no vtN option is used, nodm will perform automatic vt allocation.
 
 Template: nodm/min_session_time
 Type: string
@@ -55,25 +53,10 @@ _Description: Minimum time (in seconds) for a session to be considered OK:
  amount of time before restarting the session. The waiting time will grow
  until a session lasts longer than this amount.
 
-Template: nodm/xinit
-Type: string
-Default: /usr/bin/xinit
-#flag:translate!:3
-_Description: xinit program to use:
- Please choose the name of the "xinit" program to use with nodm. This
- name will be stored in the NODM_XINIT variable in the command line used
- by nodm to start the X session:
- .
- $NODM_XINIT $NODM_XSESSION -- $NODM_X_OPTIONS
-
 Template: nodm/xsession
 Type: string
 Default: /etc/X11/Xsession
 #flag:translate!:3
 _Description: X session to use:
- Please choose the name of the X session script to use with nodm. This
- name will be stored in the NODM_XSESSION variable in the command line used
- by nodm to start the X session:
- .
- $NODM_XINIT $NODM_XSESSION -- $NODM_X_OPTIONS
+ Please choose the name of the X session script to use with nodm.
 

-- 
Automatic Display Manager