X Strike Force SVN commit: rev 166 - in branches/4.3.0/sid/debian: . patches local local/Xsession.d
Author: ishikawa
Date: 2003-06-09 11:02:36 -0500 (Mon, 09 Jun 2003)
New Revision: 166
Added:
branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
branches/4.3.0/sid/debian/local/FAQ
branches/4.3.0/sid/debian/local/XF86Config.7
branches/4.3.0/sid/debian/local/Xsession
branches/4.3.0/sid/debian/local/Xsession.5
branches/4.3.0/sid/debian/local/Xsession.d/20xfree86-common_process-args
branches/4.3.0/sid/debian/local/Xsession.d/50xfree86-common_determine-startup
branches/4.3.0/sid/debian/local/dexconf.1
branches/4.3.0/sid/debian/local/update-fonts-alias
branches/4.3.0/sid/debian/local/update-fonts-alias.8
branches/4.3.0/sid/debian/local/update-fonts-dir
branches/4.3.0/sid/debian/local/update-fonts-dir.8
branches/4.3.0/sid/debian/local/update-fonts-scale
branches/4.3.0/sid/debian/local/update-fonts-scale.8
branches/4.3.0/sid/debian/local/xdm.options.5
branches/4.3.0/sid/debian/local/xserver-wrapper.c
branches/4.3.0/sid/debian/local/xvfb-run.1
branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
branches/4.3.0/sid/debian/patches/900_debian_config.diff
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/xdm.postinst.in
branches/4.3.0/sid/debian/xdm.prerm.in
branches/4.3.0/sid/debian/xfree86-common.postinst.in
branches/4.3.0/sid/debian/xfs.postinst.in
branches/4.3.0/sid/debian/xfs.prerm.in
branches/4.3.0/sid/debian/xserver-common.postinst.in
branches/4.3.0/sid/debian/xserver-xfree86.config.in
Log:
resync with 4.2.1-8
Modified: branches/4.3.0/sid/debian/xfs.postinst.in
==============================================================================
--- branches/4.3.0/sid/debian/xfs.postinst.in 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/xfs.postinst.in 2003-06-09 16:02:36 UTC (rev 166)
@@ -49,7 +49,7 @@
NOSTART=yes
fi
-[ -n "$NOSTART" ] || /etc/init.d/xfs start || true
+[ -n "$NOSTART" ] || invoke-rc.d xfs start || true
#DEBHELPER#
Modified: branches/4.3.0/sid/debian/xserver-common.postinst.in
==============================================================================
--- branches/4.3.0/sid/debian/xserver-common.postinst.in 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/xserver-common.postinst.in 2003-06-09 16:02:36 UTC (rev 166)
@@ -59,13 +59,13 @@
egrep -q '^### END DEBCONF SECTION' $CONFIGFILE; then
# see if the beginning of the file was left alone; sed cannot backtrack in an
# address range
- if ! head -1 $CONFIGFILE | egrep -q '^### BEGIN DEBCONF SECTION'; then
+ if ! head -n 1 $CONFIGFILE | egrep -q '^### BEGIN DEBCONF SECTION'; then
# sick, sick, sick
LINES=$(sed -n '1,/^### BEGIN DEBCONF SECTION/p' < $CONFIGFILE | wc -l)
sed -n 1,$(( $LINES - 1 ))p < $CONFIGFILE > $WORKTMP
fi
cat $DEBCONFTMP >> $WORKTMP
- sed -n '/^### END DEBCONF SECTION/,$p' < $CONFIGFILE | tail +2 >> $WORKTMP
+ sed -n '/^### END DEBCONF SECTION/,$p' < $CONFIGFILE | tail -n +2 >> $WORKTMP
else
message "Existing $CONFIGFILE has missing or half-open debconf region;" \
"not writing X server wrapper configuration file."
Modified: branches/4.3.0/sid/debian/patches/900_debian_config.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/900_debian_config.diff 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/patches/900_debian_config.diff 2003-06-09 16:02:36 UTC (rev 166)
@@ -1,6 +1,6 @@
--- xc/config/cf/linux.cf.orig Fri Nov 22 17:12:38 2002
+++ xc/config/cf/linux.cf Fri Nov 22 17:13:43 2002
-@@ -126,13 +126,7 @@
+@@ -127,13 +127,7 @@
# define NormalLibGlu YES
# define FSUseSyslog YES
Added: branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff 2003-06-09 16:02:36 UTC (rev 166)
@@ -0,0 +1,30 @@
+GNU CPP 3.3 doesn't handle the -traditional flag correctly. This causes
+bustication of xdm, xrdb, and probably manpage generation as well.
+
+This patch by Branden Robinson. Not submitted upstream. A temporary fix;
+stuff using cpp in the tree probably needs to be "ported" to work when
+-traditional is not set, if possible.
+
+--- xc/config/cf/gnu.cf~ 2003-05-26 23:27:33.000000000 -0500
++++ xc/config/cf/gnu.cf 2003-05-26 23:29:16.000000000 -0500
+@@ -105,9 +105,7 @@
+ #ifndef DoLoadableServer
+ #define DoLoadableServer YES
+ #endif
+-#ifndef
+-#define CppCmd /lib/cpp
+-#endif
++#define CppCmd cpp-3.2
+ #define YaccCmd bison -y
+ #define LexCmd flex -l
+ #define HasFlex YES
+--- xc/config/cf/linux.cf~ 2003-05-26 23:27:37.000000000 -0500
++++ xc/config/cf/linux.cf 2003-05-26 23:28:51.000000000 -0500
+@@ -94,6 +94,7 @@
+ # define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt
+ # define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt
+ # define SystemManDirectory /usr/share/man
++# define CppCmd cpp-3.2
+ # define HasPam YES
+ # define HasTk YES
+ # define TkLibDir /usr/lib
Modified: branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-09 16:02:36 UTC (rev 166)
@@ -268,7 +268,7 @@
INSTUIDFLAGS = InstUidFlags /* install flags for setuid programs */
--- xc/config/cf/gnu.cf.orig Mon Jan 13 17:22:45 2003
+++ xc/config/cf/gnu.cf Mon Jan 13 17:22:51 2003
-@@ -143,26 +143,6 @@
+@@ -141,26 +141,6 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
@@ -297,7 +297,7 @@
#endif
--- xc/config/cf/linux.cf.orig Mon Jan 13 17:22:59 2003
+++ xc/config/cf/linux.cf Mon Jan 13 17:23:31 2003
-@@ -154,6 +154,7 @@
+@@ -155,6 +155,7 @@
# define BuildHtmlManPages NO
# define StaticNeedsPicForShared YES
# define KernelVersionInBanner YES
@@ -305,12 +305,10 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -940,26 +941,6 @@
- # define ExtraLibraries -ldnet
- #else
+@@ -943,26 +944,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
--#endif
--
+ #endif
+
-/* Some of these man page defaults are overriden in the above OS sections */
-#ifndef ManSuffix
-# define ManSuffix 1x
@@ -329,9 +327,11 @@
-#endif
-#ifndef FileManDir
-# define FileManDir $(MANSOURCEPATH)5
+-#endif
+-
+ #ifndef StaticLibrary
+ # define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
-
- #ifndef StaticLibrary
--- xc/config/cf/xfree86.cf.orig Mon Jan 13 17:23:38 2003
+++ xc/config/cf/xfree86.cf Mon Jan 13 17:23:47 2003
@@ -1887,10 +1887,6 @@
Modified: branches/4.3.0/sid/debian/xdm.prerm.in
==============================================================================
--- branches/4.3.0/sid/debian/xdm.prerm.in 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/xdm.prerm.in 2003-06-09 16:02:36 UTC (rev 166)
@@ -70,7 +70,7 @@
fi
if [ -n "$STOP" ]; then
- /etc/init.d/xdm stop || true
+ invoke-rc.d xdm stop || true
else
if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then
touch /var/run/xdm.upgrade
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/changelog 2003-06-09 16:02:36 UTC (rev 166)
@@ -12,6 +12,32 @@
(closes: #194136)
- New xlibmesa-drm-src package. (closes: #139817)
+ * Resync with 2.4.1-8 release [ISHIKAWA Mutsumi]
+ * debian/control:
+ - move all -dev and -dbg packages from section devel to section libdevel
+ - set priority of xserver-xfree86-dbg to extra
+ - xutils depends on cpp-3.2, because imake uses cpp
+ - add Build-Depends: cpp-3.2
+ - change xdm Depends: cpp-3.2 instead of cpp
+ * #003a_damn_cpp_3.3_to_hell.diff:
+ - from #001a patch of 4.2.1-8, remunber to #003a
+ * #004_imake_manpage_handling_overhaul.diff,
+ #900_debian_config.diff:
+ - adjust line offset to adapt #003a patch import
+ * debian/rules: step compile optimization level down to -O from
+ Policy-required -O2 for all architectures, not just powerpc, due to GCC
+ 3.3 issues
+ * debian/{xdm.postinst.in,xdm.prerm.in,xfree86-common.postinst.in,
+ xfs.postinst.in,xfs.prerm.in}: use invoke-rc.d to execute init scripts
+ rather than using the absolute path of the init script itself
+ * debian/local/Xsession: if $DISPLAY is set and the xmessage command is
+ present, also use xmessage to create a dialog box for the message being
+ reported (based on a patch by Petter Reinholdtsen)
+ * debian/local/Xsession.5: document Xsession's new behavior
+ * debian/xdm.options.5: cosmetic and roff-stylistic fixes
+ * debian/local/*: catch up 4.2.1-8 updates
+ * debian/rules: cleanup needless comments (resync 2.4.1-8)
+
-- Branden Robinson <branden@debian.org> Sun, 25 May 2003 03:51:59 -0500
xfree86 (4.2.1-7) unstable; urgency=medium
Modified: branches/4.3.0/sid/debian/control
==============================================================================
--- branches/4.3.0/sid/debian/control 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/control 2003-06-09 16:02:36 UTC (rev 166)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>
Standards-Version: 3.5.10
-Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, m4, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd | freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libstdc++5-dev | libstdc++-dev
+Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, m4, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd | freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libstdc++5-dev | libstdc++-dev
Package: lbxproxy
Architecture: any
@@ -34,7 +34,7 @@
XFree86 or the dgs (Display GhostScript) package.
Package: libdps1-dbg
-Section: devel
+Section: libdevel
Priority: extra
Architecture: any
Depends: libdps1 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -77,7 +77,7 @@
the Athena widget set; their version can be found in the libxaw7 package.
Package: libxaw6-dbg
-Section: devel
+Section: libdevel
Priority: extra
Architecture: any
Depends: libxaw6 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -132,7 +132,7 @@
Window System can be found in the libxaw6 package.
Package: libxaw7-dbg
-Section: devel
+Section: libdevel
Priority: extra
Architecture: any
Depends: libxaw7 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -182,7 +182,7 @@
Package: xbase-clients
Architecture: any
-Depends: cpp, ${shlibs:Depends}, ${misc:Depends}
+Depends: cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap, xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<< 3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3), xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<= 3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<= 3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin
Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<< 4.0), xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
Provides: xmodmap, xcontrib, xpm-bin, xsm
@@ -273,7 +273,7 @@
Package: xdm
Architecture: any
-Depends: cpp, debconf (>= 1.2.9), xbase-clients, ${shlibs:Depends}, ${misc:Depends}
+Depends: debconf (>= 1.2.9), xbase-clients, cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
Suggests: xutils
Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
Provides: x-display-manager
@@ -569,7 +569,7 @@
architecture, are provided in the xlibmesa-dri package.
Package: xlibmesa-gl-dbg
-Section: devel
+Section: libdevel
Priority: extra
Architecture: any
Depends: xlibmesa-gl (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -618,7 +618,7 @@
This package was built using version 1.02 of the C++ ABI.
Package: xlibmesa-glu-dbg
-Section: devel
+Section: libdevel
Priority: extra
Architecture: any
Depends: xlibmesa-gl (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -665,7 +665,7 @@
however, specifically depends on the Mesa library.
Package: xlibosmesa4-dbg
-Section: devel
+Section: libdevel
Priority: extra
Architecture: alpha i386 ia64 powerpc sparc
Depends: xlibosmesa4 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -756,7 +756,7 @@
of bitmap and pixmap image files commonly used by X clients.
Package: xlibs-dbg
-Section: devel
+Section: libdevel
Priority: extra
Architecture: any
Depends: xlibs (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -915,6 +915,7 @@
(very large) single binary.
Package: xserver-xfree86-dbg
+Priority: extra
Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xfree86
@@ -1011,7 +1012,7 @@
Package: xutils
Architecture: any
-Depends: xfree86-common (>> 4.3), ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common (>> 4.3), cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
Suggests: xlibs-dev, ssh | rsh-server, ssh | rsh-client
Conflicts: rstart, rstartd, xbase-clients (<< 4.0), xserver-common (<< 4.0), xbase (<< 3.3.2.3a-2)
Replaces: rstart, rstartd, xbase-clients (<= 4.0.1-8), xserver-common (<< 4.0), xbase (<< 3.3.2.3a-2), xlibs-dev (<< 4.1.0-12), xlib6g-dev, dpsclient, xcontrib
Modified: branches/4.3.0/sid/debian/local/dexconf.1
==============================================================================
--- branches/4.3.0/sid/debian/local/dexconf.1 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/dexconf.1 2003-06-09 16:02:36 UTC (rev 166)
@@ -15,98 +15,258 @@
.\" along with the Debian GNU/Linux system; if not, write to the Free
.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH dexconf 8 "2001-12-11" "Debian GNU/Linux"
+.TH dexconf 1 "2002\-10\-24" "Debian Project"
.SH NAME
dexconf \- generate XFree86 X server configuration file from debconf database values
.SH SYNOPSIS
-dexconf
+.B dexconf
+[
+.I options
+]
.SH DESCRIPTION
-.B Dexconf
+.B dexconf
retrieves values from debconf's database and uses them to build an
-XF86Config or XF86Config-4 (depending on the default X server selected)
+XF86Config or XF86Config\-4 (depending on the default X server selected)
file.
.PP
-The information that dexconf uses is typically entered via a debconf
-frontend (or possibly in part by hardware autodetection tools). Note that
-dexconf itself
-.I does not set
-any values in the debconf database; it only retrieves them. If
+The information that
+.B dexconf
+uses is typically entered via a debconf frontend (or possibly in part by
+hardware autodetection tools). Note that
+.B dexconf
+itself does
+.I not
+set any values in the debconf database; it only retrieves them. If
configuration parameters of the debconf database need to be changed,
-.IR dpkg-reconfigure (8)
+.BR dpkg\-reconfigure (8)
should be used to do so.
.PP
-It is also important to note that dexconf, and the corresponding debconf
-questions whose answers it retrieves, are not intended to replace a
-full-featured X server configuration tool; that is the province of
-.IR xf86cfg (1),
+It is also important to note that
+.BR dexconf ,
+and the corresponding debconf questions whose answers it retrieves, are not
+intended to replace a full\-featured X server configuration tool; that is
+the province of
+.BR xf86cfg (1),
currently under development by the XFree86 Project, Inc. In the meantime,
however, users inexperienced with the syntax of the XF86Config (or
-XF86Config-4) file may use dexconf to generate the X server configuration
-file with a minimal amount of detailed knowledge of their hardware
-characteristics.
+XF86Config\-4) file may use
+.B dexconf
+to generate the X server configuration file with a minimal amount of
+detailed knowledge of their hardware characteristics.
.PP
-More experienced users should feel free to use Dexconf-generated
+More experienced users should feel free to use
+.BR dexconf \-generated
configuration files as a starting point for their customizations, since
individual preferences vary greatly.
.PP
-Dexconf decides which file (XF86Config or XF86Config-4) to generate based
-upon the name of the default X server (a debconf question).
+.B dexconf
+decides which file (XF86Config or XF86Config\-4) to generate based upon the
+name of the default X server (a debconf question).
.PP
-Dexconf writes only to the area between
+.B dexconf
+writes only to the area between
.RS
-### BEGIN DEBCONF SECTION
+.B ### BEGIN DEBCONF SECTION
.RE
and
.RS
-### END DEBCONF SECTION
+.B ### END DEBCONF SECTION
.RE
in the configuration file. Anything outside this region is preserved. If
-either or both of the above marker lines is missing, dexconf will exit with
-an error.
+either or both of the above marker lines is missing,
+.B dexconf
+will exit with an error (see the diagnostics section below).
.PP
-The above feature is useful especially in conjuction with the version 4 XFree86
-X server, so that additional input devices, display devices, and monitors
-can be configured, and multiple screens and layouts defined. For instance,
-the first ServerLayout section encountered in the configuration file is the
-one XFree86 4 uses as its default, so a typical customization is to write a
-ServerLayout section at the top of the file, before the beginning of the
-debconf area. See
-.IR XF86Config-4 (5x)
-and the Debian X FAQ --
-.RS
-.I /usr/share/doc/xfree86-common/FAQ/gz
-.RE
--- for more information.
-.\" .SH OPTIONS
-.\" None.
-.\" .SH OPERANDS
-.\" None.
-.\" .SH INPUT FILES
-.\" None.
+The above feature is useful especially in conjuction with the version 4
+XFree86 X server, so that additional input devices, display devices, and
+monitors can be configured, and multiple screens and layouts defined. For
+instance, the first ServerLayout section encountered in the configuration
+file is the one XFree86 4 uses as its default, so a typical customization
+is to write a ServerLayout section at the top of the file, before the
+beginning of the debconf area. See
+.IR XF86Config\-4 (5x)
+and the Debian X FAQ \(em
+.I /usr/share/doc/xfree86\-common/FAQ.gz
+\(em for more information.
+.SH OPTIONS
+.TP
+.B \-h\fR,\fB \-\-help
+Display a usage message and exit.
+.TP
+.BI \-o\ file \fR,\fB\ \-\-output= file
+By default,
+.B dexconf
+writes to the Debian default X server configuration file locations, which
+depend on the X server package being used (see the section on output files
+below). This option instructs
+.B dexconf
+to write to
+.I file
+instead.
+.SH ENVIRONMENT
+.TP
+.B COLUMNS
+This variable is used to format diagnostic messages so that they fit the
+width of the terminal. If not set, a terminal width of 80 columns is
+assumed.
+.TP
+.B TMPDIR
+.B dexconf
+creates a subdirectory of the directory name stored in this variable, and
+uses that subdirectory as a scratch area. If not set,
+.I /tmp
+is used as the parent of the scratch directory.
.SH OUTPUT FILES
.TP
-.I /etc/X11/XF86Config-4
+.I /etc/X11/XF86Config\-4
Configuration file for the XFree86 4.x X server.
.TP
.I /etc/X11/XF86Config
Configuration file for XFree86 3.x X servers.
+.SH DIAGNOSTICS
+.B dexconf
+produces several diagnostic messages if it encounters an error condition.
+These messages are prefixed with the name of the command and a colon; for
+example:
+.RS
+.B "dexconf: error encountered"
+.RE
+A list of diagnostic messages currently issued by
+.B dexconf
+follows.
+.TP
+.BI "argument " input " not understood"
+.B
+dexconf
+was given a command\-line option
+.RI ( input )
+it did not understand. Use only the options documented.
+.TP
+.BI "cannot create temporary work directory; " dirname " does not exist or is not a directory"
+.B
+dexconf
+was unable to create a scratch directory to work in because the parent
+directory
+.RI ( dirname )
+was not does not exist or is not a directory. Create
+.I dirname
+and set its permissions properly, or set the
+.B TMPDIR
+environment variable to the name of an existing directory.
+.TP
+.BI "cannot create temporary work directory in " dirname "; directory not writable"
+.B dexconf
+had insufficient permissions to create a directory in
+.IR dirname .
+Change the permissions on
+.I dirname
+or set the
+.B TMPDIR
+environment variable to the of a writeable directior.
+.TP
+.BI "cannot generate configuration file; " question " not set"
+An answer to the indicated
+.I question
+was expected in the debconf database, but none was found.
+.B dexconf
+cannot write a valid configuration file without this information. This
+problem can be rectified by reconfiguring the X server package with the
+.BR dpkg\-reconfigure (8)
+command.
+.TP
+.BI "creation of temporary work directory " dirname " failed"
+.B dexconf
+was unable to create a scratch directory
+.RI ( dirname )
+to work in. This diagnostic is only issued after
+.B dexconf
+has checked to ensure that the parent directory of
+.I dirname
+is writable, and after the temporary directory to be used has been removed
+(if necessary). This diagnostic message could indicate that something on
+the system is attempting to find or exploit security vulnerabilities in the
+temporary directory being used.
+.TP
+.BI "existing " configfile " file has missing or half\-open debconf region; not writing X server configuration file"
+The
+.I configfile
+X server configuration file was not properly formatted for update by
+.BR dexconf .
+.B dexconf
+refuses to write to files that have been edited in such a way that it
+appears that automatic updates are not desired. Move the
+.I configfile
+out of the way or add the debconf \(oqregion markers\(cq as described
+above.
+.TP
+.B received signal
+.B dexconf
+was sent a fatal signal; see the section on asynchronous events below.
+.TP
+.BI "this program does not know how to configure the " package " X server"
+.B dexconf
+only knows how to write configuration files for XFree86 version 3 and
+version 4 X servers. The value of the
+.B shared/default\-x\-server
+debconf template was set to a package name that
+.B dexconf
+did not recognize. A different tool will have to be used to configure the
+selected X server, or
+.BR dpkg\-reconfigure (8)
+will have to be used to change the default X server.
+.TP
+.BI "unable to write to " configfile
+.B dexconf
+was unable to write to
+.I configfile
+because it lacked permissions to do so. Run
+.B dexconf
+as a user with permissions to write to
+.IR configfile,
+or specify an alternate file to write with the
+.B \-o
+or
+.B \-\-output
+options.
+.SH "ASYNCHRONOUS EVENTS"
+.B dexconf
+traps the HUP, INT, QUIT, and TERM signals.
+.B dexconf
+removes its scratch directory and exits when it receives any of these
+signals.
+.SH "EXIT STATUS"
+.TP
+0
+A configuration file was successfully written.
+.TP
+1
+An error occurred, or
+.B dexconf
+was interrupted. See the section on diagnostics above.
+.SH "FUTURE DIRECTIONS"
+.B dexconf
+will probably stop caring about \(oqdebconf region markers\(cq in the near
+future, and unconditionally overwrite the configuration file. The logic
+used by X sever package post\-installation scripts to invoke
+.B dexconf
+will change as well, such that a user\-modified configuration file will
+never be overwritten.
.SH AUTHOR
-Dexconf was written by Branden Robinson for Progeny Linux Systems, Inc., and
-Debian GNU/Linux.
-.SH SEE ALSO
+.B dexconf
+was written by Branden Robinson for Progeny Linux Systems, Inc., and the
+Debian Project.
+.SH "SEE ALSO"
.IR XF86Config (7),
-.IR XF86Config-4 (5x),
-.IR XF86Config-v3 (5x),
+.IR XF86Config\-4 (5x),
+.IR XF86Config\-v3 (5x),
.IR xf86cfg (1x),
-.IR dpkg-reconfigure(8)
+.IR dpkg\-reconfigure(8)
+.\" OPERANDS
+.\" INPUT FILES
.\" STDIN
-.\" ENVIRONMENT
-.\" ASYNCHRONOUS EVENTS
.\" STDOUT
.\" STDERR
.\" EXTENDED DESCRIPTION
-.\" EXIT STATUS
.\" CONSEQUENCES OF ERRORS
.\" APPLICATION USAGE
.\" EXAMPLES
-.\" FUTURE DIRECTIONS
Modified: branches/4.3.0/sid/debian/local/xdm.options.5
==============================================================================
--- branches/4.3.0/sid/debian/local/xdm.options.5 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/xdm.options.5 2003-06-09 16:02:36 UTC (rev 166)
@@ -14,7 +14,7 @@
.\" along with the Debian GNU/Linux system; if not, write to the Free
.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH xdm.options 5 "10 Nov 2000" "Debian GNU/Linux"
+.TH xdm.options 5 "2002\-11\-24" "Debian Project"
.SH NAME
xdm.options \- configuration options for X display manager
.SH DESCRIPTION
@@ -26,56 +26,60 @@
.I /etc/X11/xdm/xdm.options
may contain comments, which begin with a hash mark and end at the next
newline, just like comments in shell scripts. The rest of the file
-consists of options which are expressed as words separated by hyphens,
-with only one option per line. If an option is present with the "no-"
+consists of options which are expressed as words separated by hyphens, with
+only one option per line. If an option is present with the \(oqno\-\(cq
prefix, or absent, it is disabled, otherwise it is considered enabled.
.PP
Available options are:
-.IP ignore-nologin
+.TP
+.B ignore\-nologin
Normally, the contents of the /etc/nologin file will be displayed using
.BR xmessage (1x)
-(if xmessage is available), and the user will be returned to the xdm login
-screen after the xmessage is dismissed. If this option is enabled, xdm
-starts a session as usual (after the xmessage is dismissed, if xmessage
-is available).
-.IP restart-on-upgrade
-Enable this option with caution on "production" machines; it causes the
-xdm daemon to be stopped and restarted on upgrade, even if the process
-has children (which means it is managing X sessions). Typically when
-a package that contains a daemon is being installed or upgraded, its
-maintainer scripts stop a running daemon process before installing the
-new binary, and restart it after the new binary is installed. Stopping
-xdm causes immediate termination of any sessions it manages; in some
-situations this could be an unwelcome surprise (for instance, for remote
-xdm users who had no idea the administrator was performing system
-maintenance). On the other hand, for machines that stay up for long
-periods of time, leaving the old daemon running can be a bad idea if
-the new version has, for instance, a fix for a security vulnerability
-(overwriting xdm's executable on the file system has no effect on the
-copy of xdm in memory). The xdm pre-removal script checks to see if the
-xdm process has any children; if it does, it is possible that someone's
-session would be killed by stopping xdm, so a warning is issued and an
-opportunity to abort the upgrade of xdm is provided. If this option is
-disabled (the Debian default), xdm will be not be stopped or started
-during an install or upgrade; the administrator will have to do so by
-hand (with "/etc/init.d/xdm restart", or by rebooting the system) before
-the newly installed xdm binary is used.
-.IP use-sessreg
-If this option is enabled (the Debian default), the sessreg program will
-be invoked to register X sessions managed by xdm in the utmp and wtmp
-files. Otherwise, it is not, and the utmp and wtmp files will have no
-record of xdm sessions.
+(if
+.B xmessage
+is available), and the user will be returned to the xdm login screen after
+the xmessage is dismissed. If this option is enabled, xdm starts a session
+as usual (after the xmessage is dismissed, if xmessage is available).
+.TP
+.B restart\-on\-upgrade
+Enable this option with caution on \(oqproduction\(cq machines; it causes
+the xdm daemon to be stopped and restarted on upgrade, even if the process
+has children (which means it is managing X sessions). Typically when a
+package that contains a daemon is being installed or upgraded, its
+maintainer scripts stop a running daemon process before installing the new
+binary, and restart it after the new binary is installed. Stopping xdm
+causes immediate termination of any sessions it manages; in some situations
+this could be an unwelcome surprise (for instance, for remote xdm users who
+had no idea the administrator was performing system maintenance). On the
+other hand, for machines that stay up for long periods of time, leaving the
+old daemon running can be a bad idea if the new version has, for instance,
+a fix for a security vulnerability (overwriting xdm's executable on the
+file system has no effect on the copy of xdm in memory). The xdm
+pre\-removal script checks to see if the xdm process has any children; if
+it does, it is possible that someone's session would be killed by stopping
+xdm, so a warning is issued and an opportunity to abort the upgrade of xdm
+is provided. If this option is disabled (the Debian default), xdm will be
+not be stopped or started during an install or upgrade; the administrator
+will have to do so by hand (with \(oq/etc/init.d/xdm restart\(cq, or by
+rebooting the system) before the newly installed xdm binary is used.
+.TP
+.B use\-sessreg
+If this option is enabled (the Debian default), the sessreg program will be
+invoked to register X sessions managed by xdm in the utmp and wtmp files.
+Otherwise, it is not, and the utmp and wtmp files will have no record of
+xdm sessions.
.PP
Users of older versions of the Debian system should note that the
-"run-xconsole" option has been removed. The configurable shell scripts
+\(oqrun\-xconsole\(cq option has been removed. The configurable shell
+scripts
.I /etc/X11/xdm/Xsetup
and
.I /etc/X11/xdm/Xreset
may be edited to disable or modify the running of xconsole on the xdm
greeter screen.
+.SH AUTHOR
+This manpage was written by Branden Robinson for the Debian Project.
.SH SEE ALSO
.BR sessreg (1x),
.BR xmessage (1x),
.BR xdm (1x)
-.SH AUTHOR
-This manpage was written by Branden Robinson for Debian GNU/Linux.
Modified: branches/4.3.0/sid/debian/local/XF86Config.7
==============================================================================
--- branches/4.3.0/sid/debian/local/XF86Config.7 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/XF86Config.7 2003-06-09 16:02:36 UTC (rev 166)
@@ -14,7 +14,7 @@
.\" along with the Debian GNU/Linux system; if not, write to the Free
.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH XF86Config 7 "2001-09-24" "Debian GNU/Linux"
+.TH XF86Config 7 "2002\-10\-24" "Debian GNU/Linux"
.SH NAME
XF86Config \- XFree86 X server configuration
.SH DESCRIPTION
@@ -22,7 +22,7 @@
and version 4 servers. To accomodate this simultaneity, the names of
several utilities and manual pages had to be changed from their upstream
defaults.
-.SH "XFREE86 3.x SERVER CONFIGURATION"
+.SS "XFree86 3.x Server Configuration"
Version 3 XFree86 X server packages include:
.TP
.B xserver\-3dlabs
@@ -109,7 +109,7 @@
Keep in mind that it takes time for new versions of XFree86 to be packaged
for Debian; see <http://people.debian.org/~branden/xsf.html> for packaging
progress reports.
-.SH "XFREE86 4.x SERVER CONFIGURATION"
+.SS "XFree86 4.x Server Configuration"
There is only one server package for XFree86 4.x,
.BR xserver\-xfree86 ,
corresponding to the
Modified: branches/4.3.0/sid/debian/local/update-fonts-dir.8
==============================================================================
--- branches/4.3.0/sid/debian/local/update-fonts-dir.8 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/update-fonts-dir.8 2003-06-09 16:02:36 UTC (rev 166)
@@ -1,4 +1,4 @@
-.\" This manpage is copyright (C) 1999 Branden Robinson <branden@debian.org>.
+.\" This manpage is copyright 1999,2002 Branden Robinson <branden@debian.org>.
.\"
.\" This is free software; you can redistribute it and/or modify it under
.\" the terms of the GNU General Public License as published by the Free
@@ -13,29 +13,29 @@
.\" your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
.\" with the dpkg source package as the file COPYING. If not, write to the
.\" Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH update-fonts-dir 8 "16 Mar 2001" "Debian GNU/Linux"
+.TH update-fonts-dir 8 "2002\-11\-01" "Debian Project"
.SH NAME
-update-fonts-dir \- compile fonts.dir files
+update\-fonts\-dir \- compile fonts.dir files
.SH SYNOPSIS
-.B update-fonts-dir
+.B update\-fonts\-dir
.I directory ...
.SH DESCRIPTION
-.B update-fonts-dir
+.B update\-fonts\-dir
creates a
.I fonts.dir
file in an X font directory by invoking
.BR mkfontdir (1x)
with the appropriate arguments. It is typically invoked only from the
-post-installation and post-removal scripts of a
+post\-installation and post\-removal scripts of a
.I package
containing fonts for the X Window System, but may be invoked at any time to
reconstruct
.I fonts.dir
files. For each
.IR directory ,
-which is either an absolute path to an X font directory or (preferably)
-simply the last component of its path (such as "75dpi" or "misc"),
-.B update-fonts-dir
+which is simply the last component of its path (such as \(oq75dpi\(cq or
+\(oqmisc\(cq),
+.B update\-fonts\-dir
will generate
.IR /usr/lib/X11/fonts/ directory /fonts.dir
from the
@@ -46,12 +46,14 @@
directory. No font package actually provides the
.I fonts.dir
file in the X font directory itself, so there is no danger of overwriting
-one package's font names with those of another;
-For instance, the two packages "xfonts-base" (real) and "xfonts-nifty"
-(hypothetical) may both install fonts into the directory
+one package's font names with those of another.
+.PP
+For instance, the two packages \(oqxfonts\-base\(cq (real) and
+\(oqxfonts\-nifty\(cq (hypothetical) may both install fonts into the
+directory
.IR /usr/lib/X11/fonts/misc ,
and
-.B update-fonts-dir
+.B update\-fonts\-dir
will ensure that the
.I fonts.dir
file in that directory contains information about the font files provided
@@ -64,25 +66,64 @@
manual page.
.PP
An example of how to use
-.B update-fonts-dir
+.B update\-fonts\-dir
in package maintainer scripts is provided in the Debian Policy Manual.
-.SH SEE ALSO
-.BR mkfontdir (1x)
+.SH OPERANDS
+.B update\-fonts\-dir
+takes one or more X font directory names to operate on as operands. Only
+the final path component of the directory name should be specified; e.g.,
+.RS
+.B update-fonts-dir 75dpi
+.RE
+is correct, while
+.RB \(oq "update-fonts-dir /usr/X11R6/lib/X11/fonts/75dpi" \(cq
+and
+.RB \(oq "update-fonts-dir /usr/lib/X11/fonts/75dpi" \(cq
+are not.
.SH DIAGNOSTICS
-.B update-fonts-dir
-exits with status 1 if its arguments are absent or invalid.
+.SS Errors
+.TP
+.B error: one or more font directories must be provided
+.B update\-fonts\-dir
+was invoked without operands. Supply one or more X font directory names to
+operate on.
+.TP
+.B error: path to X font directory must be used
+A directory name was supplied that was not an X font directory name.
+Supply X font directory names only.
+.SS Warnings
+.TP
+.BI "warning: absolute path " directory " was provided"
+Usage of absolute paths is deprecated. Use only the final component of the
+X font directory name for
+.IR directory .
+.TP
+.BI "warning: " directory " does not exist or is not a directory"
+The supplied
+.I directory
+was invalid.
+.B update\-fonts\-dir
+skipped it.
+.SH "EXIT STATUS"
+.TP
+0
+.B update\-fonts\-dir
+ran successfully.
+.TP
+1
+.B update\-fonts\-dir
+experienced a fatal error; see the section on diagnostic messages above.
.SH BUGS
-See <http://bugs.debian.org/xbase-clients>. If you wish to
+See <http://bugs.debian.org/xbase\-clients>. If you wish to
report a bug in
-.BR update-fonts-dir ,
+.BR update\-fonts\-dir ,
please see
-.IR /usr/share/doc/debian/bug-reporting.txt ,
-the
-.BR bug (1)
-command, or the
+.I /usr/share/doc/debian/bug\-reporting.txt
+or the
.BR reportbug (1)
command.
.SH AUTHOR
-.B update-fonts-dir
-is written and copyrighted by Branden Robinson. It is licensed under the
-GNU GPL, version 2.
+.B update\-fonts\-dir
+was written by Branden Robinson for the Debian Project.
+.SH "SEE ALSO"
+.BR mkfontdir (1x)
Modified: branches/4.3.0/sid/debian/local/Xsession.d/20xfree86-common_process-args
==============================================================================
--- branches/4.3.0/sid/debian/local/Xsession.d/20xfree86-common_process-args 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/Xsession.d/20xfree86-common_process-args 2003-06-09 16:02:36 UTC (rev 166)
@@ -1,4 +1,3 @@
-
case $# in
0)
;;
@@ -11,13 +10,13 @@
exec x-terminal-emulator -geometry +1+1
else
# fatal error
- errormsg "Xsession: unable to launch failsafe X session;" \
- "x-terminal-emulator not executable. Aborting."
+ errormsg "unable to launch failsafe X session ---" \
+ "x-terminal-emulator not executable; aborting."
fi
else
# fatal error
- errormsg "Xsession: unable to launch failsafe X session;" \
- "x-terminal-emulator not found. Aborting."
+ errormsg "unable to launch failsafe X session ---" \
+ "x-terminal-emulator not found; aborting."
fi
fi
;;
@@ -29,18 +28,18 @@
if [ -x "$PROGRAM" ]; then
STARTUP=$PROGRAM
else
- message "Xsession: unable to launch $1 X session; $1 not" \
- "executable. Falling back to default session."
+ message "unable to launch \"$1\" X session ---" \
+ "\"$1\" not executable; falling back to default session."
fi
else
- message "Xsession: unable to launch $1 X session; $1 not found." \
- "Falling back to default session."
+ message "unable to launch \"$1\" X session ---" \
+ "\"$1\" not found; falling back to default session."
fi
;;
esac
;;
*)
- message "Xsession: unsupported number of arguments ($#). Falling back" \
- "to default session."
+ message "unsupported number of arguments ($#); falling back to default" \
+ "session."
;;
esac
Modified: branches/4.3.0/sid/debian/local/Xsession.d/50xfree86-common_determine-startup
==============================================================================
--- branches/4.3.0/sid/debian/local/Xsession.d/50xfree86-common_determine-startup 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/Xsession.d/50xfree86-common_determine-startup 2003-06-09 16:02:36 UTC (rev 166)
@@ -1,3 +1,4 @@
+REALSTARTUP=
if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
for STARTUPFILE in "$STARTUP" "$ALTSTARTUP"; do
@@ -24,10 +25,10 @@
if [ -z "$REALSTARTUP" ]; then
# fatal error
- ERRMSG="Xsession: unable to start X session; "
+ ERRMSG="unable to start X session ---"
if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
- ERRMSG="$ERRMSG no $STARTUP file, no $ALTSTARTUP file,"
+ ERRMSG="$ERRMSG no \"$STARTUP\" file, no \"$ALTSTARTUP\" file,"
fi
errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
- "emulators found. Aborting."
+ "emulators found; aborting."
fi
Modified: branches/4.3.0/sid/debian/local/xserver-wrapper.c
==============================================================================
--- branches/4.3.0/sid/debian/local/xserver-wrapper.c 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/xserver-wrapper.c 2003-06-09 16:02:36 UTC (rev 166)
@@ -153,7 +153,9 @@
(void) fprintf(stderr,"X: cannot stat stdin\n");
return FALSE;
}
- if (S_ISCHR(s.st_mode) && ((s.st_rdev >> 8) & 0xff) == VT_MAJOR_DEV && (s.st_rdev & 0xff) < 64) {
+ if (S_ISCHR(s.st_mode) &&
+ ((s.st_rdev >> 8) & 0xff) == VT_MAJOR_DEV &&
+ (s.st_rdev & 0xff) < 64) {
return TRUE;
}
break;
@@ -191,7 +193,8 @@
while (val != NULL) {
var[0] = '\0';
value[0] = '\0';
- if (sscanf(line, " %64[A-Za-z0-9_] = %256[A-Za-z0-9_ -] ", var, value) > 0) {
+ if (sscanf(line, " %64[A-Za-z0-9_] = %256[A-Za-z0-9_ -] ",
+ var, value) > 0) {
/* truncate extra spaces at end of value */
length = strlen(value);
if (length > 256) {
@@ -216,25 +219,30 @@
(void) fclose(cf);
} else {
- (void) fprintf(stderr, "X: unable to open wrapper config file %s\n", X_WRAPPER_CONFIG_FILE);
+ (void) fprintf(stderr, "X: unable to open wrapper config file %s\n",
+ X_WRAPPER_CONFIG_FILE);
}
if (lstat(X_SERVER_SYMLINK, &statbuf)) {
- (void) fprintf(stderr, "X: cannot stat %s (%s), aborting.\n", X_SERVER_SYMLINK, strerror(errno));
+ (void) fprintf(stderr, "X: cannot stat %s (%s), aborting.\n",
+ X_SERVER_SYMLINK, strerror(errno));
exit(1);
}
i = readlink(X_SERVER_SYMLINK, xserver, 1024);
if (i < 0) {
- (void) fprintf(stderr, "X: cannot read %s symbolic link (%s), aborting.\n", X_SERVER_SYMLINK, strerror(errno));
+ (void) fprintf(stderr, "X: cannot read %s symbolic link (%s), aborting.\n",
+ X_SERVER_SYMLINK, strerror(errno));
exit(1);
}
xserver[i] = '\0'; /* readlink() does not null-terminate the string */
- if ((strncmp(xserver, "/usr/bin/X11/X", 1024) == 0) || (strncmp(xserver, "/usr/X11R6/bin/X", 1024) == 0)) {
- (void) fprintf(stderr, "X: %s points back to X wrapper executable, aborting.\n", X_SERVER_SYMLINK);
+ if ((strncmp(xserver, "/usr/bin/X11/X", 1024) == 0) ||
+ (strncmp(xserver, "/usr/X11R6/bin/X", 1024) == 0)) {
+ (void) fprintf(stderr, "X: %s points back to X wrapper executable, "
+ "aborting.\n", X_SERVER_SYMLINK);
exit(1);
}
@@ -255,17 +263,20 @@
/* do paranoid checks on the directory where the X server creates its socket */
if (lstat(X_SOCKET_DIR, &statbuf)) {
- (void) fprintf(stderr, "X: cannot stat %s (%s), aborting.\n", X_SOCKET_DIR, strerror(errno));
+ (void) fprintf(stderr, "X: cannot stat %s (%s), aborting.\n",
+ X_SOCKET_DIR, strerror(errno));
exit(1);
}
if ((statbuf.st_uid != 0) || (statbuf.st_gid != 0)) {
- (void) fprintf(stderr, "X: %s has suspicious ownership (not root:root), aborting.\n", X_SOCKET_DIR);
+ (void) fprintf(stderr, "X: %s has suspicious ownership (not root:root), "
+ "aborting.\n", X_SOCKET_DIR);
exit(1);
}
if (statbuf.st_mode != (S_IFDIR | X_SOCKET_DIR_MODE)) {
- (void) fprintf(stderr, "X: %s has suspicious mode (not %o) or is not a directory, aborting.\n", X_SOCKET_DIR, X_SOCKET_DIR_MODE);
+ (void) fprintf(stderr, "X: %s has suspicious mode (not %o) or is not a "
+ "directory, aborting.\n", X_SOCKET_DIR, X_SOCKET_DIR_MODE);
exit(1);
}
@@ -274,7 +285,9 @@
/* do nothing if it doesn't exist -- no problem */
} else {
if (statbuf.st_mode != (S_IFDIR | X_DRI_DEVICE_DIR_MODE)) {
- (void) fprintf(stderr, "X: warning; %s has unusual mode (not %o) or is not a directory.\n", X_DRI_DEVICE_DIR, X_DRI_DEVICE_DIR_MODE);
+ (void) fprintf(stderr, "X: warning; %s has unusual mode (not %o) or "
+ "is not a directory.\n", X_DRI_DEVICE_DIR,
+ X_DRI_DEVICE_DIR_MODE);
}
}
@@ -286,7 +299,8 @@
}
} else if (strlen(argv[i]) > 256) {
if (setuid(getuid())) {
- perror("X unable to drop setuid privileges for suspiciously long argument");
+ perror("X unable to drop setuid privileges for suspiciously long "
+ "argument");
exit(1);
}
}
@@ -335,10 +349,12 @@
exit(1);
}
execv(xserver,argv);
- (void) fprintf(stderr, "X: unprivileged exec of %s failed, aborting.\n", xserver);
+ (void) fprintf(stderr, "X: unprivileged exec of %s failed, "
+ "aborting.\n", xserver);
exit(1);
} else {
- (void) fprintf(stderr, "X: user not authorized to run the X server, aborting.\n");
+ (void) fprintf(stderr, "X: user not authorized to run the X "
+ "server, aborting.\n");
exit(1);
}
}
Modified: branches/4.3.0/sid/debian/local/update-fonts-scale.8
==============================================================================
--- branches/4.3.0/sid/debian/local/update-fonts-scale.8 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/update-fonts-scale.8 2003-06-09 16:02:36 UTC (rev 166)
@@ -1,4 +1,4 @@
-.\" This manpage is copyright (C) 1999 Branden Robinson <branden@debian.org>.
+.\" This manpage is copyright 1999,2002 Branden Robinson <branden@debian.org>.
.\"
.\" This is free software; you can redistribute it and/or modify it under
.\" the terms of the GNU General Public License as published by the Free
@@ -13,31 +13,32 @@
.\" your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
.\" with the dpkg source package as the file COPYING. If not, write to the
.\" Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH update-fonts-scale 8 "10 November 1999" "Debian GNU/Linux"
+.TH update-fonts-scale 8 "2002\-11\-01" "Debian Project"
.SH NAME
-update-fonts-scale \- compile fonts.scale files
+update\-fonts\-scale \- compile fonts.scale files
.SH SYNOPSIS
-.B update-fonts-scale
+.B update\-fonts\-scale
.I directory ...
.SH DESCRIPTION
-.B update-fonts-scale
+.B update\-fonts\-scale
assembles a
.I fonts.scale
file in an X font directory using one or more scale files found in a
subdirectory of
.IR /etc/X11/fonts/ .
-It is typically invoked only from the post-installation and post-removal
+It is typically invoked only from the post\-installation and post\-removal
scripts of a
.I package
-containing scalable fonts (whose X LFD font names are not in the font files
-themselves) for the X Window System, but may be invoked at any time to
-reconstruct
+containing scalable fonts usable by the X Window System whose X LFD font
+names are not in the font files themselves, but may be invoked at any time
+to reconstruct
.I fonts.scale
files. For each
.IR directory ,
which is either an absolute path to an X font directory or (preferably)
-simply the last component of its path (such as "75dpi" or "misc"),
-.B update-fonts-scale
+simply the last component of its path (such as \(oq75dpi\(cq or
+\(oqmisc\(cq),
+.B update\-fonts\-scale
will assemble
.IR /usr/lib/X11/fonts/ directory /fonts.scale
from the files found in
@@ -49,17 +50,18 @@
file in the X font directory itself, so there is no danger of overwriting
one package's font names with those of another.
.PP
-For instance, the two packages "xfonts-scalable" (real) and "xfonts-nifty"
-(hypothetical) may both install fonts into the directory
+For instance, the two packages \(oqxfonts\-scalable\(cq (real) and
+\(oqxfonts\-nifty\(cq (hypothetical) may both install fonts into the
+directory
.IR /usr/lib/X11/fonts/Type1 .
They each place their
.I fonts.scale
files in
-.I /etc/X11/fonts/Type1/xfonts-scalable.scale
+.I /etc/X11/fonts/Type1/xfonts\-scalable.scale
and
-.I /etc/X11/fonts/Type1/xfonts-nifty.scale
+.I /etc/X11/fonts/Type1/xfonts\-nifty.scale
(respectively).
-.B update-fonts-scale
+.B update\-fonts\-scale
concatenates these two files (as well as any others that match
.IR /etc/X11/fonts/Type1/*.scale )
into
@@ -72,25 +74,64 @@
manual page.
.PP
An example of how to use
-.B update-fonts-scale
+.B update\-fonts\-scale
in package maintainer scripts is provided in the Debian Policy Manual.
-.SH SEE ALSO
-.BR mkfontdir (1x)
+.SH OPERANDS
+.B update\-fonts\-scale
+takes one or more X font directory names to operate on as operands. Only
+the final path component of the directory name should be specified; e.g.,
+.RS
+.B update-fonts-scale 75dpi
+.RE
+is correct, while
+.RB \(oq "update-fonts-scale /usr/X11R6/lib/X11/fonts/75dpi" \(cq
+and
+.RB \(oq "update-fonts-scale /usr/lib/X11/fonts/75dpi" \(cq
+are not.
.SH DIAGNOSTICS
-.B update-fonts-scale
-exits with status 1 if its arguments are absent or invalid.
+.SS Errors
+.TP
+.B error: one or more font directories must be provided
+.B update\-fonts\-scale
+was invoked without operands. Supply one or more X font directory names to
+operate on.
+.TP
+.B error: path to X font directory must be used
+A directory name was supplied that was not an X font directory name.
+Supply X font directory names only.
+.SS Warnings
+.TP
+.BI "warning: absolute path " directory " was provided"
+Usage of absolute paths is deprecated. Use only the final component of the
+X font directory name for
+.IR directory .
+.TP
+.BI "warning: " directory " does not exist or is not a directory"
+The supplied
+.I directory
+was invalid.
+.B update\-fonts\-scale
+skipped it.
+.SH "EXIT STATUS"
+.TP
+0
+.B update\-fonts\-scale
+ran successfully.
+.TP
+1
+.B update\-fonts\-scale
+experienced a fatal error; see the section on diagnostic messages above.
.SH BUGS
-See <http://bugs.debian.org/xbase-clients>. If you wish to
+See <http://bugs.debian.org/xbase\-clients>. If you wish to
report a bug in
-.BR update-fonts-scale ,
+.BR update\-fonts\-scale ,
please see
-.IR /usr/share/doc/debian/bug-reporting.txt ,
-the
-.BR bug (1)
-command, or the
+.I /usr/share/doc/debian/bug\-reporting.txt
+or the
.BR reportbug (1)
command.
.SH AUTHOR
-.B update-fonts-scale
-is written and copyrighted by Branden Robinson. It is licensed under the
-GNU GPL, version 2.
+.B update\-fonts\-scale
+was written by Branden Robinson for the Debian Project.
+.SH "SEE ALSO"
+.BR mkfontdir (1x)
Modified: branches/4.3.0/sid/debian/local/update-fonts-alias.8
==============================================================================
--- branches/4.3.0/sid/debian/local/update-fonts-alias.8 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/update-fonts-alias.8 2003-06-09 16:02:36 UTC (rev 166)
@@ -1,4 +1,4 @@
-.\" This manpage is copyright (C) 1999 Branden Robinson <branden@debian.org>.
+.\" This manpage is copyright 1999,2002 Branden Robinson <branden@debian.org>.
.\"
.\" This is free software; you can redistribute it and/or modify it under
.\" the terms of the GNU General Public License as published by the Free
@@ -13,30 +13,30 @@
.\" your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
.\" with the dpkg source package as the file COPYING. If not, write to the
.\" Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH update-fonts-alias 8 "10 November 1999" "Debian GNU/Linux"
+.TH update-fonts-alias 8 "2002\-11\-01" "Debian Project"
.SH NAME
-update-fonts-alias \- compile fonts.alias files
+update\-fonts\-alias \- compile fonts.alias files
.SH SYNOPSIS
-.B update-fonts-alias
+.B update\-fonts\-alias
.I directory ...
.SH DESCRIPTION
-.B update-fonts-alias
+.B update\-fonts\-alias
assembles a
.I fonts.alias
file in an X font directory using one or more alias files found in a
subdirectory of
.IR /etc/X11/fonts/ .
-It is typically invoked only from the post-installation and post-removal
+It is typically invoked only from the post\-installation and post\-removal
scripts of a
.I package
-containing fonts (that provide aliases for their names) for the X Window
-System, but may be invoked at any time to reconstruct
+containing X Window System fonts that provide aliases for their XLFD names,
+but may be invoked at any time to reconstruct
.I fonts.alias
files. For each
.IR directory ,
-which is either an absolute path to an X font directory or (preferably)
-simply the last component of its path (such as "75dpi" or "misc"),
-.B update-fonts-alias
+which is simply the last component of its path (such as \(oq75dpi\(cq or
+\(oqmisc\(cq),
+.B update\-fonts\-alias
will assemble
.IR /usr/lib/X11/fonts/ directory /fonts.alias
from the files found in
@@ -48,17 +48,17 @@
file in the X font directory itself, so there is no danger of overwriting
one package's aliases with those of another.
.PP
-For instance, the two packages "xfonts-base" and "xfonts-cjk" may both
-install fonts into the directory
+For instance, the two packages \(oqxfonts\-base\(cq and
+\(oqxfonts\-base\-transcoded\(cq may both install fonts into the directory
.IR /usr/lib/X11/fonts/misc .
They each place their
.I fonts.alias
files in
-.I /etc/X11/fonts/misc/xfonts-base.alias
+.I /etc/X11/fonts/misc/xfonts\-base.alias
and
-.I /etc/X11/fonts/misc/xfonts-cjk.alias
+.I /etc/X11/fonts/misc/xfonts\-base\-transcoded.alias
(respectively).
-.B update-fonts-alias
+.B update\-fonts\-alias
concatenates these two files (as well as any others that match
.IR /etc/X11/fonts/misc/*.alias )
into
@@ -71,25 +71,64 @@
manual page.
.PP
An example of how to use
-.B update-fonts-alias
+.B update\-fonts\-alias
in package maintainer scripts is provided in the Debian Policy Manual.
-.SH SEE ALSO
-.BR mkfontdir (1x)
+.SH OPERANDS
+.B update\-fonts\-alias
+takes one or more X font directory names to operate on as operands. Only
+the final path component of the directory name should be specified; e.g.,
+.RS
+.B update-fonts-alias 75dpi
+.RE
+is correct, while
+.RB \(oq "update-fonts-alias /usr/X11R6/lib/X11/fonts/75dpi" \(cq
+and
+.RB \(oq "update-fonts-alias /usr/lib/X11/fonts/75dpi" \(cq
+are not.
.SH DIAGNOSTICS
-.B update-fonts-alias
-exits with status 1 if its arguments are absent or invalid.
+.SS Errors
+.TP
+.B error: one or more font directories must be provided
+.B update\-fonts\-alias
+was invoked without operands. Supply one or more X font directory names to
+operate on.
+.TP
+.B error: path to X font directory must be used
+A directory name was supplied that was not an X font directory name.
+Supply X font directory names only.
+.SS Warnings
+.TP
+.BI "warning: absolute path " directory " was provided"
+Usage of absolute paths is deprecated. Use only the final component of the
+X font directory name for
+.IR directory .
+.TP
+.BI "warning: " directory " does not exist or is not a directory"
+The supplied
+.I directory
+was invalid.
+.B update\-fonts\-alias
+skipped it.
+.SH "EXIT STATUS"
+.TP
+0
+.B update\-fonts\-alias
+ran successfully.
+.TP
+1
+.B update\-fonts\-alias
+experienced a fatal error; see the section on diagnostic messages above.
.SH BUGS
-See <http://bugs.debian.org/xbase-clients>. If you wish to
+See <http://bugs.debian.org/xbase\-clients>. If you wish to
report a bug in
-.BR update-fonts-alias ,
+.BR update\-fonts\-alias ,
please see
-.IR /usr/share/doc/debian/bug-reporting.txt ,
-the
-.BR bug (1)
-command, or the
+.I /usr/share/doc/debian/bug\-reporting.txt
+or the
.BR reportbug (1)
command.
.SH AUTHOR
-.B update-fonts-alias
-is written and copyrighted by Branden Robinson. It is licensed under the
-GNU GPL, version 2.
+.B update\-fonts\-alias
+was written by Branden Robinson for the Debian Project.
+.SH "SEE ALSO"
+.BR mkfontdir (1x)
Modified: branches/4.3.0/sid/debian/local/xvfb-run.1
==============================================================================
--- branches/4.3.0/sid/debian/local/xvfb-run.1 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/xvfb-run.1 2003-06-09 16:02:36 UTC (rev 166)
@@ -15,11 +15,12 @@
.\" along with the Debian GNU/Linux system; if not, write to the Free
.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH xvfb\-run 1 "2002\-09\-19" "Debian GNU/Linux"
+.TH xvfb\-run 1 "2002\-10\-24" "Debian Project"
.SH NAME
xvfb\-run \- run specified X client or command in a virtual X server environment
.SH SYNOPSIS
-xvfb\-run [
+.B xvfb\-run
+[
.I options
]
.I command
@@ -61,11 +62,11 @@
command to function.
.SH OPTIONS
.TP
-.B \-a, \-\-auto\-servernum
+.B \-a\fR,\fB \-\-auto\-servernum
Try to get a free server number, starting at 99, or the argument to
.BR \-\-server\-num .
.TP
-.BI \-e\ file ,\ \-\-error\-file= file
+.BI \-e\ file \fR,\fB\ \-\-error\-file= file
Store output from
.B xauth
and
@@ -75,34 +76,34 @@
If not set, output is sent to
.IR /dev/null .
.TP
-.BI \-f\ file ,\ \-\-auth\-file= file
+.BI \-f\ file \fR,\fB\ \-\-auth\-file= file
Store X authentication data in
.IR file .
By default, a file named
.I .Xauthority
in the current working directory is used.
.TP
-.B \-h, \-\-help
+.B \-h\fR,\fB \-\-help
Display a usage message and exit.
.TP
-.BI \-n\ servernumber ,\ \-\-server\-num= servernumber
+.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber
Use
.I servernumber
as the server number (but see the
-.B \-a, \-\-auto\-servernum
+.B \-a\fR,\fB \-\-auto\-servernum
option above). This value defaults to 99.
.TP
-.B \-l, \-\-listen\-tcp
+.B \-l\fR,\fB \-\-listen\-tcp
Enable TCP port listening in the X server.
.TP
-.BI \-p\ protocolname ,\ \-\-xauth\-protocol= protocolname
+.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
Use
.I protocolname
as the X authority protocol to use. This defaults to \(oq.\(cq, which
.B xauth
interprets as its own default protocol, which is MIT-MAGIC-COOKIE-1.
.TP
-.BI \-s\ arguments ,\ \-\-server\-args= arguments
+.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments
Pass
.I arguments
to the
@@ -117,25 +118,25 @@
may override the function of
.BR xvfb-run 's
own
-.B \-l, \-\-listen\-tcp
+.B \-l\fR,\fB \-\-listen\-tcp
option, and that specification of the server number (e.g., \(oq:1\(cq) may
be ignored because of the way the X server parses its argument list. Use
the
.B xvfb-run
option
-.BI \-n\ servernumber ,\ \-\-server\-num= servernumber
+.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber
to achieve the latter function. Defaults to \(oq\-screen 0 640x480x8\(cq.
.TP
-.BI \-w\ delay ,\ \-\-wait= delay
+.BI \-w\ delay \fR,\fB\ \-\-wait= delay
Wait
.I delay
seconds after launching
.B Xvfb
before attempting to start the specified command. Defaults to 3.
-.SH ENVIRONMENT
-None.
-.SH INPUT FILES
-None.
+'\" .SH ENVIRONMENT
+'\" None.
+'\" .SH INPUT FILES
+'\" None.
.SH OUTPUT FILES
.TP
.I .Xauthority
Modified: branches/4.3.0/sid/debian/local/Xsession.5
==============================================================================
--- branches/4.3.0/sid/debian/local/Xsession.5 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/Xsession.5 2003-06-09 16:02:36 UTC (rev 166)
@@ -250,19 +250,25 @@
.B message
is used for communicating with the user. It may be given an arbitrarily
long message string. It is formatted to the user's terminal width
-(breaking lines at whitespace) and sent to standard error.
+(breaking lines at whitespace) and sent to standard error. If the
+.I DISPLAY
+environment variable is set and the
+.BR xmessage (1x)
+program is available, in which case
+.B xmessage
+is also used to display the message.
.PP
.B message_nonl
is used for communicating with the user when a trailing newline is
-undesirable. It may be given an arbitrarily long message string. It is
-formatted to the user's terminal width (breaking lines at whitespace) and
-sent to standard error.
+undesirable; it omits a trailing newling from the message text. It
+otherwise works as
+.BR message .
.PP
.B errormsg
-is used for indicating an error condition and aborting the script. It can
-be used as
-.B message
-above. After displaying the message to standard error, it will exit
+is used for indicating an error condition and aborting the script. It
+works as
+.BR message ,
+above, except that after displaying the message, it will exit
.I Xsession
with status 1.
.SH ENVIRONMENT
@@ -347,6 +353,7 @@
.BR startx (1x),
.BR tempfile (1),
.BR xdm (1x),
+.BR xmessage (1x),
.BR xmodmap (1x),
.BR xrdb (1x),
.BR sh (1)
Modified: branches/4.3.0/sid/debian/local/update-fonts-dir
==============================================================================
--- branches/4.3.0/sid/debian/local/update-fonts-dir 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/update-fonts-dir 2003-06-09 16:02:36 UTC (rev 166)
@@ -2,15 +2,29 @@
# update-fonts-dir
# compiles fonts.dir files for X font directories
# see mkfontdir(1) for a description of the format of fonts.dir files
-# Copyright 1999, 2001 Branden Robinson.
+# Copyright 1999,2001,2002 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+PROGNAME=$(basename "$0")
ENCDIR=/usr/X11R6/lib/X11/fonts/encodings
+# display a message, wrapping lines at the terminal width
+message () {
+ echo "$PROGNAME: $*" | fold -s -w ${COLUMNS:-80};
+}
+
+warn () {
+ echo "$(message "warning: $*")" >&2;
+}
+
+error () {
+ echo "$(message "error: $*")" >&2
+ exit 1;
+}
+
if [ $# -eq 0 ]; then
- echo "$0: one or more font directories must be provided." >&2
- exit 1
+ error "one or more font directories must be provided"
fi
while [ -n "$1" ]; do
@@ -18,7 +32,13 @@
if expr "$1" : "/.*" > /dev/null 2>&1; then
# absolute path to X font directory was provided
XDIR=$1
- echo "$0: warning: absolute path $XDIR was provided." >&2
+ ETCDIR=/etc/X11/fonts/$(basename $XDIR)
+ if [ "$XDIR" = "$ETCDIR" ]; then
+ # they gave us an /etc directory as the argument
+ error "path to X font directory must be used"
+ else
+ warn "absolute path $XDIR was provided"
+ fi
else
# assume they just gave us the basename
XDIR=/usr/lib/X11/fonts/$1
@@ -26,7 +46,7 @@
# confirm that the directories to be operated on exist
VALID=yes
if [ ! -d $XDIR ]; then
- echo "$0: warning: $XDIR does not exist or is not a directory." >&2
+ warn "$XDIR does not exist or is not a directory"
VALID=
fi
if [ -n "$VALID" ]; then
@@ -36,7 +56,7 @@
/usr/bin/X11/mkfontdir $XDIR
fi
# are there any fonts in the font dir?
- if [ "$(head -1 $XDIR/fonts.dir)" = "0" ]; then
+ if [ "$(head -n 1 $XDIR/fonts.dir)" = "0" ]; then
rm -f $XDIR/fonts.dir $XDIR/encodings.dir
# remove the font dir if it is empty
rmdir $XDIR > /dev/null 2>&1 || true
Modified: branches/4.3.0/sid/debian/local/update-fonts-scale
==============================================================================
--- branches/4.3.0/sid/debian/local/update-fonts-scale 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/update-fonts-scale 2003-06-09 16:02:36 UTC (rev 166)
@@ -2,13 +2,28 @@
# update-fonts-scale
# compiles fonts.scale files for X font directories
# see mkfontdir(1) for a description of the format of fonts.scale files
-# Copyright 1999, 2001 Branden Robinson.
+# Copyright 1999,2001,2002 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+PROGNAME=$(basename "$0")
+
+# display a message, wrapping lines at the terminal width
+message () {
+ echo "$PROGNAME: $*" | fold -s -w ${COLUMNS:-80};
+}
+
+warn () {
+ echo "$(message "warning: $*")" >&2;
+}
+
+error () {
+ echo "$(message "error: $*")" >&2
+ exit 1;
+}
+
if [ $# -eq 0 ]; then
- echo "$0: one or more font directories must be provided." >&2
- exit 1
+ error "one or more font directories must be provided"
fi
while [ -n "$1" ]; do
@@ -19,10 +34,9 @@
ETCDIR=/etc/X11/fonts/$(basename $XDIR)
if [ "$XDIR" = "$ETCDIR" ]; then
# they gave us an /etc directory as the argument
- echo "$0: path to X font directory must be used." >&2
- exit 1
+ error "path to X font directory must be used"
else
- echo "$0: warning: absolute path $XDIR was provided." >&2
+ warn "absolute path $XDIR was provided"
fi
else
# assume they just gave us the basename
@@ -33,7 +47,7 @@
for DIR in $XDIR $ETCDIR; do
VALID=yes
if [ ! -d $DIR ]; then
- echo "$0: warning: $DIR does not exist or is not a directory." >&2
+ warn "$DIR does not exist or is not a directory"
VALID=
fi
done
@@ -41,8 +55,17 @@
# are there any files to process?
if [ "$(echo $ETCDIR/*.scale)" != "$ETCDIR/*.scale" ]; then
for file in $ETCDIR/*.scale; do
- # omit count at top of file
- tail +2 $file >> $XDIR/fonts.scale.update-tmp
+ # only write fonts to the .scale file that actually exist, so that
+ # removed-but-not-purged scalable font packages do not register
+ # nonexistent fonts; this has the desirable side effect that the count
+ # at the top of the file is also omitted
+ # XXX: this technique will be tricked into yielding false negatives if
+ # the font filename has whitespace in it
+ while read FILENAME FONTNAME; do
+ if [ -f "$XDIR/$FILENAME" ]; then
+ echo "$FILENAME $FONTNAME" >> $XDIR/fonts.scale.update-tmp
+ fi
+ done < $file
done
# write new scale file in case we are interrupted
# write new count to top of file
Modified: branches/4.3.0/sid/debian/local/update-fonts-alias
==============================================================================
--- branches/4.3.0/sid/debian/local/update-fonts-alias 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/update-fonts-alias 2003-06-09 16:02:36 UTC (rev 166)
@@ -2,13 +2,28 @@
# update-fonts-alias
# compiles fonts.alias files for X font directories
# see mkfontdir(1) for a description of the format of fonts.alias files
-# Copyright 1999, 2001 Branden Robinson.
+# Copyright 1999,2001,2002 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+PROGNAME=$(basename "$0")
+
+# display a message, wrapping lines at the terminal width
+message () {
+ echo "$PROGNAME: $*" | fold -s -w ${COLUMNS:-80};
+}
+
+warn () {
+ echo "$(message "warning: $*")" >&2;
+}
+
+error () {
+ echo "$(message "error: $*")" >&2
+ exit 1;
+}
+
if [ $# -eq 0 ]; then
- echo "$0: one or more font directories must be provided." >&2
- exit 1
+ error "one or more font directories must be provided"
fi
while [ -n "$1" ]; do
@@ -19,10 +34,9 @@
ETCDIR=/etc/X11/fonts/$(basename $XDIR)
if [ "$XDIR" = "$ETCDIR" ]; then
# they gave us an /etc directory as the argument
- echo "$0: path to X font directory must be used." >&2
- exit 1
+ error "path to X font directory must be used"
else
- echo "$0: warning: absolute path $XDIR was provided." >&2
+ warn "absolute path $XDIR was provided"
fi
else
# assume they just gave us the basename
@@ -33,7 +47,7 @@
for DIR in $XDIR $ETCDIR; do
VALID=yes
if [ ! -d $DIR ]; then
- echo "$0: warning: $DIR does not exist or is not a directory." >&2
+ warn "$DIR does not exist or is not a directory"
VALID=
fi
done
Modified: branches/4.3.0/sid/debian/local/FAQ
==============================================================================
--- branches/4.3.0/sid/debian/local/FAQ 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/FAQ 2003-06-09 16:02:36 UTC (rev 166)
@@ -71,6 +71,8 @@
module; what's going on?
*) I'm using a Macintosh, and while the keyboard works correctly on a virtual
terminal, in X it's all messed up. What's the matter?
+*) Why do some programs give authorization errors even when they are
+ running as the same user and on the same machine as the X server?
GENERAL QUESTIONS
@@ -1405,6 +1407,43 @@
For more information on this issue, see
<URL:http://www.debian.org/ports/powerpc/keycodes>.
-Branden Robinson, 4 March 2003
+*) Why do some programs give authorization errors even when they are
+ running as the same user and on the same machine as the X server?
+ [This entry was written by Matthew Arnison <maffew@cat.org.au>.]
+
+ Particular programs seem to be quite sensitive to the security setup in X.
+ I think it is when they use PostScript rendering.
+
+ For LyX, the symptoms are that EPS figures do not render (they show up blank)
+ and the terminal window you launched LyX from will give a lot of errors like:
+
+ Xlib: connection to ":0.0" refused by server
+ Xlib: Client is not authorized to connect to Server
+
+ I have also had problems with Mathematica 4.x refusing to start at all, with
+ similar error messages. Running "xhost + localhost" works as a brute force
+ solution for mathematica, but that sacrifices a lot of security.
+
+ The problem is that xauth and startx seem to get confused with old
+ cookies, especially if you have changed your machine's hostname or IP
+ address. In addition, startx does not have a systematic way of cleaning
+ out stale authorisation cookies from your ~/.Xauthority. After you quit X,
+ it cleans cookies that it created, but that leaves cookies uncleaned if
+ your computer crashes while X is running.
+
+ So this is what worked for me:
+
+ + quit X to the console
+
+ + mv ~/.Xauthority ~/.Xauthority.stale
+
+ + startx
+
+ If startx does not find a ~/.Xauthority, it will make a fresh one.
+
+ I'm not sure how xdm handles ~/.Xauthority. Perhaps it does a better job.
+
+Branden Robinson, 10 March 2003
+
vim:ai:et:sts=2:sw=2:tw=78:
Modified: branches/4.3.0/sid/debian/local/Xsession
==============================================================================
--- branches/4.3.0/sid/debian/local/Xsession 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/local/Xsession 2003-06-09 16:02:36 UTC (rev 166)
@@ -6,37 +6,53 @@
set -e
+PROGNAME=Xsession
+
message () {
- # pretty-print messages of arbitrary length
- echo "$*" | fold -s -w ${COLUMNS:-80} >&2;
+ # pretty-print messages of arbitrary length; use xmessage if it
+ # is available and $DISPLAY is set
+ MESSAGE="$PROGNAME: $*"
+ echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2
+ if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
+ echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
+ fi
}
message_nonl () {
- # pretty-print messages of arbitrary length (no trailing newline)
- echo -n "$*" | fold -s -w ${COLUMNS:-80} >&2;
+ # pretty-print messages of arbitrary length (no trailing newline); use
+ # xmessage if it is available and $DISPLAY is set
+ MESSAGE="$PROGNAME: $*"
+ echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
+ if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
+ echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
+ fi
}
errormsg () {
# exit script with error
message "$*"
- exit 1;
+ exit 1
}
internal_errormsg () {
# exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message
- message "$*"
- message "Please report the package name, version, and the text of the" \
- "above error message(s) to <debian-x@lists.debian.org>.";
- exit 1;
+ # One big call to message() for the sake of xmessage; if we had two then
+ # the user would have dismissed the error we want reported before seeing the
+ # request to report it.
+ errormsg "$*" \
+ "Please report the installed version of the \"xfree86-common\"" \
+ "package and the complete text of this error message to" \
+ "<debian-x@lists.debian.org>."
}
run_parts () {
# until run-parts --noexec is implemented
if [ -z "$1" ]; then
- internal_errormsg "internal run_parts called without an argument"
+ internal_errormsg "run_parts() called without an argument."
fi
if [ ! -d "$1" ]; then
- internal_errormsg "internal run_parts called, but $1 does not exist or is not a directory."
+ internal_errormsg "run_parts() called, but \"$1\" does not exist or is" \
+ "not a directory."
fi
for F in $(ls $1); do
if expr "$F" : '[[:alnum:]_-]\+$' > /dev/null 2>&1; then
@@ -44,7 +60,7 @@
echo "$1/$F"
fi
fi
- done;
+ done
}
# initialize variables for use by all session scripts
@@ -64,18 +80,19 @@
chmod 600 "$ERRFILE"
elif ERRFILE=$(tempfile 2> /dev/null); then
if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-$USER"; then
- message "Xsession: unable to symlink \"$TMPDIR/xsession-$USER\" to" \
- "\"$ERRFILE\"."
+ message "warning: unable to symlink \"$TMPDIR/xsession-$USER\" to" \
+ "\"$ERRFILE\"; look for session log/errors in" \
+ "\"$TMPDIR/xsession-$USER\"."
fi
else
- errormsg "Xsession: unable to create X session log/error file. Aborting."
+ errormsg "unable to create X session log/error file; aborting."
fi
exec > "$ERRFILE" 2>&1
# sanity check; is our session script directory present?
if [ ! -d "$SYSSESSIONDIR" ]; then
- errormsg "Xsession: no $SYSSESSIONDIR directory found. Aborting." >&2
+ errormsg "no \"$SYSSESSIONDIR\" directory found; aborting."
fi
# use run-parts to source every file in the session directory; we source
Modified: branches/4.3.0/sid/debian/xfs.prerm.in
==============================================================================
--- branches/4.3.0/sid/debian/xfs.prerm.in 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/xfs.prerm.in 2003-06-09 16:02:36 UTC (rev 166)
@@ -28,7 +28,7 @@
fi
if [ -n "$STOP" ]; then
- /etc/init.d/xfs stop || true
+ invoke-rc.d xfs stop || true
else
touch /var/run/xfs.upgrade
fi
Modified: branches/4.3.0/sid/debian/rules
==============================================================================
--- branches/4.3.0/sid/debian/rules 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/rules 2003-06-09 16:02:36 UTC (rev 166)
@@ -59,7 +59,8 @@
# XXX: xc/config/cf/* needs some fairly serious hacking to support this in a
# way that David Dawes will accept upstream, so for the time being, this isn't
-# used, even though it's referenced below.
+# used (the DebianGccOptimizeOpt symbol is not referenced anywhere in the
+# source tree), even though this variable is expanded below.
DEBUGFLAGS:=-DDebianGccOptimizeOpt='-O0'
# Set some Imake variables for the regular and server-debugging builds.
@@ -106,6 +107,12 @@
endif
endif
+# *grumble* GCC 3.3 at -O2 is garbage on several architectures; XXX: this would
+# potentially override $(DEBUGFLAGS) if it were actually meaningful; see above
+#ifneq (,$(findstring $(ARCH),arm powerpc))
+IMAKE_DEFINES+=-DDefaultGcc2OptimizeOpt=-O
+#endif
+
# Read in important variables.
include debian/scripts/vars
# Read in architecture-specific variables of importance.
@@ -276,7 +283,7 @@
debian/tmp/usr/X11R6/bin/XFree86-debug
mkdir -p $(DEBTREEDIR)/etc/X11/cursors
install -m 644 debian/local/cursors/*.theme $(DEBTREEDIR)/etc/X11/cursors
-
+
# Create the xlibmesa-drm-src package.
mkdir $(DEBTREEDIR)/usr/src
mkdir -p $(DRM_DST_DIR)
@@ -354,31 +361,6 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
-# #dh_movefiles is not idempotent
-# for PACKAGE in $$(dh_listpackages); do \
-# for FILELIST in debian/$$PACKAGE.files; do \
-# if [ -f $$FILELIST.$(ARCH) ]; then \
-# FILELIST=$$FILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$FILELIST ]; then \
-# for FILE in $$(cat $$FILELIST); do \
-# if [ -L $(DEBTREEDIR)/$$FILE ]; then \
-# echo $$FILE is a symlink pointing to $$(readlink $$FILE)\; put it in $$PACKAGE.links instead >&2; \
-# exit 1; \
-# fi; \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$FILE); \
-# cp -f $(DEBTREEDIR)/$$FILE debian/$$PACKAGE/$$FILE; \
-# done; \
-# fi; \
-# done; \
-# done
-# # copy debugging targets so they don't get stripped
-# for PACKAGE in $$(dh_listpackages); do \
-# if [ -f $$PACKAGE.debugfiles ]; then \
-# echo $$PACKAGE has a debug file list but is an architecture-independent package\; this makes no sense. Please fix. >&2; \
-# exit 1; \
-# fi; \
-# done
dh_installdebconf
dh_installdirs
# copy the fonts.{alias,scale} files into /etc
@@ -393,33 +375,12 @@
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
dh_installinit --noscripts
-# dh_installcron
-# dh_installmanpages
-# dh_installinfo
dh_installchangelogs
-# # dh_link isn't idempotent for symlinks to directories
-# for PACKAGE in $$(dh_listpackages); do \
-# for LINKSLIST in debian/$$PACKAGE.links; do \
-# if [ -f $$LINKSLIST.$(ARCH) ]; then \
-# LINKSLIST=$$LINKSLIST.$(ARCH); \
-# fi; \
-# if [ -f $$LINKSLIST ]; then \
-# cat $$LINKSLIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# rm -f debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_link
dh_compress
dh_fixperms
dh_installdeb
-# dh_perl
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -432,38 +393,6 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
-# #dh_movefiles is not idempotent
-# for PACKAGE in $$(dh_listpackages); do \
-# for FILELIST in debian/$$PACKAGE.files; do \
-# if [ -f $$FILELIST.$(ARCH) ]; then \
-# FILELIST=$$FILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$FILELIST ]; then \
-# for FILE in $$(cat $$FILELIST); do \
-# if [ -L $(DEBTREEDIR)/$$FILE ]; then \
-# echo $$FILE is a symlink pointing to $$(readlink $$FILE)\; put it in $$PACKAGE.links instead >&2; \
-# exit 1; \
-# fi; \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$FILE); \
-# cp -f $(DEBTREEDIR)/$$FILE debian/$$PACKAGE/$$FILE; \
-# done; \
-# fi; \
-# done; \
-# done
-# # copy debugging targets so they don't get stripped
-# for PACKAGE in $$(dh_listpackages); do \
-# for DEBUGFILELIST in debian/$$PACKAGE.debugfiles; do \
-# if [ -f $$DEBUGFILELIST.$(ARCH) ]; then \
-# DEBUGFILELIST=$$DEBUGFILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$DEBUGFILELIST ]; then \
-# cat $$DEBUGFILELIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# cp -f $(DEBTREEDIR)/$$SOURCE debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_installdebconf
dh_installdirs
dh_installdocs
@@ -476,14 +405,8 @@
endif
dh_installexamples
dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
dh_installpam
-# dh_installmime
dh_installinit --noscripts
-# dh_installcron
-# dh_installmanpages
-# dh_installinfo
dh_installchangelogs
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip -Nlibdps1-dbg -Nlibxaw6-dbg -Nlibxaw7-dbg -Nxlibmesa3-dbg \
@@ -492,21 +415,6 @@
xargs --no-run-if-empty \
strip --strip-debug --remove-section=.note --remove-section=.comment
endif
-# # dh_link isn't idempotent for symlinks to directories; clean up the
-# # symlinks so dh_link can run without error
-# for PACKAGE in $$(dh_listpackages); do \
-# for LINKSLIST in debian/$$PACKAGE.links; do \
-# if [ -f $$LINKSLIST.$(ARCH) ]; then \
-# LINKSLIST=$$LINKSLIST.$(ARCH); \
-# fi; \
-# if [ -f $$LINKSLIST ]; then \
-# cat $$LINKSLIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# rm -f debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_link
dh_compress
dh_fixperms
@@ -517,8 +425,6 @@
chown :utmp debian/xterm/usr/X11R6/bin/xterm
chmod g+s debian/xterm/usr/X11R6/bin/xterm
dh_installdeb
-# dh_makeshlibs
-# dh_perl
dh_shlibdeps -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -Nxlibs --exclude=usr/X11R6/lib/modules
# xlibs needs to be given a special shlibs file so that dpkg-shlibdeps
# doesn't try to make it depend on itself
@@ -617,38 +523,6 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
-# #dh_movefiles is not idempotent
-# for PACKAGE in $$(dh_listpackages); do \
-# for FILELIST in debian/$$PACKAGE.files; do \
-# if [ -f $$FILELIST.$(ARCH) ]; then \
-# FILELIST=$$FILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$FILELIST ]; then \
-# for FILE in $$(cat $$FILELIST); do \
-# if [ -L $(DEBTREEDIR)/$$FILE ]; then \
-# echo $$FILE is a symlink pointing to $$(readlink $$FILE)\; put it in $$PACKAGE.links instead >&2; \
-# exit 1; \
-# fi; \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$FILE); \
-# cp -f $(DEBTREEDIR)/$$FILE debian/$$PACKAGE/$$FILE; \
-# done; \
-# fi; \
-# done; \
-# done
-# # copy debugging targets so they don't get stripped
-# for PACKAGE in $$(dh_listpackages); do \
-# for DEBUGFILELIST in debian/$$PACKAGE.debugfiles; do \
-# if [ -f $$DEBUGFILELIST.$(ARCH) ]; then \
-# DEBUGFILELIST=$$DEBUGFILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$DEBUGFILELIST ]; then \
-# cat $$DEBUGFILELIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# cp -f $(DEBTREEDIR)/$$SOURCE debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_installdebconf
dh_installdirs
dh_installdocs
@@ -658,15 +532,7 @@
install -m 755 -d debian/xserver-xfree86-dbg/usr/share/bug
install -m 755 debian/xserver-xfree86.bug debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-dbg
dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
dh_installinit --noscripts
-# dh_installcron
-# dh_installmanpages
-# dh_installinfo
dh_installchangelogs
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip -Nxserver-xfree86-dbg
@@ -674,28 +540,10 @@
xargs --no-run-if-empty \
strip --strip-debug --remove-section=.note --remove-section=.comment
endif
-# # dh_link isn't idempotent for symlinks to directories; clean up the
-# # symlinks so dh_link can run without error
-# for PACKAGE in $$(dh_listpackages); do \
-# for LINKSLIST in debian/$$PACKAGE.links; do \
-# if [ -f $$LINKSLIST.$(ARCH) ]; then \
-# LINKSLIST=$$LINKSLIST.$(ARCH); \
-# fi; \
-# if [ -f $$LINKSLIST ]; then \
-# cat $$LINKSLIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# rm -f debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_link
dh_compress
dh_fixperms
-# dh_suidregister
dh_installdeb
-# dh_makeshlibs
-# dh_perl
dh_shlibdeps -l$(DEBTREEDIR)/usr/X11R6/lib --exclude=usr/X11R6/lib/modules
dh_gencontrol
dh_md5sums
Modified: branches/4.3.0/sid/debian/xfree86-common.postinst.in
==============================================================================
--- branches/4.3.0/sid/debian/xfree86-common.postinst.in 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/xfree86-common.postinst.in 2003-06-09 16:02:36 UTC (rev 166)
@@ -51,7 +51,7 @@
#DEBHELPER#
-/etc/init.d/$THIS_PACKAGE start || true
+invoke-rc.d $THIS_PACKAGE start || true
exit 0
Modified: branches/4.3.0/sid/debian/xdm.postinst.in
==============================================================================
--- branches/4.3.0/sid/debian/xdm.postinst.in 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/xdm.postinst.in 2003-06-09 16:02:36 UTC (rev 166)
@@ -83,7 +83,7 @@
update-rc.d xdm defaults 99 01
fi
-[ -n "$NOSTART" ] || /etc/init.d/xdm start || true
+[ -n "$NOSTART" ] || invoke-rc.d xdm start || true
#DEBHELPER#
Modified: branches/4.3.0/sid/debian/xserver-xfree86.config.in
==============================================================================
--- branches/4.3.0/sid/debian/xserver-xfree86.config.in 2003-06-09 10:33:51 UTC (rev 165)
+++ branches/4.3.0/sid/debian/xserver-xfree86.config.in 2003-06-09 16:02:36 UTC (rev 166)
@@ -300,6 +300,16 @@
db_set xserver-xfree86/config/modules "$SELECTED_MODULES"
fi
+# migrate from ATI driver sub-modules to ATI driver
+db_get xserver-xfree86/config/device/driver
+case "$RET" in
+ atimisc|r128|radeon)
+ db_set xserver-xfree86/config/device/driver "ati"
+ ;;
+ *)
+ ;;
+esac
+
debug_echo "Configuring $THIS_PACKAGE..."
# default X server
@@ -484,7 +494,9 @@
debug_echo "could not autodetect X server driver: discover not found"
fi
-DRIVER_LIST="$(echo $(find /usr/X11R6/lib/modules/drivers -name '*_drv.o' 2> /dev/null | sed 's|^.*/\(.*\)_drv\.o|\1|' | sort) | sed 's/ /, /g')"
+# build list of available video drivers, omitting the atimisc, r128, and radeon
+# sub-modules (the ati driver knows to load these)
+DRIVER_LIST="$(echo $(find /usr/X11R6/lib/modules/drivers -name '*_drv.o' 2> /dev/null | sed 's|^.*/\(.*\)_drv\.o|\1|' | egrep -v '(atimisc|r128|radeon)' | sort) | sed 's/ /, /g')"
if [ -z "$DRIVER_LIST" ]; then
debug_echo "No modules found in module directory; falling back to hard-coded list for $ARCH."
@@ -565,7 +577,7 @@
fi
if which lspci > /dev/null 2>&1; then
# try to guess the correct BusID
- VIDEO_CARD=$(LC_ALL=C lspci -n | grep "Class 0300:" | head -1 | cut -d\ -f1)
+ VIDEO_CARD=$(LC_ALL=C lspci -n | grep "Class 0300:" | head -n 1 | cut -d\ -f1)
if [ -n "$VIDEO_CARD" ]; then
# we now have an entry in "hex:hex.hex" format, need "PCI:decimal:decimal:decimal"
BUS=$(printf "%d" 0x$(echo $VIDEO_CARD | cut -d: -f1) )
@@ -693,8 +705,8 @@
set -e
if [ -n "$MDETECT_OUTPUT" ]; then
PRIORITY=low
- AUTODETECTED_PORT=$(echo "$MDETECT_OUTPUT" | head -1)
- AUTODETECTED_PROTOCOL=$(echo "$MDETECT_OUTPUT" | tail -1)
+ AUTODETECTED_PORT=$(echo "$MDETECT_OUTPUT" | head -n 1)
+ AUTODETECTED_PROTOCOL=$(echo "$MDETECT_OUTPUT" | tail -n 1)
debug_echo "mdetect returned port \"$AUTODETECTED_PORT\"; protocol \"$AUTODETECTED_PROTOCOL\""
if [ -n "$AUTODETECTED_PORT" ]; then
# /dev/input/mouse* means we autodetected a USB pointer; we will
Reply to: