X Strike Force X.Org X11 SVN commit: r1345 - in branches/modular/app/xbase-clients/debian: . patches
Author: dnusinow
Date: 2006-02-26 22:50:54 -0500 (Sun, 26 Feb 2006)
New Revision: 1345
Added:
branches/modular/app/xbase-clients/debian/patches/09_debian_startx_manpage.diff
Modified:
branches/modular/app/xbase-clients/debian/changelog
branches/modular/app/xbase-clients/debian/patches/series
Log:
* Port patches from trunk
+ debian/902_debian_startx_manpage.diff
Modified: branches/modular/app/xbase-clients/debian/changelog
===================================================================
--- branches/modular/app/xbase-clients/debian/changelog 2006-02-27 03:37:22 UTC (rev 1344)
+++ branches/modular/app/xbase-clients/debian/changelog 2006-02-27 03:50:54 UTC (rev 1345)
@@ -11,8 +11,9 @@
+ general/025d_xedit_manpage_typos.diff
+ general/025e_xvinfo_manpage_typo.diff
+ general/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
+ + debian/902_debian_startx_manpage.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 22:36:47 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 22:49:01 -0500
xbase-clients (1:1.0.1-1) experimental; urgency=low
Added: branches/modular/app/xbase-clients/debian/patches/09_debian_startx_manpage.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/09_debian_startx_manpage.diff 2006-02-27 03:37:22 UTC (rev 1344)
+++ branches/modular/app/xbase-clients/debian/patches/09_debian_startx_manpage.diff 2006-02-27 03:50:54 UTC (rev 1345)
@@ -0,0 +1,77 @@
+$Id: 902_debian_startx_manpage.diff 867 2005-11-13 16:29:11Z dnusinow $
+
+Fix the startx manpage to be more correct for our setup; this patch by Branden
+Robinson.
+
+Index: xinit-X11R7.0-1.0.1/startx.man
+===================================================================
+--- xinit-X11R7.0-1.0.1/startx.man.orig 2005-11-12 16:31:16.000000000 -0500
++++ xinit-X11R7.0-1.0.1/startx.man 2005-11-13 11:00:34.000000000 -0500
+@@ -74,6 +74,28 @@
+ .RE
+ #ifdef __SCOMAN__
+ .PP
++Note that in the Debian system, what many people traditionally put in the
++.I .xinitrc
++file should go in
++.I .xsession
++instead; this permits the same X environment to be presented whether
++.IR startx ,
++.IR xdm ,
++or
++.I xinit
++is used to start the X session. All discussion of the
++.I .xinitrc
++file in the
++.IR xinit (1)
++manual page applies equally well to
++.IR .xsession.
++Keep in mind that
++.I .xinitrc
++is used only by
++.IR xinit (1)
++and completely ignored by
++.IR xdm (1).
++.PP
+ To determine the client to run,
+ .I startx
+ looks for the following files, in order:
+@@ -132,38 +154,6 @@
+ files are found in the
+ .I __xinitdir__
+ directory.
+-.PP
+-The
+-.I .xinitrc
+-is typically a shell script which starts many clients according to the
+-user's preference. When this shell script exits,
+-.I startx
+-kills the server and performs any other session shutdown needed.
+-Most of the clients started by
+-.I .xinitrc
+-should be run in the background. The last client should run in the
+-foreground; when it exits, the session will exit. People often choose
+-a session manager, window manager, or \fIxterm\fP as the ''magic'' client.
+-.SH EXAMPLE
+-.PP
+-Below is a sample \fI\.xinitrc\fP that starts several applications and
+-leaves the window manager running as the ''last'' application. Assuming that
+-the window manager has been configured properly, the user
+-then chooses the ''Exit'' menu item to shut down X.
+-.sp
+-.in +4
+-.nf
+-xrdb \-load $HOME/.Xresources
+-xsetroot \-solid gray &
+-xbiff \-geometry \-430+5 &
+-oclock \-geometry 75x75\-0\-0 &
+-xload \-geometry \-80\-0 &
+-xterm \-geometry +0+60 \-ls &
+-xterm \-geometry +0\-100 &
+-xconsole \-geometry \-0+0 \-fn 5x7 &
+-exec twm
+-.fi
+-.in -4
+ .SH "ENVIRONMENT VARIABLES"
+ .TP 25
+ DISPLAY
Modified: branches/modular/app/xbase-clients/debian/patches/series
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 03:37:22 UTC (rev 1344)
+++ branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 03:50:54 UTC (rev 1345)
@@ -6,3 +6,4 @@
06_xedit_manpage_typos.diff
07_xvinfo_manpage_typo.diff
08_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0
+09_debian_startx_manpage.diff -p0
Reply to: