X Strike Force X.Org X11 SVN commit: r3837 - in trunk/xserver/xorg-server/debian: . patches
Author: dparsons
Date: 2006-10-16 10:19:02 -0400 (Mon, 16 Oct 2006)
New Revision: 3837
Modified:
trunk/xserver/xorg-server/debian/changelog
trunk/xserver/xorg-server/debian/patches/03_xnest_manpage_overhaul.diff
trunk/xserver/xorg-server/debian/rules
Log:
* Use __appmansuffix__ not __mansuffix__ in
03_xnest_manpage_overhaul.diff. Closes: #390599.
* Install upstream ChangeLog. Closes: #365274.
Modified: trunk/xserver/xorg-server/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2006-10-16 13:54:24 UTC (rev 3836)
+++ trunk/xserver/xorg-server/debian/changelog 2006-10-16 14:19:02 UTC (rev 3837)
@@ -18,9 +18,14 @@
* Add 32_disable_sparc_pci_bridge.diff. Disable PCI bridge handling on
sparc, which is broken and causes filesystem corruption (by poking
the PCI bus in the wrong places) on some machines. Closes: #392312.
-
- -- David Nusinow <dnusinow@debian.org> Fri, 13 Oct 2006 16:05:54 -0400
+ [ Drew Parsons ]
+ * Use __appmansuffix__ not __mansuffix__ in
+ 03_xnest_manpage_overhaul.diff. Closes: #390599.
+ * Install upstream ChangeLog. Closes: #365274.
+
+ -- Drew Parsons <dparsons@debian.org> Tue, 17 Oct 2006 00:13:02 +1000
+
xorg-server (2:1.1.1-9) unstable; urgency=low
[ Jurij Smakov ]
Modified: trunk/xserver/xorg-server/debian/patches/03_xnest_manpage_overhaul.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/03_xnest_manpage_overhaul.diff 2006-10-16 13:54:24 UTC (rev 3836)
+++ trunk/xserver/xorg-server/debian/patches/03_xnest_manpage_overhaul.diff 2006-10-16 14:19:02 UTC (rev 3837)
@@ -37,7 +37,7 @@
.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.6 2001/01/27 18:21:00 dawes Exp $
.\"
-.TH XNEST 1 __xorgversion__
-+.TH Xnest __mansuffix__ __xorgversion__
++.TH Xnest __appmansuffix__ __xorgversion__
.SH NAME
Xnest \- a nested X server
.SH SYNOPSIS
@@ -74,7 +74,7 @@
+.B Xnest
+supports all standard options of the sample server implementation.
+For more details, please see
-+.BR Xserver (__mansuffix__).
++.BR Xserver (__appmansuffix__).
+The following additional arguments are supported as well.
+.TP
+.BI "\-display " string
@@ -172,7 +172,7 @@
+class of the default visual of the real server, but it must be supported by the
+real server.
+Use
-+.BR xdpyinfo (__mansuffix__)
++.BR xdpyinfo (__appmansuffix__)
+to obtain a list of supported visual classes on the real server before starting
+.BR Xnest .
+If the user chooses a static class, all the colors in the default color map will
@@ -192,7 +192,7 @@
+depth of the default visual of the real server, but it must be supported by the
+real server.
+Use
-+.BR xdpyinfo (__mansuffix__)
++.BR xdpyinfo (__appmansuffix__)
+to obtain a list of supported visual depths on the real server before starting
+.BR Xnest .
+.TP
@@ -305,7 +305,7 @@
+For example,
+.B xterm \-display :1.1
+will open an
-+.BR xterm (__mansuffix__)
++.BR xterm (__appmansuffix__)
+client in the nested server with the display number
+.B :1
+on the second screen.
@@ -451,7 +451,7 @@
+Starting up
+.B Xnest
+is just as simple as starting up
-+.BR xclock (__mansuffix__)
++.BR xclock (__appmansuffix__)
+from a terminal emulator.
+If a user wishes to run
+.B Xnest
@@ -607,7 +607,7 @@
+Thus, if there is a font in the local font path of the nested server, there is
+no guarantee that this font exists in the remote font path of the real server.
+The
-+.BR xlsfonts (__mansuffix__)
++.BR xlsfonts (__appmansuffix__)
+client, if run on the nested server, will list fonts in the local font path and,
+if run on the real server, will list fonts in the remote font path.
+Before a font can be successfully opened by the nested server, it has to exist
@@ -648,6 +648,6 @@
Davor Matic, MIT X Consortium
-
+.SH "SEE ALSO"
-+.BR Xserver (__mansuffix__),
-+.BR xdpyinfo (__mansuffix__),
++.BR Xserver (__appmansuffix__),
++.BR xdpyinfo (__appmansuffix__),
+.BR X (__miscmansuffix__)
Modified: trunk/xserver/xorg-server/debian/rules
===================================================================
--- trunk/xserver/xorg-server/debian/rules 2006-10-16 13:54:24 UTC (rev 3836)
+++ trunk/xserver/xorg-server/debian/rules 2006-10-16 14:19:02 UTC (rev 3837)
@@ -98,7 +98,7 @@
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
$(INSTALL) -m644 $(CURDIR)/debian/serverabiver \
Reply to: