X Strike Force X.Org X11 SVN commit: r163 - in trunk/debian: . local
Author: branden
Date: 2005-06-09 15:24:15 -0500 (Thu, 09 Jun 2005)
New Revision: 163
Modified:
trunk/debian/TODO
trunk/debian/local/FAQ.xhtml
trunk/debian/local/dexconf
trunk/debian/local/dexconf.1
trunk/debian/rules
Log:
Fix terminology. Xorg is the name of an X server. X.Org is the name of an
organization. "XOrg" appears to just be a Wiki-ism that doesn't "really
exist".
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-06-09 20:03:32 UTC (rev 162)
+++ trunk/debian/TODO 2005-06-09 20:24:15 UTC (rev 163)
@@ -328,6 +328,6 @@
* Burn xserver debconfage to the ground, redesign and reimplement, taking into
account the many lessons of the past 5 years (and hopefully leveraging the new
- "autoconfiguration" code in the XOrg X server).
+ "autoconfiguration" code in the Xorg X server).
# vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/local/FAQ.xhtml
===================================================================
--- trunk/debian/local/FAQ.xhtml 2005-06-09 20:03:32 UTC (rev 162)
+++ trunk/debian/local/FAQ.xhtml 2005-06-09 20:24:15 UTC (rev 163)
@@ -679,7 +679,7 @@
<p>With these changes, it will also be easier for the Debian user community to
have a broader choice in X servers. At present, the Debian XFree86 package
-maintainers intend to support only the XOrg X server (which is based on
+maintainers intend to support only the Xorg X server (which is based on
XFree86's). The X Strike Force does not plan to discourage other people from
packaging others. Debian developers that file intent-to-package notices (ITPs)
for other X servers are asked to strictly cooperate with the X Strike Force to
@@ -1365,7 +1365,7 @@
<p>The above <code class="command">xmodmap</code>-based approach for setting up
a left-handed mouse only works for the XFree86 3.<em>x</em> series. It results
-in bad behavior when used with the XFree86 4.<em>x</em> series and XOrg
+in bad behavior when used with the XFree86 4.<em>x</em> series and X.Org
X11R6.7.0 and later. If you are using one of these more recent versions of the
X Window System, use the <code class="command">gpm</code>-based approach,
described below.</p>
Modified: trunk/debian/local/dexconf
===================================================================
--- trunk/debian/local/dexconf 2005-06-09 20:03:32 UTC (rev 162)
+++ trunk/debian/local/dexconf 2005-06-09 20:24:15 UTC (rev 163)
@@ -36,7 +36,7 @@
usage () {
cat <<EOF
Usage: $PROGNAME [OPTION ...]
-Write an XFree86 or XOrg X server configuration file based on debconf database
+Write an XFree86 or Xorg X server configuration file based on debconf database
values.
Options:
-h, --help display this usage message and exit
@@ -167,7 +167,7 @@
;;
xserver-xorg|xserver-xorg-dbg)
: ${CONFIGFILE:=/etc/X11/xorg.conf}
- SERVERNAME=XOrg
+ SERVERNAME=Xorg
;;
*)
bomb "this program does not know how to configure the \"$XSERVERPKG\" X" \
@@ -200,7 +200,7 @@
bomb "creation of temporary work directory \"$TDIR\" failed"
fi
-# The following section names are recognized by the XFree86 4.x and XOrg X
+# The following section names are recognized by the XFree86 4.x and Xorg X
# servers:
# Files File pathnames
# ServerFlags Server flags NOT USED BY DEXCONF
Modified: trunk/debian/local/dexconf.1
===================================================================
--- trunk/debian/local/dexconf.1 2005-06-09 20:03:32 UTC (rev 162)
+++ trunk/debian/local/dexconf.1 2005-06-09 20:24:15 UTC (rev 163)
@@ -28,7 +28,7 @@
.if \n[.g] .mso www.tmac
.TH dexconf 1 "2005\-06\-09" "Debian Project"
.SH NAME
-dexconf \- generate XOrg or XFree86 X server configuration file from debconf data
+dexconf \- generate Xorg or XFree86 X server configuration file from debconf data
.SH SYNOPSIS
.B dexconf
[
@@ -44,7 +44,7 @@
.I XF86Config\-4
file.
The former is used by the
-.BR XOrg (1x)
+.BR Xorg (1x)
X server, and the latter by the
.BR XFree86 (1x)
X server (version 4.0 and later).
@@ -69,7 +69,7 @@
province of
.BR xorgcfg (1x)
(for
-.BR XOrg )
+.BR Xorg )
and
.BR xf86cfg (1x)
(for
@@ -82,7 +82,7 @@
files can use
.B dexconf
to generate the
-.B XOrg
+.B Xorg
and
.B XFree86
X server configuration file with a minimal amount of detailed knowledge of their
@@ -138,7 +138,7 @@
.TP
.I /etc/X11/xorg.conf
is the configuration file for the
-.B XOrg
+.B Xorg
X server.
.SH DIAGNOSTICS
.B dexconf
@@ -225,7 +225,7 @@
.BI "this program does not know how to configure the " package " X server"
.B dexconf
only knows how to write configuration files for the
-.B XOrg
+.B Xorg
and
.B XFree86
(version
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-06-09 20:03:32 UTC (rev 162)
+++ trunk/debian/rules 2005-06-09 20:24:15 UTC (rev 163)
@@ -244,7 +244,7 @@
rm -f imports/lib/libXft.so.1* imports/lib/libXft1*
ln -nsf /usr/include/X11/Xft imports/include/X11
ifndef NOT_BUILDING_XORG_X_SERVER
- # Create source tree for static, debuggable XOrg server.
+ # Create source tree for static, debuggable Xorg server.
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xfree86-dbg
endif
# build Debian's X server wrapper
@@ -287,8 +287,8 @@
install -m 644 debian/local/update-fonts-$$FOO.8 $(DEBTREEDIR)/usr/share/man/man8; \
done
ifdef NOT_BUILDING_XORG_X_SERVER
- # These files, which document more than just the XOrg X server, should
- # be installed by the upstream Imakefiles even when the XOrg X server
+ # These files, which document more than just the Xorg X server, should
+ # be installed by the upstream Imakefiles even when the Xorg X server
# isn't being built, but they're poorly placed. Therefore we have to
# create the destination directory ourselves.
install -m 755 -d debian/tmp/usr/X11R6/lib/X11/doc
@@ -296,14 +296,14 @@
$(SOURCE_TREE)/programs/Xserver/hw/xfree86/doc/README.fonts \
debian/tmp/usr/X11R6/lib/X11/doc
else
- # Install the static, debuggable XOrg server.
+ # Install the static, debuggable Xorg server.
install -m 755 $(SOURCE_TREE)-xserver-xorg-dbg/programs/Xserver/Xorg \
debian/tmp/usr/X11R6/bin/Xorg-debug
mkdir -p $(DEBTREEDIR)/etc/X11/cursors
install -m 644 debian/local/cursors/*.theme $(DEBTREEDIR)/etc/X11/cursors
endif
rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
- # Remove the upstream symlink X -> XOrg.
+ # Remove the upstream symlink X -> Xorg.
rm -f $(DEBTREEDIR)/usr/X11R6/bin/X
# install Debian's X server wrapper
install -m 755 debian/local/xserver-wrapper $(DEBTREEDIR)/usr/X11R6/bin/X
@@ -438,7 +438,7 @@
dh_testroot
dh_install --sourcedir=debian/tmp
# Special handling: don't do this if the manpage doesn't exist, which
- # will be the case if this architecture doesn't build the XOrg X server.
+ # will be the case if this architecture doesn't build the Xorg X server.
if [ -e debian/tmp/usr/X11R6/man/man1/Xorg.1x ]; then \
install -m 755 -d debian/xserver-xorg-dbg/usr/X11R6/man/man1; \
install -m 644 debian/tmp/usr/X11R6/man/man1/Xorg.1x debian/xserver-xorg-dbg/usr/X11R6/man/man1/Xorg-debug.1x; \
@@ -549,7 +549,7 @@
@echo '$$(XWSD_SPECIAL_DEPENDS)' is \"$(XWSD_SPECIAL_DEPENDS)\"
@echo '$$(XLIBMESA_GL_SPECIAL_DEPENDS)' is \"$(XLIBMESA_GL_SPECIAL_DEPENDS)\"
ifdef NOT_BUILDING_XORG_X_SERVER
- @echo '*** This architecture does not build the XOrg X server packages.'
+ @echo '*** This architecture does not build the Xorg X server packages.'
endif
@echo 'See debian/control for build dependencies.'
@@ -565,7 +565,7 @@
build-server: $(STAMP_DIR)/build-server
$(STAMP_DIR)/build-server: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/genscripts
dh_testdir
- # Create source tree for static, debuggable XOrg server.
+ # Create source tree for static, debuggable Xorg server.
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xorg-dbg
ifndef test_rules
$(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES) -DBuildServersOnly=YES" World
@@ -585,7 +585,7 @@
umask 022
dh_clean -k
$(MAKE) -C $(SOURCE_TREE) SHELL="/bin/sh -e" DESTDIR=$(DEBTREEDIR) install install.man
- # Install the static, debuggable XOrg server.
+ # Install the static, debuggable Xorg server.
install -m 755 $(SOURCE_TREE)-xserver-xorg-dbg/programs/Xserver/Xorg \
debian/tmp/usr/X11R6/bin/Xorg-debug
else
Reply to: