Author: dnusinow
Date: 2005-07-27 22:34:07 -0500 (Wed, 27 Jul 2005)
New Revision: 423
Removed:
trunk/debian/local/XF86Config.7
Modified:
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/changelog
trunk/debian/rules
trunk/debian/xserver-common.install
Log:
- Remove obsolete XF86Config.7 manpage
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.alpha.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3516,7 +3516,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.amd64.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3541,7 +3541,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.arm.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3502,7 +3502,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.hppa.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3423,7 +3423,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.i386.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3555,7 +3555,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.ia64.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3546,7 +3546,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.m68k.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3503,7 +3503,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.mips.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3422,7 +3422,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.mipsel.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3422,7 +3422,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.powerpc.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3514,7 +3514,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.s390.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3284,7 +3284,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/MANIFEST.sparc.in 2005-07-28 03:34:07 UTC (rev 423)
@@ -3541,7 +3541,6 @@
usr/share/man/man5/Xwrapper.config.5
usr/share/man/man5/xdm.options.5
usr/share/man/man5/xfs.options.5
-usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/changelog 2005-07-28 03:34:07 UTC (rev 423)
@@ -29,6 +29,7 @@
Changes by David MartÃnez Moreno
- Include upstream X.Org changelog in x11-common documents
- Remove various references to XFree86 and its trappings.
+ - Remove obsolete XF86Config.7 manpage
Changes by Eugene Konev and David Nusinow
- Switch from dbs to quilt
Deleted: trunk/debian/local/XF86Config.7
===================================================================
--- trunk/debian/local/XF86Config.7 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/local/XF86Config.7 2005-07-28 03:34:07 UTC (rev 423)
@@ -1,206 +0,0 @@
-.\" $Id: XF86Config.7 2002 2004-10-31 07:25:02Z branden $
-.\"
-.\" Copyright 2001, 2002, 2004 Branden Robinson <[EMAIL PROTECTED]>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL; if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it. So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH XF86Config 7 "2004\-10\-31" "Debian Project"
-.SH NAME
-XF86Config \- XFree86 X server configuration
-.SH DESCRIPTION
-The Debian system supports simultaneous installation of XFree86 version 3
-and version 4 servers.
-To accomodate this simultaneity, the names of several utilities and manual
-pages had to be changed from their upstream defaults.
-.SS "XFree86 4.\fIx\fB Server Configuration"
-There is only one server package for XFree86
-.RI 4. x ,
-.BR xserver\-xfree86 ,
-corresponding to the single server binary.
-(Modules supporting various hardware are loaded on demand by the server,
-and most XFree86 server modules that exist are available as part of the
-package.)
-.PP
-Information about the XFree86 X server is available in the
-.BR XFree86 (1x)
-manual page.
-The format of the version 4 server configuration file is given in
-.BR XF86Config\-4 (5x),
-and the upstream, text\-based configuration tool for the version 4 server is
-documented in
-.BR xf86config (1x),
-Note, however, that usage of the
-.BR debconf (7)
-configuration process is preferred.
-To reconfigure the X server using
-.BR debconf ,
-simply run
-.RS
-.BR "dpkg\-reconfigure xserver\-xfree86" .
-.RE
-.PP
-.B In the Debian system, the only supported location for the XFree86
-.BI 4. x
-.B server configuration file is
-.IB /etc/X11/XF86Config\-4 .
-The XFree86 server program will look in a variety of locations, but
-.I /etc/X11/XF86Config\-4
-is the only one supported by Debian for xserver\-xfree86.
-The reason for this strict policy is to reduce confusion.
-.PP
-When reporting bugs to the Debian Bug Tracking System in xserver\-xfree86,
-be sure to include a copy of your
-.I /etc/X11/XF86Config\-4
-and
-.I /var/log/XFree86.0.log
-(or whichever log file the X server used \(em see
-.BR XFree86 (1x))
-files in the bug report.
-Many problems with the X server are the result of poor configuration.
-Furthermore, this information aids the Debian Developers in determining
-your hardware scenario.
-.SS "XFree86 3.\fIx\fB Server Configuration"
-.B Note that as of September 2003, packages of XFree86
-.BI 3. x
-.B are no longer supported by the Debian Project.
-This information in this section is provided as a convenience for users who
-must, for whatever reason, keep XFree86
-.RI 3. x
-packages installed on their systems.
-Please note that the XFree86
-.RI 3. x
-codebase is not maintained by anyone, even for security fixes.
-If you run XFree86
-.RI 3. x
-on your system, you may be vulnerable to CAN\-2002\-0164, CAN\-2003\-0063,
-CAN\-2003\-0071, CAN\-2003\-0690, CAN\-2003\-0730, CAN\-2004\-0083,
-CAN\-2004\-0084, CAN\-2004\-0093, CAN\-2004\-0094, CAN\-2004\-0106,
-CAN\-2004\-0687, CAN\-2004\-0688, and CAN\-2004\-0914 (as indexed by the
-.URL "http://cve.mitre.org/cve/"; "MITRE CVE project" ),
-among other flaws.
-.PP
-Version 3 XFree86 X server packages include:
-.TP
-.B xserver\-3dlabs
-.PD 0
-.TP
-.B xserver\-8514
-.TP
-.B xserver\-agx
-.TP
-.B xserver\-fbdev
-.TP
-.B xserver\-i128
-.TP
-.B xserver\-mach32
-.TP
-.B xserver\-mach64
-.TP
-.B xserver\-mach8
-.TP
-.B xserver\-mono
-.TP
-.B xserver\-p9000
-.TP
-.B xserver\-s3
-.TP
-.B xserver\-s3v
-.TP
-.B xserver\-svga
-.TP
-.B xserver\-tga
-.TP
-.B xserver\-vga16
-.TP
-.B xserver\-w32
-.PD
-.PP
-Information common to all version 3 XFree86 X servers is available in the
-.BR XFree86\-v3 (1x)
-manual page.
-The format of the version 3 server configuration file is given in
-.BR XF86Config\-v3 (5x),
-and the upstream, text\-based configuration tool for version 3 servers is
-documented in
-.BR xf86config\-v3 (1x).
-Note, however, that usage of the
-.BR debconf (7)
-configuration process is preferred.
-To reconfigure the X server using
-.BR debconf ,
-simply run
-.RS
-.B dpkg\-reconfigure
-.I package
-.RE
-where
-.I package
-is one of the above listed packages (whichever is appropriate for your
-hardware).
-.PP
-.B In the Debian system, the only supported location for the XFree86
-.BI 3. x
-.B server configuration file is
-.IB /etc/X11/XF86Config .
-The X server programs will look in a variety of locations, but
-.I /etc/X11/XF86Config
-is the only one supported by Debian for the server packages listed above.
-The reason for this strict policy is to reduce confusion.
-.PP
-When reporting bugs to the Debian Bug Tracking System in any of the above
-listed packages, be sure to include a copy of your
-.I /etc/X11/XF86Config
-file in the bug report.
-If possible, please also include the X server ouput, which can be preserved
-by redirecting to a file.
-For instance:
-.RS
-.B startx >$HOME/xserver.log 2>&1
-.RE
-Many problems with the X server are the result of poor configuration.
-Furthermore, this information aids the Debian Developers in determining
-your hardware scenario.
-.PP
-Please note that most modern hardware is better supported by the version
-.RI 4. x
-release series of XFree86.
-The XFree86
-.RI 4. x
-X server is packaged as xserver\-xfree86.
-The version
-.RI 3. x
-XFree86 X servers are no longer maintained upstream, and it is unlikely
-that bugs in those servers will ever be fixed.
-.SH AUTHOR
-Branden Robinson wrote this manual page.
-.SH "SEE ALSO"
-.BR XF86Config\-4 (5x),
-.BR XF86Config\-v3 (5x),
-.BR XFree86 (1x),
-.BR XFree86\-v3 (1x),
-.BR xf86config (1x),
-.BR xf86config\-v3 (1x),
-.BR debconf (7),
-.BR dpkg\-reconfigure (8)
-.\" vim:set et tw=80:
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/rules 2005-07-28 03:34:07 UTC (rev 423)
@@ -356,7 +356,6 @@
install -m 644 debian/local/dexlet/*
$(DEBTREEDIR)/usr/share/configlets/xserver-common
# other stuff
install -m 755 -d $(DEBTREEDIR)/usr/share/man/man7
- install -m 644 debian/local/XF86Config.7
$(DEBTREEDIR)/usr/share/man/man7
install -m 755 debian/local/Xsession $(DEBTREEDIR)/etc/X11
install -m 644 debian/local/Xsession.options $(DEBTREEDIR)/etc/X11
install -m 755 -d $(DEBTREEDIR)/usr/share/man/man5
Modified: trunk/debian/xserver-common.install
===================================================================
--- trunk/debian/xserver-common.install 2005-07-28 03:31:19 UTC (rev 422)
+++ trunk/debian/xserver-common.install 2005-07-28 03:34:07 UTC (rev 423)
@@ -11,4 +11,3 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/man/man1/dexconf.1
usr/share/man/man5/Xwrapper.config.5
-usr/share/man/man7/XF86Config.7
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
