X Strike Force X.Org X11 SVN commit: r405 - in trunk/debian: . local po scripts
Author: dnusinow
Date: 2005-07-23 23:46:38 -0500 (Sat, 23 Jul 2005)
New Revision: 405
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/local/Xsession
trunk/debian/local/Xsession.5
trunk/debian/po/pothead.in
trunk/debian/po/templates.pot
trunk/debian/scripts/manifest-install-reconcile
trunk/debian/scripts/mir-false-negatives
trunk/debian/scripts/mir-false-positives
trunk/debian/twm.README.Debian
trunk/debian/x11-common.README.Debian
trunk/debian/x11-common.config.in
trunk/debian/x11-common.postinst.in
trunk/debian/x11-common.postrm.in
trunk/debian/x11-common.preinst.in
trunk/debian/x11-common.templates
trunk/debian/xbase-clients.README.Debian
trunk/debian/xdm.README.Debian
trunk/debian/xfs.README.Debian
trunk/debian/xserver-common.README.Debian
trunk/debian/xserver-xorg.bug.presubj
trunk/debian/xserver-xorg.postrm.in
trunk/debian/xserver-xorg.preinst.in
trunk/debian/xserver-xorg.prerm.in
trunk/debian/xterm.README.Debian
trunk/debian/xutils.README.Debian
Log:
- Edit various Debian files for XFree86 -> X.Org branding changes
- Add TODO item for unspecified future (although maybe sooner than later)
for /var/lib/xfree86
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/TODO 2005-07-24 04:46:38 UTC (rev 405)
@@ -18,9 +18,6 @@
* Explore moving some of the Build-Depends to Build-Depends-Indep; stuff needed
only for building fonts and docs should be safely movable there.
-* Audit all branding and references to xfree{,86} and {X.Org,xorg} in debian/
- for correctness.
-
* Ship the HTML docs in xspecs again. Debian Policy section 12.4 says that we
should ship HTML documentation if possible.
+ Kill 033_no_html.diff
@@ -105,4 +102,6 @@
account the many lessons of the past 5 years (and hopefully leveraging the new
"autoconfiguration" code in the Xorg X server).
+* Change /var/lib/xfree86 usage to /var/lib/xorg
+
# vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/changelog 2005-07-24 04:46:38 UTC (rev 405)
@@ -11,6 +11,7 @@
- Document in NEWS.Debian
- Remove mention of speedo from templates.pot and update. Sorry
translators!
+ - Edit various Debian files for XFree86 -> X.Org branding changes
Changes by Eugene Konev:
- Do not impose selinux on the whole world out there: move selinux
Modified: trunk/debian/local/Xsession
===================================================================
--- trunk/debian/local/Xsession 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/local/Xsession 2005-07-24 04:46:38 UTC (rev 405)
@@ -4,7 +4,7 @@
#
# global Xsession file -- used by display managers and xinit (startx)
-# $Id: Xsession 1507M 2004-09-13 07:36:26Z (local) $
+# $Id$
set -e
@@ -42,7 +42,7 @@
# 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\"" \
+ "Please report the installed version of the \"x11-common\"" \
"package and the complete text of this error message to" \
"<debian-x@lists.debian.org>."
}
Modified: trunk/debian/local/Xsession.5
===================================================================
--- trunk/debian/local/Xsession.5 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/local/Xsession.5 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,4 +1,4 @@
-.\" $Id: Xsession.5 2138 2005-01-17 23:40:27Z branden $
+.\" $Id$
.\"
.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
.\"
@@ -161,12 +161,12 @@
Five shell script portions are supplied by default to handle the details of
the session startup procedure.
.TP
-.I /etc/X11/Xsession.d/20xfree86\-common_process\-args
+.I /etc/X11/Xsession.d/20x11\-common_process\-args
Arguments are processed as described in \(lqSESSION TYPES\(rq above.
The startup program, if one is identified at this point, is merely stored
for later reference, and not immediately executed.
.TP
-.I /etc/X11/Xsession.d/30xfree86\-common_xresources
+.I /etc/X11/Xsession.d/30x11\-common_xresources
X resources are merged.
.B run\-parts
is again used, this time to identify files in the
@@ -178,7 +178,7 @@
.I $HOME/.Xresources
file is merged in the same way.
.TP
-.I /etc/X11/Xsession.d/50xfree86\-common_determine\-startup
+.I /etc/X11/Xsession.d/50x11\-common_determine\-startup
Determine startup program.
The X client to launch as the controlling process (the one that, upon
exiting, causes the X server to exit as well) is determined next.
@@ -208,7 +208,7 @@
.I Xsession
aborts with an error.
.TP
-.I /etc/X11/Xsession.d/90xfree86\-common_ssh\-agent
+.I /etc/X11/Xsession.d/90x11\-common_ssh\-agent
Start
.BR ssh\-agent (1),
if needed.
@@ -220,7 +220,7 @@
.B Note:
this functionality may move to the ssh package in the future.
.TP
-.I /etc/X11/Xsession.d/99xfree86\-common_start
+.I /etc/X11/Xsession.d/99x11\-common_start
Start the X session.
The startup program is executed, inside a Bourne shell if it is not
executable, and inside an ssh\-agent if necessary.
@@ -366,7 +366,7 @@
See the manual page for
.B xinit
and/or
-.I /usr/share/doc/xfree86\-common/examples/xsession
+.I /usr/share/doc/x11\-common/examples/xsession
for tips on writing an
.I .Xsession
file.
Modified: trunk/debian/po/pothead.in
===================================================================
--- trunk/debian/po/pothead.in 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/po/pothead.in 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,11 +1,11 @@
-# debconf templates for xfree86 package
+# debconf templates for xorg-x11 package
#
-# $Id: pothead.in 1695 2004-07-29 07:22:25Z branden $
+# $Id$
#
# Copyright:
# Branden Robinson, 2000--2004
#
-# This file is distributed under the same license as the xfree86 package.
+# This file is distributed under the same license as the xorg-x11 package.
# Please see debian/copyright.
#
# Translators, if you are not familiar with the PO format, gettext
Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/po/templates.pot 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,11 +1,11 @@
-# debconf templates for xfree86 package
+# debconf templates for xorg-x11 package
#
# $Id: pothead.in 189 2005-06-11 00:04:27Z branden $
#
# Copyright:
# Branden Robinson, 2000--2004
#
-# This file is distributed under the same license as the xfree86 package.
+# This file is distributed under the same license as the xorg-x11 package.
# Please see debian/copyright.
#
# Translators, if you are not familiar with the PO format, gettext
@@ -142,14 +142,14 @@
#. Type: note
#. Description
#: ../x11-common.templates:3
-msgid "experimental version of XFree86 packages"
+msgid "experimental version of X.Org packages"
msgstr ""
#. Type: note
#. Description
#: ../x11-common.templates:3
msgid ""
-"You are using an experimental version of XFree86 packages for Debian. "
+"You are using an experimental version of X.Org packages for Debian. "
"Please do not file bugs with the Debian Bug Tracking System against this "
"version of the packages, since they have not been released to the Debian "
"distribution yet."
@@ -173,12 +173,12 @@
"things:\n"
" 1) Ensure that you do not have experimental package repositiories in\n"
" your /etc/apt/sources.list file;\n"
-" 2) Instruct apt to downgrade XFree86 to an appropriate released version;\n"
+" 2) Instruct apt to downgrade X.Org to an appropriate released version;\n"
" you can do this by appending a package suite name to the package name\n"
" with \"apt-get\" -- for example:\n"
-" apt-get install xfree86-common/unstable\n"
+" apt-get install x11-common/unstable\n"
" or\n"
-" apt-get install xfree86-common/stable\n"
+" apt-get install x11-common/stable\n"
" You may need to specify downgrades for several packages."
msgstr ""
Modified: trunk/debian/scripts/manifest-install-reconcile
===================================================================
--- trunk/debian/scripts/manifest-install-reconcile 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/scripts/manifest-install-reconcile 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,6 +1,6 @@
#!/bin/sh
-# $Id: manifest-install-reconcile 1682 2004-07-21 21:01:00Z branden $
+# $Id$
PROGNAME="${0##*/}"
@@ -24,7 +24,7 @@
results ordinarily reported in validate mode are spurious. This mode should
seldom be used.
-At present, this program is specific to the xfree86 source package.
+At present, this program is specific to the X.Org source package.
EOF
}
Modified: trunk/debian/scripts/mir-false-negatives
===================================================================
--- trunk/debian/scripts/mir-false-negatives 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/scripts/mir-false-negatives 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,4 +1,4 @@
-# $Id: mir-false-negatives 1706 2004-07-29 19:16:40Z branden $
+# $Id$
# This file is used by manifest-install-reconcile.
@@ -18,7 +18,7 @@
# XF86Config.{98,eg} are obsolete
usr/X11R6/lib/X11/XF86Config.98 alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
usr/X11R6/lib/X11/XF86Config.eg alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
-# XF86Config.indy is handled by xserver-xfree86.examples.mips (otherwise
+# XF86Config.indy is handled by xserver-xorg.examples.mips (otherwise
# unused)
usr/X11R6/lib/X11/XF86Config.indy hurd-i386 i386 ia64 mips mipsel
# XXX: not sure what to do about Xcms.txt yet
Modified: trunk/debian/scripts/mir-false-positives
===================================================================
--- trunk/debian/scripts/mir-false-positives 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/scripts/mir-false-positives 2005-07-24 04:46:38 UTC (rev 405)
@@ -2,10 +2,10 @@
# This file is used by manifest-install-reconcile.
-# XFree86-debug for s390 is a false positive because s390 doesn't build the
-# xserver-xfree86{,-dbg} packages, but manifest-install-reconcile doesn't
+# Xorg-debug for s390 is a false positive because s390 doesn't build the
+# xserver-xorg{,-dbg} packages, but manifest-install-reconcile doesn't
# know that.
-usr/X11R6/bin/XFree86-debug s390
+usr/X11R6/bin/Xorg-debug s390
# Unstripped libraries and modules for debugging don't appear in the
# MANIFEST files because they are built by special logic in debian/rules,
# and therefore are false positives.
Modified: trunk/debian/twm.README.Debian
===================================================================
--- trunk/debian/twm.README.Debian 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/twm.README.Debian 2005-07-24 04:46:38 UTC (rev 405)
@@ -2,10 +2,10 @@
=============================
Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
You can view this file with your favorite pager program after decompressing
it. For example:
- $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+ $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
For information on the /etc/X11/twm/system.twmrc file, see the twm(1)
manual page. Note that /etc/X11/twm/system.twmrc is auto-generated from
@@ -17,6 +17,6 @@
Some examples of .twmrc files from days of yore are available in
/usr/share/doc/twm/examples.
-$Id: twm.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/x11-common.README.Debian
===================================================================
--- trunk/debian/x11-common.README.Debian 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/x11-common.README.Debian 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,18 +1,18 @@
-Debian README for xfree86-common package
+Debian README for x11-common package
========================================
-The xfree86-common package provides the infrastructure common to all Debian X
+The x11-common package provides the infrastructure common to all Debian X
installations.
Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
You can view this file with your favorite pager program after decompressing
it. For example:
- $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+ $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
Those who have upgraded their Debian X packages from version 3.3.2.3-2 or
earlier (Debian 2.0), will want to read the information in
-/usr/share/doc/xfree86-common/README.Debian-upgrade.
+/usr/share/doc/x11-common/README.Debian-upgrade.
Note that as of version 3.3.6-4, support for the /etc/X11/window-managers
file has been removed; the default window manager is now determined by
@@ -20,7 +20,7 @@
more information.
Use "dpkg --print-avail <package>" to read the extended descriptions of
-the XFree86 packages and get some idea of their contents.
+the X.Org packages and get some idea of their contents.
There are three common types of X Window System installation:
@@ -47,10 +47,10 @@
One can conclude from the above that any Debian machine which has anything to
do with the X Window System will have xlibs and/or xserver-common installed.
-The xfree86-common package is the foundation on which those two packages
+The x11-common package is the foundation on which those two packages
themselves depend.
-In addition to manual pages and documentation, the xfree86-common
+In addition to manual pages and documentation, the x11-common
package contains the following:
1) the basic X directory hierarchy and symbolic links into it -- /usr/X11R6
@@ -60,7 +60,7 @@
future changes in the filesystem location or structure of the X Window System
can be centrally managed.
-2) the /etc/X11/Xresources directory, and the xfree86-common file within it
+2) the /etc/X11/Xresources directory, and the x11-common file within it
-- historically in Debian systems, /etc/X11/Xresources has been a plain file,
whose contents were processed by an X resource database merge (a.k.a. xrdb
-merge) when an X session was launched (whether by startx or xdm). This
@@ -71,7 +71,7 @@
system-wide user-customizable X resources. It is strongly suggested that
packages wishing to take advantage of this place a file in /etc/X11/Xresources
with the same name as the package in question, to prevent name collisions. The
-xfree86-common file here should be used for very high-level, global resource
+x11-common file here should be used for very high-level, global resource
settings (such as setting the color customization, setting properties of Athena
widgets, etc.). See the X(1) manual page for more information on X resources.
Modified: trunk/debian/x11-common.config.in
===================================================================
--- trunk/debian/x11-common.config.in 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/x11-common.config.in 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Debian xfree86-common package configuration script
+# Debian x11-common package configuration script
# Copyright 2002, 2003 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>.
Modified: trunk/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/x11-common.postinst.in 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/x11-common.postinst.in 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Debian xfree86-common package post-installation script
+# Debian x11-common package post-installation script
# Copyright 1998-2001, 2003 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>.
Modified: trunk/debian/x11-common.postrm.in
===================================================================
--- trunk/debian/x11-common.postrm.in 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/x11-common.postrm.in 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Debian xfree86-common package post-removal script
+# Debian x11-common package post-removal script
# Copyright 1998-2001, 2003 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>.
Modified: trunk/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/x11-common.preinst.in 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/x11-common.preinst.in 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Debian xfree86-common package pre-installation script
+# Debian x11-common package pre-installation script
# Copyright 1998-2001, 2003 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>.
Modified: trunk/debian/x11-common.templates
===================================================================
--- trunk/debian/x11-common.templates 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/x11-common.templates 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,7 +1,7 @@
Template: x11-common/experimental_packages
Type: note
-_Description: experimental version of XFree86 packages
- You are using an experimental version of XFree86 packages for Debian. Please
+_Description: experimental version of X.Org packages
+ You are using an experimental version of X.Org packages for Debian. Please
do not file bugs with the Debian Bug Tracking System against this version of
the packages, since they have not been released to the Debian distribution
yet.
@@ -15,10 +15,10 @@
things:
1) Ensure that you do not have experimental package repositiories in
your /etc/apt/sources.list file;
- 2) Instruct apt to downgrade XFree86 to an appropriate released version;
+ 2) Instruct apt to downgrade X.Org to an appropriate released version;
you can do this by appending a package suite name to the package name
with "apt-get" -- for example:
- apt-get install xfree86-common/unstable
+ apt-get install x11-common/unstable
or
- apt-get install xfree86-common/stable
+ apt-get install x11-common/stable
You may need to specify downgrades for several packages.
Modified: trunk/debian/xbase-clients.README.Debian
===================================================================
--- trunk/debian/xbase-clients.README.Debian 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xbase-clients.README.Debian 2005-07-24 04:46:38 UTC (rev 405)
@@ -2,15 +2,15 @@
=======================================
Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
You can view this file with your favorite pager program after decompressing
it. For example:
- $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+ $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
The /etc/X11/Xresources/xbase-clients file contains X resources to be
loaded for any of the X clients provided by xbase-clients. See the X(1)
manual page for information on X resource management.
-$Id: xbase-clients.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/xdm.README.Debian
===================================================================
--- trunk/debian/xdm.README.Debian 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xdm.README.Debian 2005-07-24 04:46:38 UTC (rev 405)
@@ -2,9 +2,9 @@
=============================
Newcomers to the X Window System should first read the file
-/usr/share/doc/xfree86-common/FAQ.gz. You can view this file with your
+/usr/share/doc/x11-common/FAQ.gz. You can view this file with your
favorite pager program after decompressing it. For example:
- $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+ $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
Upgraders from Debian GNU/Linux 2.0 or earlier should be aware that the
/etc/X11/config file is no longer used; its xdm-specific options are now in
@@ -56,6 +56,6 @@
Debian GNU/Linux system. See the xdm.options(5) manual page for more
information.
-$Id: xdm.README.Debian 1966 2004-10-18 18:03:43Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/xfs.README.Debian
===================================================================
--- trunk/debian/xfs.README.Debian 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xfs.README.Debian 2005-07-24 04:46:38 UTC (rev 405)
@@ -2,10 +2,10 @@
=============================
Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
You can view this file with your favorite pager program after decompressing
it. For example:
- $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+ $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
Upgraders from Debian GNU/Linux 2.0 or earlier should be aware that the
/etc/X11/config file is no longer used; its xfs-specific options are now in
@@ -35,6 +35,6 @@
For information on the /etc/X11/fs/config file, see the xfs(1)
manual page.
-$Id: xfs.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/xserver-common.README.Debian
===================================================================
--- trunk/debian/xserver-common.README.Debian 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xserver-common.README.Debian 2005-07-24 04:46:38 UTC (rev 405)
@@ -2,15 +2,15 @@
========================================
Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
You can view this file with your favorite pager program after decompressing
it. For example:
- $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+ $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
The XFree86 Video Timings HOWTO, which explains the art of hand-crafting
Modelines for the XF86Config file, is included in the doc-linux-text (plain
ASCII format) and doc-linux-html (HTML format) packages.
-$Id: xserver-common.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/xserver-xorg.bug.presubj
===================================================================
--- trunk/debian/xserver-xorg.bug.presubj 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xserver-xorg.bug.presubj 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,13 +1,13 @@
-Before filing a bug against the XFree86 X server, please note the
+Before filing a bug against the X.Org X server, please note the
following:
1) The problem you are experiencing may be a known issue that is discussed
in the Debian X FAQ. If you are unfamiliar with this document, please
consult it before filing your report.
- XHTML version: file:///usr/share/doc/xfree86-common/FAQ.xhtml
- plain text version: file:///usr/share/doc/xfree86-common/FAQ.gz
+ XHTML version: file:///usr/share/doc/x11-common/FAQ.xhtml
+ plain text version: file:///usr/share/doc/x11-common/FAQ.gz
-2) Please be cautious with your bug severities. Most bugs in the XFree86 X
+2) Please be cautious with your bug severities. Most bugs in the X.Org X
server are specific to particular drivers, and often manifest only on
particular models of display adapter. This means that while the X server
may be unusable for you, it typically is not for the majority of users.
@@ -22,7 +22,7 @@
3) Problems with the keyboard are almost always due to bugs in the XKB (X
Keyboard Extension) data files. Reports about such issues should be filed
-against the "xlibs" package, not "xserver-xfree86".
+against the "xlibs" package, not "xserver-xorg".
4) Problems with 3D acceleration or DRI (Direct Rendering Infrastructure)
are usually problems with the Mesa GL library, the Mesa DRI modules, or
@@ -32,13 +32,13 @@
Situation Package
--------- -------
- problem has nothing to do with GL/DRI xserver-xfree86
+ problem has nothing to do with GL/DRI xserver-xorg
disabling Mesa DRI modules fixes problem xlibmesa-dri
GL-related problem not affected by DRI xlibmesa-gl
changing kernel version fixes problem kernel
Note that some hardware vendors provide their own GL library
-implementations, which are not always compatible with XFree86. If you
+implementations, which are not always compatible with X.Org. If you
think the problem lies in xlibmesa-gl but that package is not installed,
you may have just such a compatibility problem; try the command:
reportbug --file /usr/lib/libGL.so.1
Modified: trunk/debian/xserver-xorg.postrm.in
===================================================================
--- trunk/debian/xserver-xorg.postrm.in 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xserver-xorg.postrm.in 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,11 +1,11 @@
#!/bin/sh
-# Debian xserver-xfree86 package post-removal script
+# Debian xserver-xorg package post-removal script
# Copyright 1998-2001, 2003 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>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xserver-xfree86.postrm.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
set -e
Modified: trunk/debian/xserver-xorg.preinst.in
===================================================================
--- trunk/debian/xserver-xorg.preinst.in 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xserver-xorg.preinst.in 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,10 +1,10 @@
#!/bin/sh
-# Debian xserver-xfree86 package pre-installation script
+# Debian xserver-xorg package pre-installation script
# Copyright 2003, 2004 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>.
-# $Id: xserver-xfree86.preinst.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
set -e
Modified: trunk/debian/xserver-xorg.prerm.in
===================================================================
--- trunk/debian/xserver-xorg.prerm.in 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xserver-xorg.prerm.in 2005-07-24 04:46:38 UTC (rev 405)
@@ -1,11 +1,11 @@
#!/bin/sh
-# Debian xserver-xfree86 package pre-removal script
+# Debian xserver-xorg package pre-removal script
# Copyright 1998-2001, 2003, 2004 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>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xserver-xfree86.prerm.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
set -e
Modified: trunk/debian/xterm.README.Debian
===================================================================
--- trunk/debian/xterm.README.Debian 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xterm.README.Debian 2005-07-24 04:46:38 UTC (rev 405)
@@ -2,10 +2,10 @@
===============================
Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
You can view this file with your favorite pager program after decompressing
it. For example:
- $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+ $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
As of version 3.3.4-1, xterm logs to the wtmp and lastlog files. If you do
not have a utmp group on your system, xterm will be installed setuid root
@@ -22,7 +22,7 @@
default.
The terminal description for xterm-debian differs from that of
-xterm-xfree86 in exactly two respects:
+xterm-xorg in exactly two respects:
1. kbs is defined as ^? (ASCII 127), not ^H (ASCII 8)
2. kdch1 is defined as the sequence: ^[ [ 3 ~ (no spaces, and ^[ is ASCII
27, a.k.a ESCAPE) instead of ^? (ASCII 127)
@@ -45,6 +45,6 @@
consistent with the Linux virtual console (and therefore with the behavior
of DEC VT 220 terminals).
-$Id: xterm.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/xutils.README.Debian
===================================================================
--- trunk/debian/xutils.README.Debian 2005-07-24 03:44:22 UTC (rev 404)
+++ trunk/debian/xutils.README.Debian 2005-07-24 04:46:38 UTC (rev 405)
@@ -2,10 +2,10 @@
================================
Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
You can view this file with your favorite pager program after decompressing
it. For example:
- $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+ $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
For information on the /etc/X11/rstart/config file, see the rstartd(1)
manual page.
@@ -19,6 +19,6 @@
"A Flexible Remote Execution Protocol based on rsh", is included in the
xspecs package.
-$Id: xutils.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Reply to: