X Strike Force XFree86 SVN commit: r1403 - in trunk/debian: . patches
Author: branden
Date: 2004-05-13 14:54:32 -0500 (Thu, 13 May 2004)
New Revision: 1403
Removed:
trunk/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff
trunk/debian/patches/006_dont_ref_rman.man.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab a couple of minor documentation-related fixes from XFree86 CVS.
+ There's no config/util/rman.man (Peter Stromberg). [Matthieu Herrb]
From XFree86 CVS 2003-04-07. Delete superseded patch #006.
+ One xieperf reference left over. Noticed by ISHIKAWA Mutsumi. Thanks.
[Matthieu Herrb] From XFree86 CVS 2003-04-14.
Merge #000_stolen_from_HEAD_doc_extensions_fix into #000_stolen_from_HEAD.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-13 18:44:38 UTC (rev 1402)
+++ trunk/debian/CHANGESETS 2004-05-13 19:54:32 UTC (rev 1403)
@@ -80,4 +80,12 @@
911_debian_XF86Config_to_XF86Config-4.diff.
1401
+Grab a couple of minor documentation-related fixes from XFree86 CVS.
++ There's no config/util/rman.man (Peter Stromberg). [Matthieu Herrb]
+ From XFree86 CVS 2003-04-07. Delete superseded patch #006.
++ One xieperf reference left over. Noticed by ISHIKAWA Mutsumi. Thanks.
+ [Matthieu Herrb] From XFree86 CVS 2003-04-14.
+Merge #000_stolen_from_HEAD_doc_extensions_fix into #000_stolen_from_HEAD.
+ 1403
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-05-13 18:44:38 UTC (rev 1402)
+++ trunk/debian/TODO 2004-05-13 19:54:32 UTC (rev 1403)
@@ -12,7 +12,6 @@
These items are listed in descending order of priority; that is, the most
important items come first.
-* Replace 006_dont_ref_rman.man.diff with fix from XFree86 CVS.
* Replace 013_xkb_symbols_euro_support.diff with fix from XFree86 CVS.
* Fix upstream install rule that prevents Xcursor themes from being
installed on s390. As I understand it, this is client-side stuff and
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-13 18:44:38 UTC (rev 1402)
+++ trunk/debian/changelog 2004-05-13 19:54:32 UTC (rev 1403)
@@ -127,12 +127,18 @@
for backspace key handling.
+ Ship the new README.i18n document in /usr/share/doc/xterm.
+ * Grab a couple of minor documentation-related fixes from XFree86 CVS.
+ + There's no config/util/rman.man (Peter Stromberg). [Matthieu Herrb]
+ From XFree86 CVS 2003-04-07. Delete superseded patch #006.
+ + One xieperf reference left over. Noticed by ISHIKAWA Mutsumi. Thanks.
+ [Matthieu Herrb] From XFree86 CVS 2003-04-14.
+
Changes by Fabio Massimo Di Nitto:
* Update xutils's package description to refer to bdftruncate and ucs2any
programs by their correct names.
- -- Branden Robinson <branden@debian.org> Thu, 13 May 2004 12:16:40 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 13 May 2004 14:50:28 -0500
xfree86 (4.3.0.dfsg.1-1) unstable; urgency=low
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-13 18:44:38 UTC (rev 1402)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-13 19:54:32 UTC (rev 1403)
@@ -133,6 +133,37 @@
xc/programs/xdm/access.c @ 3.14
Fix parsing of IPv4 host names in Xaccess (Chisato Yamauchi). [David Dawes]
+xc/config/cf/Imake.rules @ 3.114
+xc/config/cf/Imake.tmpl @ 3.141
+xc/config/cf/X11.tmpl @ 1.197
+xc/doc/hardcopy/XIE/XIEProto/Imakefile @ 1.2
+xc/doc/specs/Imakefile @ 1.9
+xc/doc/specs/programs/Imakefile @ 1.18
+xc/doc/specs/xtrans/Imakefile @ 1.3
+xc/extras/Xpm/sxpm/sxpm.man @ 1.2
+xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile @ 3.84
+xc/programs/Xserver/hw/xfree86/doc/sgml/index.post @ 1.3
+xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp @ 1.2
+xc/programs/ico/ico.man @ 1.4
+xc/programs/listres/listres.man @ 1.4
+xc/programs/viewres/viewres.man @ 1.4
+xc/programs/xcalc/xcalc.man @ 1.5
+xc/programs/xditview/xditview.man @ 1.4
+xc/programs/xrandr/xrandr.man @ 1.5
+ 22. Add preliminary support for generating HTML and PDF versions of most
+ spec documents (David Dawes).
+ 21. Use lower-case extensions uniformly for text and PostScript documents
+ (based on #4876, Branden Robinson).
+ + fix some doc build/install problems and man page formatting problems
+ [David Dawes; change to xf86Date.h omitted]
+
+xc/doc/specs/programs/Imakefile @ 1.19
+ There's no config/util/rman.man (Peter Stromberg). [Matthieu Herrb]
+
+xc/doc/specs/programs/Imakefile @ 1.20
+ One xieperf reference left over. Noticed by ISHIKAWA Mutsumi. Thanks.
+ [Matthieu Herrb]
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -3715,3 +3746,842 @@
addrtype = hostent->h_addrtype;
addr_length = hostent->h_length;
}
+Index: xc/config/cf/Imake.rules
+===================================================================
+RCS file: /cvs/xc/config/cf/Imake.rules,v
+retrieving revision 3.113
+retrieving revision 3.114
+diff -u -r3.113 -r3.114
+--- xc/config/cf/Imake.rules 9 Dec 2002 23:00:42 -0000 3.113
++++ xc/config/cf/Imake.rules 19 Mar 2003 01:49:23 -0000 3.114
+@@ -5,7 +5,7 @@
+ XCOMM
+ XCOMM
+ XCOMM
+-XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.113 2002/12/09 23:00:42 dawes Exp $
++XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.114 2003/03/19 01:49:23 dawes Exp $
+
+ /*
+ * MACHINE-INDEPENDENT RULES; DO NOT MODIFY
+@@ -338,6 +338,15 @@
+ #define RemoveFiles(files) $(RM) files
+ #endif /* RemoveFiles */
+
++#if RemoveObsoleteFiles
++#define RemoveOldFile(new,old,dir) @@\
++ @if [ -f new ]; then set -x; \ @@\
++ RemoveFile($(DESTDIR)dir/old); \ @@\
++ fi
++#else
++#define RemoveOldFile(new,old,dir) $(_NULLCMD_)
++#endif
++
+ /*
+ * CenterLoadTarget - generate rules to load files into CodeCenter
+ */
+Index: xc/config/cf/Imake.tmpl
+===================================================================
+RCS file: /cvs/xc/config/cf/Imake.tmpl,v
+retrieving revision 3.139.2.1
+retrieving revision 3.141
+diff -u -r3.139.2.1 -r3.141
+--- xc/config/cf/Imake.tmpl 9 Feb 2004 01:58:52 -0000 3.139.2.1
++++ xc/config/cf/Imake.tmpl 19 Mar 2003 01:49:23 -0000 3.141
+@@ -5,7 +5,7 @@
+ XCOMM
+ XCOMM
+ XCOMM
+-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.139.2.1 2004/02/09 01:58:52 dawes Exp $
++XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $
+ XCOMM ----------------------------------------------------------------------
+
+ /*
+@@ -120,6 +120,10 @@
+ #define NothingOutsideProjectRoot NO
+ #endif
+
++#ifndef RemoveObsoleteFiles
++#define RemoveObsoleteFiles YES
++#endif
++
+ #ifndef HasVarDirectory
+ #define HasVarDirectory YES
+ #endif
+@@ -1427,6 +1431,11 @@
+ #ifndef NroffCmd
+ #define NroffCmd nroff
+ #endif
++#ifndef HTMLroffCmd
++#if HasGroff
++#define HTMLroffCmd groff -Thtml
++#endif
++#endif
+ #ifndef MsMacros
+ #define MsMacros -ms
+ #endif
+@@ -1454,6 +1463,15 @@
+ #ifndef LatexCmd
+ #define LatexCmd latex
+ #endif
++#ifndef GhostScriptCmd
++#define GhostScriptCmd gs
++#endif
++#ifndef HasGhostScript
++#define HasGhostScript NO
++#endif
++#if HasGhostScript
++#define PsToPdfCmd GhostScriptCmd -q -sOutputFile=- -sDEVICE=pdfwrite -dSAFER -dNOPAUSE -
++#endif
+ #if HasSentinel
+ #ifndef SentinelCmd
+ #define SentinelCmd sentinel
+@@ -1746,6 +1764,12 @@
+
+ TROFF = TroffCmd
+ NROFF = NroffCmd
++#ifdef HTMLroffCmd
++ HTMLROFF = HTMLroffCmd
++#endif
++#ifdef PsToPdfCmd
++ PSTOPDFCMD = PsToPdfCmd
++#endif
+ MSMACROS = MsMacros
+ MANMACROS = ManMacros
+ TBL = TblCmd
+Index: xc/config/cf/X11.tmpl
+===================================================================
+RCS file: /cvs/xc/config/cf/X11.tmpl,v
+retrieving revision 1.196
+retrieving revision 1.197
+diff -u -r1.196 -r1.197
+--- xc/config/cf/X11.tmpl 25 Feb 2003 21:57:52 -0000 1.196
++++ xc/config/cf/X11.tmpl 19 Mar 2003 01:49:24 -0000 1.197
+@@ -1415,6 +1415,9 @@
+ #ifndef DocPsDir
+ #define DocPsDir $(DOCDIR)/PostScript
+ #endif
++#ifndef DocPdfDir
++#define DocPdfDir $(DOCDIR)/PDF
++#endif
+ #ifndef FontDir
+ #define FontDir $(LIBDIR)/fonts
+ #endif
+@@ -1578,6 +1581,7 @@
+ DOCDIR = DocDir
+ DOCHTMLDIR = DocHtmlDir
+ DOCPSDIR = DocPsDir
++ DOCPDFDIR = DocPdfDir
+ FONTDIR = FontDir /* font directories */
+ ENCODINGSDIR = $(FONTDIR)/encodings /* font encodings directory */
+ XINITDIR = XinitDir /* xinit config files */
+@@ -3886,21 +3890,98 @@
+ #define PostProcessTroffPS(temp,real) $(MV) temp real
+ #endif
+
++/*
++ * PostProcessTroffHTML - by default moves the working output into place,
++ * but can be a hook for more complicated post-processing.
++ */
++#ifndef PostProcessTroffHTML
++#define PostProcessTroffHTML(temp,real) $(MV) temp real
++#endif
++
++#ifdef HTMLroffCmd
++#define HtmlTarget(file) file.html
++#define HtmlClean(file) file.nhtml file.html
++#else
++#define HtmlTarget(file) /**/
++#define HtmlClean(file) /**/
++#endif
++
++#ifdef PsToPdfCmd
++#define PdfTarget(file) file.pdf
++#define PdfClean(file) file.pdf
++#else
++#define PdfTarget(file) /**/
++#define PdfClean(file) /**/
++#endif
++
++#ifndef ConvertPsToPdf
++#define ConvertPsToPdf(file) @@\
++file.pdf: file.ps @@\
++ RemoveFile(file.pdf) @@\
++ $(PSTOPDFCMD) < file.ps > file.pdf
++#else
++#define ConvertPsToPdf(file) /**/
++#endif
++
++#ifndef MakeDepSimpleHtmlDoc
++#ifdef HTMLroffCmd
++#define MakeDepSimpleHtmlDoc(file,deps,srcs) @@\
++HtmlTarget(file): deps @@\
++ $(HTMLROFF) $(MSMACROS) $(XDOCMACROS) srcs \ @@\
++ 2> index.raw > file.nhtml \ @@\
++ && PostProcessTroffHTML(file.nhtml,$@)
++#else
++#define MakeDepSimpleHtmlDoc(file,deps,srcs) /**/
++#endif
++#endif
++
++#ifndef MakeTblHtmlDoc(file,srcs)
++#ifdef HTMLroffCmd
++#define MakeTblHtmlDoc(file,srcs) @@\
++file.html: srcs @@\
++ $(TBL) $(XDOCMACROS) srcs | $(HTMLROFF) $(MSMACROS) \ @@\
++ 2> index.raw > file.nhtml \ @@\
++ && PostProcessTroffHTML(file.nhtml,$@)
++#else
++#define MakeTblHtmlDoc(file,srcs) /**/
++#endif
++#endif
++
++#ifndef MakeEqnHtmlDoc(file,srcs)
++#ifdef HTMLroffCmd
++#define MakeEqnHtmlDoc(file,srcs) @@\
++file.html: srcs @@\
++ $(TBL) $(XDOCMACROS) srcs | $(EQN) | $(HTMLROFF) $(MSMACROS) \ @@\
++ 2> index.raw > file.nhtml \ @@\
++ && PostProcessTroffHTML(file.nhtml,$@)
++#else
++#define MakeEqnHtmlDoc(file,srcs) /**/
++#endif
++#endif
++
++
+ #ifndef MakeDepSimpleDoc
+ #define MakeDepSimpleDoc(file,deps,srcs) @@\
+-all:: file.PS file.txt @@\
+-.PRECIOUS: file.PS @@\
++all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\
++.PRECIOUS: file.ps @@\
+ @@\
+-file.PS: deps @@\
+- -$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > file.nPS \@@\
+- && PostProcessTroffPS(file.nPS,$@) @@\
+- @if grep '^[^1-9.]' index.raw; then exit 1; else test $$? -le 1; fi @@\
++file.ps: deps @@\
++ -$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs \ @@\
++ 2> index.raw > file.nps \ @@\
++ && PostProcessTroffPS(file.nps,$@) @@\
++ @if grep '^[^1-9.]' index.raw; then exit 1; \ @@\
++ else test $$? -le 1; fi @@\
+ @@\
+ file.txt: deps @@\
+- $(NROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\
++ $(NROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw | \ @@\
++ $(COL) $(COLFLAGS) > $@ @@\
++ @@\
++MakeDepSimpleHtmlDoc(file,deps,srcs) @@\
++ @@\
++ConvertPsToPdf(file) @@\
+ @@\
+ clean:: @@\
+- $(RM) index.raw file.nPS file.PS file.txt
++ $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file)
+ #endif
+
+ #ifndef MakeSimpleDoc
+@@ -3909,72 +3990,91 @@
+
+ #ifndef MakeTblDoc
+ #define MakeTblDoc(file,srcs) @@\
+-all:: file.PS file.txt @@\
+-.PRECIOUS: file.PS @@\
++all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\
++.PRECIOUS: file.ps @@\
+ @@\
+-file.PS: srcs @@\
+- -$(TBL) $(XDOCMACROS) srcs | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
+- && PostProcessTroffPS(file.nPS,$@) @@\
+- @if grep '^[^1-9.]' index.raw; then exit 1; else test $$? -le 1; fi @@\
++file.ps: srcs @@\
++ -$(TBL) $(XDOCMACROS) srcs | $(TROFF) $(MSMACROS) \ @@\
++ 2> index.raw > file.nps \ @@\
++ && PostProcessTroffPS(file.nps,$@) @@\
++ @if grep '^[^1-9.]' index.raw; then exit 1; \ @@\
++ else test $$? -le 1; fi @@\
+ @@\
+ file.txt: srcs @@\
+- $(TBL) $(XDOCMACROS) srcs | $(NROFF) $(MSMACROS) 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\
++ $(TBL) $(XDOCMACROS) srcs | $(NROFF) $(MSMACROS) 2> index.raw \ @@\
++ | $(COL) $(COLFLAGS) > $@ @@\
++ @@\
++MakeTblHtmlDoc(file,srcs) @@\
++ @@\
++ConvertPsToPdf(file) @@\
+ @@\
+ clean:: @@\
+- $(RM) index.raw file.nPS file.PS file.txt
++ $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file)
+ #endif
+
+ #ifndef MakeEqnDoc
+ #define MakeEqnDoc(file,srcs) @@\
+-all:: file.PS file.txt @@\
+-.PRECIOUS: file.PS @@\
++all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\
++.PRECIOUS: file.ps @@\
+ @@\
+-file.PS: srcs @@\
+- -$(TBL) $(XDOCMACROS) srcs | $(EQN) | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
+- && PostProcessTroffPS(file.nPS,$@) @@\
+- @if grep '^[^1-9.]' index.raw; then exit 1; else test $$? -le 1; fi @@\
++file.ps: srcs @@\
++ -$(TBL) $(XDOCMACROS) srcs | $(EQN) | $(TROFF) $(MSMACROS) \ @@\
++ 2> index.raw > file.nps \ @@\
++ && PostProcessTroffPS(file.nps,$@) @@\
++ @if grep '^[^1-9.]' index.raw; then exit 1; \ @@\
++ else test $$? -le 1; fi @@\
+ @@\
+ file.txt: srcs @@\
+- $(TBL) $(XDOCMACROS) srcs | $(NEQN) | $(NROFF) $(MSMACROS) 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\
++ $(TBL) $(XDOCMACROS) srcs | $(NEQN) | $(NROFF) $(MSMACROS) \ @@\
++ 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\
++ @@\
++MakeEqnHtmlDoc(file,srcs) @@\
++ @@\
++ConvertPsToPdf(file) @@\
+ @@\
+ clean:: @@\
+- $(RM) index.raw file.nPS file.PS file.txt
++ $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file)
+ #endif
+
+ #ifndef MakeDocIndex
+ #define MakeDocIndex(file,srcs) @@\
+-all:: file.idx.PS @@\
++all:: file.idx.ps @@\
+ @@\
+-file.idx.PS: srcs index.raw @@\
++file.idx.ps: srcs index.raw @@\
+ sed -n '$$p' index.raw > index.pageno @@\
+- grep '^[1-9]' index.raw | (sort -f '-t:' -k1,1n 2>/dev/null || sort -f '-t:' +1 -3 +0n -1n) | awk -f $(DOCUTILSRC)/fixindex.awk | awk -f $(DOCUTILSRC)/block.awk > index.troff @@\
+- cat srcs $(XIDXMACROS) index.troff | $(TROFF) -me > file.idx.nPS \@@\
+- && $(MV) file.idx.nPS $@ @@\
++ grep '^[1-9]' index.raw | \ @@\
++ (sort -f '-t:' -k1,1n 2>/dev/null || \ @@\
++ sort -f '-t:' +1 -3 +0n -1n) | \ @@\
++ awk -f $(DOCUTILSRC)/fixindex.awk | \ @@\
++ awk -f $(DOCUTILSRC)/block.awk > index.troff @@\
++ cat srcs $(XIDXMACROS) index.troff | \ @@\
++ $(TROFF) -me > file.idx.nps && \ @@\
++ $(MV) file.idx.nps $@ @@\
+ $(RM) index.troff index.pageno @@\
+ @@\
+ clean:: @@\
+- $(RM) index.troff index.pageno file.idx.nPS file.idx.PS
++ $(RM) index.troff index.pageno file.idx.nps file.idx.ps
+ #endif
+
+ #ifndef MakeLatexDoc
+ #if HasLatex
+ #define MakeLatexDoc(file,src) @@\
+-all:: file.PS @@\
++all:: file.ps @@\
+ @@\
+ file.dvi: src @@\
+ $(LATEX) src @@\
+ @@\
+-file.PS: file.dvi @@\
+- $(DVIPS) -o file.nPS file && $(MV) file.nPS $@ @@\
++file.ps: file.dvi @@\
++ $(DVIPS) -o file.nps file && $(MV) file.nps $@ @@\
+ @@\
+ clean:: @@\
+- RemoveFiles(file.nPS file.PS file.dvi file.log) @@\
++ RemoveFiles(file.nps file.ps file.dvi file.log) @@\
+ RemoveFiles(file.aux file.toc file.lof file.lot)
+ #else /* HasLatex */
+ #define MakeLatexDoc(file,src) @@\
+ all:: @@\
+-file.PS: src @@\
+- @echo "cannot make file.PS: no latex on this system"; exit 1
++file.ps: src @@\
++ @echo "cannot make file.ps: no latex on this system"; exit 1
+ #endif /* HasLatex (else) */
+ #endif /* MakeLatexDoc */
+
+@@ -3982,22 +4082,36 @@
+ #define InstallDoc(name,deps) @@\
+ install:: deps @@\
+ MakeDir($(DESTDIR)$(DOCPSDIR)) @@\
+- @if [ -f name.PS ]; then set -x; \ @@\
+- $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.PS $(DESTDIR)$(DOCPSDIR); \ @@\
++ @if [ -f name.ps -a X$(NOPS) = X ]; then set -x; \ @@\
++ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.ps \ @@\
++ $(DESTDIR)$(DOCPSDIR); \ @@\
+ fi @@\
++ RemoveOldFile(name.ps,name.PS,$(DOCPSDIR)) @@\
+ MakeDir($(DESTDIR)$(DOCDIR)) @@\
+- @if [ -f name.txt ]; then set -x; \ @@\
+- $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.txt $(DESTDIR)$(DOCDIR)/name.TXT; \ @@\
++ @if [ -f name.txt -a X$(NOTXT) = X ]; then set -x; \ @@\
++ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.txt \ @@\
++ $(DESTDIR)$(DOCDIR); \ @@\
++ fi @@\
++ RemoveOldFile(name.txt,name.TXT,$(DOCDIR)) @@\
++ MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\
++ @if [ -f name.html -a X$(NOHTML) = X ]; then set -x; \ @@\
++ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.html \ @@\
++ $(DESTDIR)$(DOCHTMLDIR); \ @@\
++ fi @@\
++ MakeDir($(DESTDIR)$(DOCPDFDIR)) @@\
++ @if [ -f name.pdf -a X$(NOPDF) = X ]; then set -x; \ @@\
++ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.pdf \ @@\
++ $(DESTDIR)$(DOCPDFDIR); \ @@\
+ fi
+ #endif
+
+ #ifndef InstallRoffDoc
+-#define InstallRoffDoc(name) InstallDoc(name,name.PS name.txt)
++#define InstallRoffDoc(name) InstallDoc(name,name.ps name.txt)
+ #endif
+
+ #ifndef InstallLatexDoc
+ #if HasLatex
+-#define InstallLatexDoc(name) InstallDoc(name,name.PS)
++#define InstallLatexDoc(name) InstallDoc(name,name.ps)
+ #else
+ #define InstallLatexDoc(name)
+ #endif
+@@ -4005,21 +4119,26 @@
+
+ #ifndef InstallHardcopyDoc
+ #define InstallHardcopyDoc(name,deps) @@\
+-all:: deps @@\
++all:: name.ps PdfTarget(name) @@\
++ @@\
++name.ps: deps @@\
+ @if [ -f name.PS.gz ]; then set -x; \ @@\
+- RemoveFile(name.PS); \ @@\
+- gzip -d < name.PS.gz > name.PS; \ @@\
++ RemoveFile(name.ps); \ @@\
++ gzip -d < name.PS.gz > name.ps; \ @@\
+ fi @@\
++ @if [ -f name.PS ]; then set -x; \ @@\
++ RemoveFile(name.ps); \ @@\
++ $(LN) name.PS name.ps; \ @@\
++ fi @@\
++ @@\
++ConvertPsToPdf(name) @@\
+ @@\
+ clean:: @@\
+- @if [ -f name.PS.gz ]; then set -x; \ @@\
+- RemoveFile(name.PS); \ @@\
+- fi @@\
++ $(RM) name.ps PdfClean(name) @@\
+ @@\
+ InstallDoc(name,deps)
+ #endif
+
+-
+ /*
+ * Rule for maintainers to use to updated generated copies of fonts in the
+ * source tree. Use with care.
+Index: xc/doc/hardcopy/XIE/XIEProto/Imakefile
+===================================================================
+RCS file: /cvs/xc/doc/hardcopy/XIE/XIEProto/Attic/Imakefile,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- xc/doc/hardcopy/XIE/XIEProto/Imakefile 14 Dec 2000 18:23:11 -0000 1.1
++++ xc/doc/hardcopy/XIE/XIEProto/Imakefile 19 Mar 2003 01:49:24 -0000 1.2
+@@ -1,6 +1,6 @@
+-XCOMM $XFree86: xc/doc/hardcopy/XIE/XIEProto/Imakefile,v 1.1 2000/12/14 18:23:11 dawes Exp $
++XCOMM $XFree86: xc/doc/hardcopy/XIE/XIEProto/Imakefile,v 1.2 2003/03/19 01:49:24 dawes Exp $
+
+-InstallHardcopyDoc(XIEProto,XIEProto.txt)
++InstallDoc(XIEProto,XIEProto.txt)
+ InstallHardcopyDoc(apa_xie,apa_xie.PS.gz)
+ InstallHardcopyDoc(apb_xie,apb_xie.PS.gz)
+ InstallHardcopyDoc(apc_xie,apc_xie.PS.gz)
+Index: xc/doc/specs/Imakefile
+===================================================================
+RCS file: /cvs/xc/doc/specs/Imakefile,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- xc/doc/specs/Imakefile 16 Jan 2002 18:36:00 -0000 1.8
++++ xc/doc/specs/Imakefile 19 Mar 2003 01:49:24 -0000 1.9
+@@ -3,7 +3,7 @@
+
+
+
+-XCOMM $XFree86: xc/doc/specs/Imakefile,v 1.8 2002/01/16 18:36:00 dawes Exp $
++XCOMM $XFree86: xc/doc/specs/Imakefile,v 1.9 2003/03/19 01:49:24 dawes Exp $
+
+ #define IHaveSubdirs
+ #define PassCDebugFlags
+@@ -20,3 +20,6 @@
+
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
++
++InstallDoc(specindex,specindex.html)
++
+Index: xc/doc/specs/programs/Imakefile
+===================================================================
+RCS file: /cvs/xc/doc/specs/programs/Imakefile,v
+retrieving revision 1.17
+retrieving revision 1.20
+diff -u -r1.17 -r1.20
+--- xc/doc/specs/programs/Imakefile 18 Feb 2003 03:01:42 -0000 1.17
++++ xc/doc/specs/programs/Imakefile 15 Apr 2003 06:07:18 -0000 1.20
+@@ -2,7 +2,7 @@
+
+
+
+-XCOMM $XFree86: xc/doc/specs/programs/Imakefile,v 1.17 2003/02/18 03:01:42 dawes Exp $
++XCOMM $XFree86: xc/doc/specs/programs/Imakefile,v 1.20 2003/04/15 06:07:18 herrb Exp $
+
+ /* does not include manual pages under util (not X programs)
+ or any of the library function manual pages under doc/man */
+@@ -85,6 +85,8 @@
+ $(TOP)/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man \
+ $(TOP)/programs/Xserver/hw/xfree86/doc/man/XF86VM.man
+
++EXTRA_MANUALS = \
++ $(TOP)/extras/rman/rman.1
+
+ MANUALS = \
+ $(TOP)/doc/man/general/X.man \
+@@ -137,7 +139,6 @@
+ $(TOP)/config/pswrap/pswrap.man \
+ $(TOP)/programs/xterm/resize.man \
+ $(TOP)/config/util/revpath.man \
+- $(TOP)/config/util/rman.man \
+ $(TOP)/programs/rstart/rstart.man \
+ $(TOP)/programs/rstart/rstartd.man \
+ $(TOP)/programs/xdm/sessreg.man \
+@@ -179,7 +180,6 @@
+ $(TOP)/programs/xgamma/xgamma.man \
+ $(TOP)/programs/xgc/xgc.man \
+ $(TOP)/programs/xhost/xhost.man \
+- $(TOP)/programs/xieperf/xieperf.man \
+ $(TOP)/programs/xinit/xinit.man \
+ $(TOP)/programs/xkbcomp/xkbcomp.man \
+ $(TOP)/programs/xkbevd/xkbevd.man \
+@@ -218,13 +218,15 @@
+ $(TOP)/programs/Xserver/hw/vfb/Xvfb.man \
+ $(TOP)/programs/xwd/xwd.man \
+ $(TOP)/programs/xwininfo/xwininfo.man \
+- $(TOP)/programs/xwud/xwud.man
+-
+-AllTarget(man.PS)
++ $(TOP)/programs/xwud/xwud.man \
++ $(EXTRA_MANUALS)
+
+ XCOMM Sun's -man macros use the D and C registers
+ MANUALFLAGS = -rD1 -rC1
+
++/* Don't install HTML version */
++NOHTML = y
++
+ man.$(MANSRCSUFFIX): $(MANUALS)
+ RemoveFile($@)
+ cat $(MANUALS) > $@
+@@ -233,8 +235,9 @@
+
+ CppManTarget(man,$(EXTRAMANDEFS))
+
+-man.PS: man.$(MANNEWSUFFIX)
+- $(TROFF) $(MANMACROS) $(MANUALFLAGS) man.$(MANNEWSUFFIX) > $@
++MSMACROS = $(MANMACROS) $(MANUALFLAGS)
++
++MakeSimpleDoc(man,man.$(MANNEWSUFFIX))
++
++InstallRoffDoc(man)
+
+-clean::
+- $(RM) man.PS man.$(MANSRCSUFFIX) man.$(MANNEWSUFFIX)
+Index: xc/doc/specs/xtrans/Imakefile
+===================================================================
+RCS file: /cvs/xc/doc/specs/xtrans/Imakefile,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- xc/doc/specs/xtrans/Imakefile 23 Apr 2001 15:54:00 -0000 1.2
++++ xc/doc/specs/xtrans/Imakefile 19 Mar 2003 01:49:25 -0000 1.3
+@@ -1,16 +1,9 @@
+-XCOMM $XFree86: xc/doc/specs/xtrans/Imakefile,v 1.2 2001/04/23 15:54:00 dawes Exp $
++XCOMM $XFree86: xc/doc/specs/xtrans/Imakefile,v 1.3 2003/03/19 01:49:25 dawes Exp $
+
+
+-all:: Xtrans.PS Xtrans.txt
++MSMACROS = -mm
+
+-Xtrans.txt:
+- $(TBL) Xtrans.mm | $(NROFF) -mm > Xtrans.txt
+-
+-Xtrans.PS:
+- $(TBL) Xtrans.mm | $(TROFF) -mm > Xtrans.PS
+-
+-clean::
+- $(RM) Xtrans.PS Xtrans.txt
++MakeSimpleDoc(Xtrans,Xtrans.mm)
+
+ InstallRoffDoc(Xtrans)
+
+Index: xc/extras/Xpm/sxpm/sxpm.man
+===================================================================
+RCS file: /cvs/xc/extras/Xpm/sxpm/sxpm.man,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -r1.1.1.1 -r1.2
+--- xc/extras/Xpm/sxpm/sxpm.man 11 Jan 1999 13:23:12 -0000 1.1.1.1
++++ xc/extras/Xpm/sxpm/sxpm.man 19 Mar 2003 01:49:25 -0000 1.2
+@@ -102,13 +102,13 @@
+ Do not use the clipmask if there is any.
+ .TP 8
+ .B \-sc \fIsymbol colorname\fP
+-Override default color to \fIsymbol\fP to \fIcolorname\fp.
++Override default color to \fIsymbol\fP to \fIcolorname\fP.
+ .TP 8
+ .B \-sp \fIsymbol pixelvalue\fP
+-Override default color to \fIsymbol\fP to \fIpixelvalue\fp.
++Override default color to \fIsymbol\fP to \fIpixelvalue\fP.
+ .TP 8
+ .B \-cp \fIcolorname pixelvalue\fP
+-Override default color to \fIcolorname\fP to \fIpixelvalue\fp.
++Override default color to \fIcolorname\fP to \fIpixelvalue\fP.
+ .TP 8
+ .B \-rgb \fIfilename\fP
+ Search color names in the file \fIfilename\fP and write them out instead of
+Index: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v
+retrieving revision 3.83
+retrieving revision 3.84
+diff -u -r3.83 -r3.84
+--- xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile 26 Feb 2003 21:59:44 -0000 3.83
++++ xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile 19 Mar 2003 01:49:28 -0000 3.84
+@@ -3,7 +3,7 @@
+
+
+
+-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.83 2003/02/26 21:59:44 dawes Exp $
++XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.84 2003/03/19 01:49:28 dawes Exp $
+
+ #include <Server.tmpl>
+ #include <lnxdoc.rules>
+@@ -142,8 +142,12 @@
+ HTMLMANDEFS=-DHTML_MANPAGES
+ #endif
+
++#if BuildSpecsDocs && defined(HTMLroffCmd)
++HTMLSPECDEFS=-DHTML_SPECS
++#endif
++
+ AllTarget(mdefs.ent)
+-CppRawFileTarget(mdefs.ent,mdefs.cpp,$(SGMLMANDEFS) $(HTMLMANDEFS),NullParameter)
++CppRawFileTarget(mdefs.ent,mdefs.cpp,$(SGMLMANDEFS) $(HTMLMANDEFS) $(HTMLSPECDEFS),NullParameter)
+
+ /* Generate the documentation index */
+ index.sgml: $(INDEXLIST) index.pre index.post add.sh Imakefile $(SGMLDEPENDS) $(MANSGMLDEPENDS)
+Index: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- xc/programs/Xserver/hw/xfree86/doc/sgml/index.post 21 Mar 2000 19:57:10 -0000 1.2
++++ xc/programs/Xserver/hw/xfree86/doc/sgml/index.post 19 Mar 2003 01:49:28 -0000 1.3
+@@ -14,9 +14,18 @@
+ <p>
+ ]]>
+
++<![ %specdocs; [
++<p>
++Other:
++<itemize>
++<item><htmlurl name="Specification and Related Documents" url="specindex.html">
++</itemize>
++<p>
++]]>
++
+
+ </article>
+
+ <!--
+-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v 1.2 2000/03/21 19:57:10 dawes Exp $
++$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v 1.3 2003/03/19 01:49:28 dawes Exp $
+ -->
+Index: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp 21 Mar 2000 19:57:11 -0000 1.1
++++ xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp 19 Mar 2003 01:49:28 -0000 1.2
+@@ -1,4 +1,4 @@
+-<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp,v 1.1 2000/03/21 19:57:11 dawes Exp $ -->
++<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp,v 1.2 2003/03/19 01:49:28 dawes Exp $ -->
+
+ <!-- entity definitions for man pages -->
+
+@@ -8,6 +8,12 @@
+ <!ENTITY % manpages 'IGNORE'>
+ #endif
+
++#ifdef HTML_SPECS
++<!ENTITY % specdocs 'INCLUDE'>
++#else
++<!ENTITY % specdocs 'IGNORE'>
++#endif
++
+ <!ENTITY drvsuffix CDATA __drivermansuffix__ >
+ <!ENTITY filesuffix CDATA __filemansuffix__ >
+ <!ENTITY miscsuffix CDATA __miscmansuffix__ >
+Index: xc/programs/ico/ico.man
+===================================================================
+RCS file: /cvs/xc/programs/ico/ico.man,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- xc/programs/ico/ico.man 27 Jan 2001 18:21:03 -0000 1.3
++++ xc/programs/ico/ico.man 19 Mar 2003 01:49:28 -0000 1.4
+@@ -1,5 +1,5 @@
+ .\" $XConsortium: ico.man,v 1.14 94/04/17 20:45:16 gildea Exp $
+-.\" $XFree86: xc/programs/ico/ico.man,v 1.3 2001/01/27 18:21:03 dawes Exp $
++.\" $XFree86: xc/programs/ico/ico.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
+ .TH ICO 1 __xorgversion__
+ .SH NAME
+ ico \- animate an icosahedron or other polyhedron
+@@ -87,6 +87,6 @@
+ when the same name may be specified twice. Color allocation fails in
+ TrueColor displays and option \fI-faces\fP does not work well.
+ .SH COPYRIGHT
+-Copyright ([\d,\s]*) X Consortium
++Copyright 1994 X Consortium
+ .br
+ See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
+Index: xc/programs/listres/listres.man
+===================================================================
+RCS file: /cvs/xc/programs/listres/listres.man,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- xc/programs/listres/listres.man 27 Jan 2001 18:21:04 -0000 1.3
++++ xc/programs/listres/listres.man 19 Mar 2003 01:49:28 -0000 1.4
+@@ -25,7 +25,7 @@
+ .\" other dealings in this Software without prior written authorization
+ .\" from the X Consortium.
+ .\"
+-.\" $XFree86: xc/programs/listres/listres.man,v 1.3 2001/01/27 18:21:04 dawes Exp $
++.\" $XFree86: xc/programs/listres/listres.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
+ .\"
+ .TH LISTRES 1 __xorgversion__
+ .SH NAME
+@@ -76,7 +76,7 @@
+ this program must have all of its known widgets compiled in. The sources
+ provide several tools for automating this process for various widget sets.
+ .SH COPYRIGHT
+-Copyright ([\d,\s]*) X Consortium
++Copyright 1994 X Consortium
+ .br
+ See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
+ .SH AUTHOR
+Index: xc/programs/viewres/viewres.man
+===================================================================
+RCS file: /cvs/xc/programs/viewres/viewres.man,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- xc/programs/viewres/viewres.man 27 Jan 2001 18:21:07 -0000 1.3
++++ xc/programs/viewres/viewres.man 19 Mar 2003 01:49:28 -0000 1.4
+@@ -25,7 +25,7 @@
+ .\" other dealings in this Software without prior written authorization
+ .\" from the X Consortium.
+ .\"
+-.\" $XFree86: xc/programs/viewres/viewres.man,v 1.3 2001/01/27 18:21:07 dawes Exp $
++.\" $XFree86: xc/programs/viewres/viewres.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
+ .\"
+ .TH VIEWRES 1 __xorgversion__
+ .SH NAME
+@@ -209,7 +209,7 @@
+ .SH "SEE ALSO"
+ X(__miscmansuffix__), xrdb(1), listres(1), editres(1), appres(1), appropriate widget documents
+ .SH COPYRIGHT
+-Copyright ([\d,\s]*) X Consortium
++Copyright 1994 X Consortium
+ .br
+ See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
+ .SH AUTHOR
+Index: xc/programs/xcalc/xcalc.man
+===================================================================
+RCS file: /cvs/xc/programs/xcalc/xcalc.man,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- xc/programs/xcalc/xcalc.man 12 Oct 2002 16:06:46 -0000 1.4
++++ xc/programs/xcalc/xcalc.man 19 Mar 2003 01:49:28 -0000 1.5
+@@ -25,7 +25,7 @@
+ .\" other dealings in this Software without prior written authorization
+ .\" from the X Consortium.
+ .\"
+-.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.4 2002/10/12 16:06:46 herrb Exp $
++.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.5 2003/03/19 01:49:28 dawes Exp $
+ .\"
+ .de EX \"Begin example
+ .ne 5
+@@ -428,7 +428,7 @@
+ HP mode: A bug report claims that the sequence of keys 5, ENTER, <-
+ should clear the display, but it doesn't.
+ .SH COPYRIGHT
+-Copyright ([\d,\s]*) X Consortium
++Copyright 1994 X Consortium
+ .br
+ See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
+ .SH AUTHORS
+Index: xc/programs/xditview/xditview.man
+===================================================================
+RCS file: /cvs/xc/programs/xditview/xditview.man,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- xc/programs/xditview/xditview.man 27 Jan 2001 18:21:10 -0000 1.3
++++ xc/programs/xditview/xditview.man 19 Mar 2003 01:49:28 -0000 1.4
+@@ -1,6 +1,6 @@
+ .\" $XConsortium: xditview.man,v 1.10 94/04/17 20:43:37 gildea Exp $
+ .\"
+-.\" $XFree86: xc/programs/xditview/xditview.man,v 1.3 2001/01/27 18:21:10 dawes Exp $
++.\" $XFree86: xc/programs/xditview/xditview.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
+ .\"
+ .TH XDITVIEW 1 __xorgversion__
+ .SH NAME
+@@ -162,7 +162,7 @@
+ from
+ .I suntroff.
+ .SH COPYRIGHT
+-Copyright ([\d,\s]*) X Consortium
++Copyright 1994 X Consortium
+ .br
+ See \fIX\fP(1) for a full statement of rights and permissions.
+ .SH AUTHORS
+Index: xc/programs/xrandr/xrandr.man
+===================================================================
+RCS file: /cvs/xc/programs/xrandr/xrandr.man,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- xc/programs/xrandr/xrandr.man 2 Oct 2002 16:58:05 -0000 1.4
++++ xc/programs/xrandr/xrandr.man 19 Mar 2003 01:49:29 -0000 1.5
+@@ -20,7 +20,7 @@
+ .\" PERFORMANCE OF THIS SOFTWARE.
+ .\"
+ .\"
+-.\" $XFree86: xc/programs/xrandr/xrandr.man,v 1.4 2002/10/02 16:58:05 keithp Exp $
++.\" $XFree86: xc/programs/xrandr/xrandr.man,v 1.5 2003/03/19 01:49:29 dawes Exp $
+ .\"
+ .TH XRANDR 1 "Version 1.0" "XFree86"
+ .SH NAME
+@@ -49,7 +49,7 @@
+ .I -o
+ option is used to specify the orientation of the screen,
+ and can be one of
+-\f"Inormal inverted left right 0 1 2 3"\fP.
++\fI"normal inverted left right 0 1 2 3"\fP.
+ .PP
+ The
+ .I -x
Deleted: trunk/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff 2004-05-13 18:44:38 UTC (rev 1402)
+++ trunk/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff 2004-05-13 19:54:32 UTC (rev 1403)
@@ -1,731 +0,0 @@
-$Id$
-
-A number of documentation fixes from upstream, including:
- * Lower-case file extensions, e.g. .ps instead of .PS.
- * New HTML and PostScript documentation (and PDF, seemingly).
- * A few manpage cleanups.
-
-diff -urN xc.orig/config/cf/Imake.rules xc/config/cf/Imake.rules
---- xc.orig/config/cf/Imake.rules 2002-12-10 10:00:42.000000000 +1100
-+++ xc/config/cf/Imake.rules 2003-04-09 04:43:11.000000000 +1000
-@@ -5,7 +5,7 @@
- XCOMM
- XCOMM
- XCOMM
--XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.113 2002/12/09 23:00:42 dawes Exp $
-+XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.114 2003/03/19 01:49:23 dawes Exp $
-
- /*
- * MACHINE-INDEPENDENT RULES; DO NOT MODIFY
-@@ -338,6 +338,15 @@
- #define RemoveFiles(files) $(RM) files
- #endif /* RemoveFiles */
-
-+#if RemoveObsoleteFiles
-+#define RemoveOldFile(new,old,dir) @@\
-+ @if [ -f new ]; then set -x; \ @@\
-+ RemoveFile($(DESTDIR)dir/old); \ @@\
-+ fi
-+#else
-+#define RemoveOldFile(new,old,dir) $(_NULLCMD_)
-+#endif
-+
- /*
- * CenterLoadTarget - generate rules to load files into CodeCenter
- */
---- xc/config/cf/Imake.tmpl.orig 2004-02-09 15:25:36.000000000 -0500
-+++ xc/config/cf/Imake.tmpl 2004-02-09 15:25:51.000000000 -0500
-@@ -5,7 +5,7 @@
- XCOMM
- XCOMM
- XCOMM
--XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.139.2.1 2004/02/09 01:58:52 dawes Exp $
-+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $
- XCOMM ----------------------------------------------------------------------
-
- /*
-@@ -120,6 +120,10 @@
- #define NothingOutsideProjectRoot NO
- #endif
-
-+#ifndef RemoveObsoleteFiles
-+#define RemoveObsoleteFiles YES
-+#endif
-+
- #ifndef HasVarDirectory
- #define HasVarDirectory YES
- #endif
-@@ -1427,6 +1431,11 @@
- #ifndef NroffCmd
- #define NroffCmd nroff
- #endif
-+#ifndef HTMLroffCmd
-+#if HasGroff
-+#define HTMLroffCmd groff -Thtml
-+#endif
-+#endif
- #ifndef MsMacros
- #define MsMacros -ms
- #endif
-@@ -1454,6 +1463,15 @@
- #ifndef LatexCmd
- #define LatexCmd latex
- #endif
-+#ifndef GhostScriptCmd
-+#define GhostScriptCmd gs
-+#endif
-+#ifndef HasGhostScript
-+#define HasGhostScript NO
-+#endif
-+#if HasGhostScript
-+#define PsToPdfCmd GhostScriptCmd -q -sOutputFile=- -sDEVICE=pdfwrite -dSAFER -dNOPAUSE -
-+#endif
- #if HasSentinel
- #ifndef SentinelCmd
- #define SentinelCmd sentinel
-@@ -1746,6 +1764,12 @@
-
- TROFF = TroffCmd
- NROFF = NroffCmd
-+#ifdef HTMLroffCmd
-+ HTMLROFF = HTMLroffCmd
-+#endif
-+#ifdef PsToPdfCmd
-+ PSTOPDFCMD = PsToPdfCmd
-+#endif
- MSMACROS = MsMacros
- MANMACROS = ManMacros
- TBL = TblCmd
-diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc.orig/config/cf/X11.tmpl 2003-10-11 01:00:44.000000000 -0500
-+++ xc/config/cf/X11.tmpl 2003-10-11 01:00:52.000000000 -0500
-@@ -1415,6 +1415,9 @@
- #ifndef DocPsDir
- #define DocPsDir $(DOCDIR)/PostScript
- #endif
-+#ifndef DocPdfDir
-+#define DocPdfDir $(DOCDIR)/PDF
-+#endif
- #ifndef FontDir
- #define FontDir $(LIBDIR)/fonts
- #endif
-@@ -1578,6 +1581,7 @@
- DOCDIR = DocDir
- DOCHTMLDIR = DocHtmlDir
- DOCPSDIR = DocPsDir
-+ DOCPDFDIR = DocPdfDir
- FONTDIR = FontDir /* font directories */
- ENCODINGSDIR = $(FONTDIR)/encodings /* font encodings directory */
- XINITDIR = XinitDir /* xinit config files */
-@@ -3886,21 +3890,98 @@
- #define PostProcessTroffPS(temp,real) $(MV) temp real
- #endif
-
-+/*
-+ * PostProcessTroffHTML - by default moves the working output into place,
-+ * but can be a hook for more complicated post-processing.
-+ */
-+#ifndef PostProcessTroffHTML
-+#define PostProcessTroffHTML(temp,real) $(MV) temp real
-+#endif
-+
-+#ifdef HTMLroffCmd
-+#define HtmlTarget(file) file.html
-+#define HtmlClean(file) file.nhtml file.html
-+#else
-+#define HtmlTarget(file) /**/
-+#define HtmlClean(file) /**/
-+#endif
-+
-+#ifdef PsToPdfCmd
-+#define PdfTarget(file) file.pdf
-+#define PdfClean(file) file.pdf
-+#else
-+#define PdfTarget(file) /**/
-+#define PdfClean(file) /**/
-+#endif
-+
-+#ifndef ConvertPsToPdf
-+#define ConvertPsToPdf(file) @@\
-+file.pdf: file.ps @@\
-+ RemoveFile(file.pdf) @@\
-+ $(PSTOPDFCMD) < file.ps > file.pdf
-+#else
-+#define ConvertPsToPdf(file) /**/
-+#endif
-+
-+#ifndef MakeDepSimpleHtmlDoc
-+#ifdef HTMLroffCmd
-+#define MakeDepSimpleHtmlDoc(file,deps,srcs) @@\
-+HtmlTarget(file): deps @@\
-+ $(HTMLROFF) $(MSMACROS) $(XDOCMACROS) srcs \ @@\
-+ 2> index.raw > file.nhtml \ @@\
-+ && PostProcessTroffHTML(file.nhtml,$@)
-+#else
-+#define MakeDepSimpleHtmlDoc(file,deps,srcs) /**/
-+#endif
-+#endif
-+
-+#ifndef MakeTblHtmlDoc(file,srcs)
-+#ifdef HTMLroffCmd
-+#define MakeTblHtmlDoc(file,srcs) @@\
-+file.html: srcs @@\
-+ $(TBL) $(XDOCMACROS) srcs | $(HTMLROFF) $(MSMACROS) \ @@\
-+ 2> index.raw > file.nhtml \ @@\
-+ && PostProcessTroffHTML(file.nhtml,$@)
-+#else
-+#define MakeTblHtmlDoc(file,srcs) /**/
-+#endif
-+#endif
-+
-+#ifndef MakeEqnHtmlDoc(file,srcs)
-+#ifdef HTMLroffCmd
-+#define MakeEqnHtmlDoc(file,srcs) @@\
-+file.html: srcs @@\
-+ $(TBL) $(XDOCMACROS) srcs | $(EQN) | $(HTMLROFF) $(MSMACROS) \ @@\
-+ 2> index.raw > file.nhtml \ @@\
-+ && PostProcessTroffHTML(file.nhtml,$@)
-+#else
-+#define MakeEqnHtmlDoc(file,srcs) /**/
-+#endif
-+#endif
-+
-+
- #ifndef MakeDepSimpleDoc
- #define MakeDepSimpleDoc(file,deps,srcs) @@\
--all:: file.PS file.txt @@\
--.PRECIOUS: file.PS @@\
-+all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\
-+.PRECIOUS: file.ps @@\
- @@\
--file.PS: deps @@\
-- -$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > file.nPS \@@\
-- && PostProcessTroffPS(file.nPS,$@) @@\
-- @if grep '^[^1-9.]' index.raw; then exit 1; else test $$? -le 1; fi @@\
-+file.ps: deps @@\
-+ -$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs \ @@\
-+ 2> index.raw > file.nps \ @@\
-+ && PostProcessTroffPS(file.nps,$@) @@\
-+ @if grep '^[^1-9.]' index.raw; then exit 1; \ @@\
-+ else test $$? -le 1; fi @@\
- @@\
- file.txt: deps @@\
-- $(NROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\
-+ $(NROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw | \ @@\
-+ $(COL) $(COLFLAGS) > $@ @@\
-+ @@\
-+MakeDepSimpleHtmlDoc(file,deps,srcs) @@\
-+ @@\
-+ConvertPsToPdf(file) @@\
- @@\
- clean:: @@\
-- $(RM) index.raw file.nPS file.PS file.txt
-+ $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file)
- #endif
-
- #ifndef MakeSimpleDoc
-@@ -3909,72 +3990,91 @@
-
- #ifndef MakeTblDoc
- #define MakeTblDoc(file,srcs) @@\
--all:: file.PS file.txt @@\
--.PRECIOUS: file.PS @@\
-+all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\
-+.PRECIOUS: file.ps @@\
- @@\
--file.PS: srcs @@\
-- -$(TBL) $(XDOCMACROS) srcs | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
-- && PostProcessTroffPS(file.nPS,$@) @@\
-- @if grep '^[^1-9.]' index.raw; then exit 1; else test $$? -le 1; fi @@\
-+file.ps: srcs @@\
-+ -$(TBL) $(XDOCMACROS) srcs | $(TROFF) $(MSMACROS) \ @@\
-+ 2> index.raw > file.nps \ @@\
-+ && PostProcessTroffPS(file.nps,$@) @@\
-+ @if grep '^[^1-9.]' index.raw; then exit 1; \ @@\
-+ else test $$? -le 1; fi @@\
- @@\
- file.txt: srcs @@\
-- $(TBL) $(XDOCMACROS) srcs | $(NROFF) $(MSMACROS) 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\
-+ $(TBL) $(XDOCMACROS) srcs | $(NROFF) $(MSMACROS) 2> index.raw \ @@\
-+ | $(COL) $(COLFLAGS) > $@ @@\
-+ @@\
-+MakeTblHtmlDoc(file,srcs) @@\
-+ @@\
-+ConvertPsToPdf(file) @@\
- @@\
- clean:: @@\
-- $(RM) index.raw file.nPS file.PS file.txt
-+ $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file)
- #endif
-
- #ifndef MakeEqnDoc
- #define MakeEqnDoc(file,srcs) @@\
--all:: file.PS file.txt @@\
--.PRECIOUS: file.PS @@\
-+all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\
-+.PRECIOUS: file.ps @@\
- @@\
--file.PS: srcs @@\
-- -$(TBL) $(XDOCMACROS) srcs | $(EQN) | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
-- && PostProcessTroffPS(file.nPS,$@) @@\
-- @if grep '^[^1-9.]' index.raw; then exit 1; else test $$? -le 1; fi @@\
-+file.ps: srcs @@\
-+ -$(TBL) $(XDOCMACROS) srcs | $(EQN) | $(TROFF) $(MSMACROS) \ @@\
-+ 2> index.raw > file.nps \ @@\
-+ && PostProcessTroffPS(file.nps,$@) @@\
-+ @if grep '^[^1-9.]' index.raw; then exit 1; \ @@\
-+ else test $$? -le 1; fi @@\
- @@\
- file.txt: srcs @@\
-- $(TBL) $(XDOCMACROS) srcs | $(NEQN) | $(NROFF) $(MSMACROS) 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\
-+ $(TBL) $(XDOCMACROS) srcs | $(NEQN) | $(NROFF) $(MSMACROS) \ @@\
-+ 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\
-+ @@\
-+MakeEqnHtmlDoc(file,srcs) @@\
-+ @@\
-+ConvertPsToPdf(file) @@\
- @@\
- clean:: @@\
-- $(RM) index.raw file.nPS file.PS file.txt
-+ $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file)
- #endif
-
- #ifndef MakeDocIndex
- #define MakeDocIndex(file,srcs) @@\
--all:: file.idx.PS @@\
-+all:: file.idx.ps @@\
- @@\
--file.idx.PS: srcs index.raw @@\
-+file.idx.ps: srcs index.raw @@\
- sed -n '$$p' index.raw > index.pageno @@\
-- grep '^[1-9]' index.raw | (sort -f '-t:' -k1,1n 2>/dev/null || sort -f '-t:' +1 -3 +0n -1n) | awk -f $(DOCUTILSRC)/fixindex.awk | awk -f $(DOCUTILSRC)/block.awk > index.troff @@\
-- cat srcs $(XIDXMACROS) index.troff | $(TROFF) -me > file.idx.nPS \@@\
-- && $(MV) file.idx.nPS $@ @@\
-+ grep '^[1-9]' index.raw | \ @@\
-+ (sort -f '-t:' -k1,1n 2>/dev/null || \ @@\
-+ sort -f '-t:' +1 -3 +0n -1n) | \ @@\
-+ awk -f $(DOCUTILSRC)/fixindex.awk | \ @@\
-+ awk -f $(DOCUTILSRC)/block.awk > index.troff @@\
-+ cat srcs $(XIDXMACROS) index.troff | \ @@\
-+ $(TROFF) -me > file.idx.nps && \ @@\
-+ $(MV) file.idx.nps $@ @@\
- $(RM) index.troff index.pageno @@\
- @@\
- clean:: @@\
-- $(RM) index.troff index.pageno file.idx.nPS file.idx.PS
-+ $(RM) index.troff index.pageno file.idx.nps file.idx.ps
- #endif
-
- #ifndef MakeLatexDoc
- #if HasLatex
- #define MakeLatexDoc(file,src) @@\
--all:: file.PS @@\
-+all:: file.ps @@\
- @@\
- file.dvi: src @@\
- $(LATEX) src @@\
- @@\
--file.PS: file.dvi @@\
-- $(DVIPS) -o file.nPS file && $(MV) file.nPS $@ @@\
-+file.ps: file.dvi @@\
-+ $(DVIPS) -o file.nps file && $(MV) file.nps $@ @@\
- @@\
- clean:: @@\
-- RemoveFiles(file.nPS file.PS file.dvi file.log) @@\
-+ RemoveFiles(file.nps file.ps file.dvi file.log) @@\
- RemoveFiles(file.aux file.toc file.lof file.lot)
- #else /* HasLatex */
- #define MakeLatexDoc(file,src) @@\
- all:: @@\
--file.PS: src @@\
-- @echo "cannot make file.PS: no latex on this system"; exit 1
-+file.ps: src @@\
-+ @echo "cannot make file.ps: no latex on this system"; exit 1
- #endif /* HasLatex (else) */
- #endif /* MakeLatexDoc */
-
-@@ -3982,22 +4082,36 @@
- #define InstallDoc(name,deps) @@\
- install:: deps @@\
- MakeDir($(DESTDIR)$(DOCPSDIR)) @@\
-- @if [ -f name.PS ]; then set -x; \ @@\
-- $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.PS $(DESTDIR)$(DOCPSDIR); \ @@\
-+ @if [ -f name.ps -a X$(NOPS) = X ]; then set -x; \ @@\
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.ps \ @@\
-+ $(DESTDIR)$(DOCPSDIR); \ @@\
- fi @@\
-+ RemoveOldFile(name.ps,name.PS,$(DOCPSDIR)) @@\
- MakeDir($(DESTDIR)$(DOCDIR)) @@\
-- @if [ -f name.txt ]; then set -x; \ @@\
-- $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.txt $(DESTDIR)$(DOCDIR)/name.TXT; \ @@\
-+ @if [ -f name.txt -a X$(NOTXT) = X ]; then set -x; \ @@\
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.txt \ @@\
-+ $(DESTDIR)$(DOCDIR); \ @@\
-+ fi @@\
-+ RemoveOldFile(name.txt,name.TXT,$(DOCDIR)) @@\
-+ MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\
-+ @if [ -f name.html -a X$(NOHTML) = X ]; then set -x; \ @@\
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.html \ @@\
-+ $(DESTDIR)$(DOCHTMLDIR); \ @@\
-+ fi @@\
-+ MakeDir($(DESTDIR)$(DOCPDFDIR)) @@\
-+ @if [ -f name.pdf -a X$(NOPDF) = X ]; then set -x; \ @@\
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.pdf \ @@\
-+ $(DESTDIR)$(DOCPDFDIR); \ @@\
- fi
- #endif
-
- #ifndef InstallRoffDoc
--#define InstallRoffDoc(name) InstallDoc(name,name.PS name.txt)
-+#define InstallRoffDoc(name) InstallDoc(name,name.ps name.txt)
- #endif
-
- #ifndef InstallLatexDoc
- #if HasLatex
--#define InstallLatexDoc(name) InstallDoc(name,name.PS)
-+#define InstallLatexDoc(name) InstallDoc(name,name.ps)
- #else
- #define InstallLatexDoc(name)
- #endif
-@@ -4005,21 +4119,26 @@
-
- #ifndef InstallHardcopyDoc
- #define InstallHardcopyDoc(name,deps) @@\
--all:: deps @@\
-+all:: name.ps PdfTarget(name) @@\
-+ @@\
-+name.ps: deps @@\
- @if [ -f name.PS.gz ]; then set -x; \ @@\
-- RemoveFile(name.PS); \ @@\
-- gzip -d < name.PS.gz > name.PS; \ @@\
-+ RemoveFile(name.ps); \ @@\
-+ gzip -d < name.PS.gz > name.ps; \ @@\
- fi @@\
-+ @if [ -f name.PS ]; then set -x; \ @@\
-+ RemoveFile(name.ps); \ @@\
-+ $(LN) name.PS name.ps; \ @@\
-+ fi @@\
-+ @@\
-+ConvertPsToPdf(name) @@\
- @@\
- clean:: @@\
-- @if [ -f name.PS.gz ]; then set -x; \ @@\
-- RemoveFile(name.PS); \ @@\
-- fi @@\
-+ $(RM) name.ps PdfClean(name) @@\
- @@\
- InstallDoc(name,deps)
- #endif
-
--
- /*
- * Rule for maintainers to use to updated generated copies of fonts in the
- * source tree. Use with care.
-diff -urN xc.orig/doc/hardcopy/XIE/XIEProto/Imakefile xc/doc/hardcopy/XIE/XIEProto/Imakefile
---- xc.orig/doc/hardcopy/XIE/XIEProto/Imakefile 2000-12-15 05:23:11.000000000 +1100
-+++ xc/doc/hardcopy/XIE/XIEProto/Imakefile 2003-04-09 04:43:11.000000000 +1000
-@@ -1,6 +1,6 @@
--XCOMM $XFree86: xc/doc/hardcopy/XIE/XIEProto/Imakefile,v 1.1 2000/12/14 18:23:11 dawes Exp $
-+XCOMM $XFree86: xc/doc/hardcopy/XIE/XIEProto/Imakefile,v 1.2 2003/03/19 01:49:24 dawes Exp $
-
--InstallHardcopyDoc(XIEProto,XIEProto.txt)
-+InstallDoc(XIEProto,XIEProto.txt)
- InstallHardcopyDoc(apa_xie,apa_xie.PS.gz)
- InstallHardcopyDoc(apb_xie,apb_xie.PS.gz)
- InstallHardcopyDoc(apc_xie,apc_xie.PS.gz)
-diff -urN xc.orig/doc/specs/Imakefile xc/doc/specs/Imakefile
---- xc.orig/doc/specs/Imakefile 2002-01-17 05:36:00.000000000 +1100
-+++ xc/doc/specs/Imakefile 2003-04-09 04:43:11.000000000 +1000
-@@ -3,7 +3,7 @@
-
-
-
--XCOMM $XFree86: xc/doc/specs/Imakefile,v 1.8 2002/01/16 18:36:00 dawes Exp $
-+XCOMM $XFree86: xc/doc/specs/Imakefile,v 1.9 2003/03/19 01:49:24 dawes Exp $
-
- #define IHaveSubdirs
- #define PassCDebugFlags
-@@ -20,3 +20,6 @@
-
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
-+
-+InstallDoc(specindex,specindex.html)
-+
-diff -urN xc.orig/doc/specs/programs/Imakefile xc/doc/specs/programs/Imakefile
---- xc.orig/doc/specs/programs/Imakefile 2003-02-27 17:34:05.000000000 +1100
-+++ xc/doc/specs/programs/Imakefile 2003-04-09 04:43:11.000000000 +1000
-@@ -2,7 +2,7 @@
-
-
-
--XCOMM $XFree86: xc/doc/specs/programs/Imakefile,v 1.17 2003/02/18 03:01:42 dawes Exp $
-+XCOMM $XFree86: xc/doc/specs/programs/Imakefile,v 1.18 2003/03/19 01:49:24 dawes Exp $
-
- /* does not include manual pages under util (not X programs)
- or any of the library function manual pages under doc/man */
-@@ -220,11 +220,12 @@
- $(TOP)/programs/xwininfo/xwininfo.man \
- $(TOP)/programs/xwud/xwud.man
-
--AllTarget(man.PS)
--
- XCOMM Sun's -man macros use the D and C registers
- MANUALFLAGS = -rD1 -rC1
-
-+/* Don't install HTML version */
-+NOHTML = y
-+
- man.$(MANSRCSUFFIX): $(MANUALS)
- RemoveFile($@)
- cat $(MANUALS) > $@
-@@ -233,8 +234,9 @@
-
- CppManTarget(man,$(EXTRAMANDEFS))
-
--man.PS: man.$(MANNEWSUFFIX)
-- $(TROFF) $(MANMACROS) $(MANUALFLAGS) man.$(MANNEWSUFFIX) > $@
-+MSMACROS = $(MANMACROS) $(MANUALFLAGS)
-+
-+MakeSimpleDoc(man,man.$(MANNEWSUFFIX))
-+
-+InstallRoffDoc(man)
-
--clean::
-- $(RM) man.PS man.$(MANSRCSUFFIX) man.$(MANNEWSUFFIX)
-diff -urN xc.orig/doc/specs/xtrans/Imakefile xc/doc/specs/xtrans/Imakefile
---- xc.orig/doc/specs/xtrans/Imakefile 2001-04-24 01:54:00.000000000 +1000
-+++ xc/doc/specs/xtrans/Imakefile 2003-04-09 04:43:11.000000000 +1000
-@@ -1,16 +1,9 @@
--XCOMM $XFree86: xc/doc/specs/xtrans/Imakefile,v 1.2 2001/04/23 15:54:00 dawes Exp $
-+XCOMM $XFree86: xc/doc/specs/xtrans/Imakefile,v 1.3 2003/03/19 01:49:25 dawes Exp $
-
-
--all:: Xtrans.PS Xtrans.txt
-+MSMACROS = -mm
-
--Xtrans.txt:
-- $(TBL) Xtrans.mm | $(NROFF) -mm > Xtrans.txt
--
--Xtrans.PS:
-- $(TBL) Xtrans.mm | $(TROFF) -mm > Xtrans.PS
--
--clean::
-- $(RM) Xtrans.PS Xtrans.txt
-+MakeSimpleDoc(Xtrans,Xtrans.mm)
-
- InstallRoffDoc(Xtrans)
-
-diff -urN xc.orig/extras/Xpm/sxpm/sxpm.man xc/extras/Xpm/sxpm/sxpm.man
---- xc.orig/extras/Xpm/sxpm/sxpm.man 1999-01-12 00:23:12.000000000 +1100
-+++ xc/extras/Xpm/sxpm/sxpm.man 2003-04-09 04:43:11.000000000 +1000
-@@ -102,13 +102,13 @@
- Do not use the clipmask if there is any.
- .TP 8
- .B \-sc \fIsymbol colorname\fP
--Override default color to \fIsymbol\fP to \fIcolorname\fp.
-+Override default color to \fIsymbol\fP to \fIcolorname\fP.
- .TP 8
- .B \-sp \fIsymbol pixelvalue\fP
--Override default color to \fIsymbol\fP to \fIpixelvalue\fp.
-+Override default color to \fIsymbol\fP to \fIpixelvalue\fP.
- .TP 8
- .B \-cp \fIcolorname pixelvalue\fP
--Override default color to \fIcolorname\fP to \fIpixelvalue\fp.
-+Override default color to \fIcolorname\fP to \fIpixelvalue\fP.
- .TP 8
- .B \-rgb \fIfilename\fP
- Search color names in the file \fIfilename\fP and write them out instead of
-diff -urN xc.orig/programs/Xserver/hw/xfree86/doc/sgml/Imakefile xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
---- xc.orig/programs/Xserver/hw/xfree86/doc/sgml/Imakefile 2003-02-27 08:59:44.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile 2003-04-09 04:43:11.000000000 +1000
-@@ -3,7 +3,7 @@
-
-
-
--XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.83 2003/02/26 21:59:44 dawes Exp $
-+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.84 2003/03/19 01:49:28 dawes Exp $
-
- #include <Server.tmpl>
- #include <lnxdoc.rules>
-@@ -142,8 +142,12 @@
- HTMLMANDEFS=-DHTML_MANPAGES
- #endif
-
-+#if BuildSpecsDocs && defined(HTMLroffCmd)
-+HTMLSPECDEFS=-DHTML_SPECS
-+#endif
-+
- AllTarget(mdefs.ent)
--CppRawFileTarget(mdefs.ent,mdefs.cpp,$(SGMLMANDEFS) $(HTMLMANDEFS),NullParameter)
-+CppRawFileTarget(mdefs.ent,mdefs.cpp,$(SGMLMANDEFS) $(HTMLMANDEFS) $(HTMLSPECDEFS),NullParameter)
-
- /* Generate the documentation index */
- index.sgml: $(INDEXLIST) index.pre index.post add.sh Imakefile $(SGMLDEPENDS) $(MANSGMLDEPENDS)
-diff -urN xc.orig/programs/Xserver/hw/xfree86/doc/sgml/index.post xc/programs/Xserver/hw/xfree86/doc/sgml/index.post
---- xc.orig/programs/Xserver/hw/xfree86/doc/sgml/index.post 2000-03-22 06:57:10.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/doc/sgml/index.post 2003-04-09 04:43:11.000000000 +1000
-@@ -14,9 +14,18 @@
- <p>
- ]]>
-
-+<![ %specdocs; [
-+<p>
-+Other:
-+<itemize>
-+<item><htmlurl name="Specification and Related Documents" url="specindex.html">
-+</itemize>
-+<p>
-+]]>
-+
-
- </article>
-
- <!--
--$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v 1.2 2000/03/21 19:57:10 dawes Exp $
-+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v 1.3 2003/03/19 01:49:28 dawes Exp $
- -->
-diff -urN xc.orig/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp
---- xc.orig/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp 2000-03-22 06:57:11.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp 2003-04-09 04:43:11.000000000 +1000
-@@ -1,4 +1,4 @@
--<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp,v 1.1 2000/03/21 19:57:11 dawes Exp $ -->
-+<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp,v 1.2 2003/03/19 01:49:28 dawes Exp $ -->
-
- <!-- entity definitions for man pages -->
-
-@@ -8,6 +8,12 @@
- <!ENTITY % manpages 'IGNORE'>
- #endif
-
-+#ifdef HTML_SPECS
-+<!ENTITY % specdocs 'INCLUDE'>
-+#else
-+<!ENTITY % specdocs 'IGNORE'>
-+#endif
-+
- <!ENTITY drvsuffix CDATA __drivermansuffix__ >
- <!ENTITY filesuffix CDATA __filemansuffix__ >
- <!ENTITY miscsuffix CDATA __miscmansuffix__ >
-diff -urN xc.orig/programs/ico/ico.man xc/programs/ico/ico.man
---- xc.orig/programs/ico/ico.man 2001-01-28 05:21:03.000000000 +1100
-+++ xc/programs/ico/ico.man 2003-04-09 04:43:11.000000000 +1000
-@@ -1,5 +1,5 @@
- .\" $XConsortium: ico.man,v 1.14 94/04/17 20:45:16 gildea Exp $
--.\" $XFree86: xc/programs/ico/ico.man,v 1.3 2001/01/27 18:21:03 dawes Exp $
-+.\" $XFree86: xc/programs/ico/ico.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
- .TH ICO 1 __xorgversion__
- .SH NAME
- ico \- animate an icosahedron or other polyhedron
-@@ -87,6 +87,6 @@
- when the same name may be specified twice. Color allocation fails in
- TrueColor displays and option \fI-faces\fP does not work well.
- .SH COPYRIGHT
--Copyright ([\d,\s]*) X Consortium
-+Copyright 1994 X Consortium
- .br
- See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
-diff -urN xc.orig/programs/listres/listres.man xc/programs/listres/listres.man
---- xc.orig/programs/listres/listres.man 2001-01-28 05:21:04.000000000 +1100
-+++ xc/programs/listres/listres.man 2003-04-09 04:43:11.000000000 +1000
-@@ -25,7 +25,7 @@
- .\" other dealings in this Software without prior written authorization
- .\" from the X Consortium.
- .\"
--.\" $XFree86: xc/programs/listres/listres.man,v 1.3 2001/01/27 18:21:04 dawes Exp $
-+.\" $XFree86: xc/programs/listres/listres.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
- .\"
- .TH LISTRES 1 __xorgversion__
- .SH NAME
-@@ -76,7 +76,7 @@
- this program must have all of its known widgets compiled in. The sources
- provide several tools for automating this process for various widget sets.
- .SH COPYRIGHT
--Copyright ([\d,\s]*) X Consortium
-+Copyright 1994 X Consortium
- .br
- See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
- .SH AUTHOR
-diff -urN xc.orig/programs/viewres/viewres.man xc/programs/viewres/viewres.man
---- xc.orig/programs/viewres/viewres.man 2001-01-28 05:21:07.000000000 +1100
-+++ xc/programs/viewres/viewres.man 2003-04-09 04:43:11.000000000 +1000
-@@ -25,7 +25,7 @@
- .\" other dealings in this Software without prior written authorization
- .\" from the X Consortium.
- .\"
--.\" $XFree86: xc/programs/viewres/viewres.man,v 1.3 2001/01/27 18:21:07 dawes Exp $
-+.\" $XFree86: xc/programs/viewres/viewres.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
- .\"
- .TH VIEWRES 1 __xorgversion__
- .SH NAME
-@@ -209,7 +209,7 @@
- .SH "SEE ALSO"
- X(__miscmansuffix__), xrdb(1), listres(1), editres(1), appres(1), appropriate widget documents
- .SH COPYRIGHT
--Copyright ([\d,\s]*) X Consortium
-+Copyright 1994 X Consortium
- .br
- See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
- .SH AUTHOR
-diff -urN xc.orig/programs/xcalc/xcalc.man xc/programs/xcalc/xcalc.man
---- xc.orig/programs/xcalc/xcalc.man 2002-10-13 02:06:46.000000000 +1000
-+++ xc/programs/xcalc/xcalc.man 2003-04-09 04:43:11.000000000 +1000
-@@ -25,7 +25,7 @@
- .\" other dealings in this Software without prior written authorization
- .\" from the X Consortium.
- .\"
--.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.4 2002/10/12 16:06:46 herrb Exp $
-+.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.5 2003/03/19 01:49:28 dawes Exp $
- .\"
- .de EX \"Begin example
- .ne 5
-@@ -428,7 +428,7 @@
- HP mode: A bug report claims that the sequence of keys 5, ENTER, <-
- should clear the display, but it doesn't.
- .SH COPYRIGHT
--Copyright ([\d,\s]*) X Consortium
-+Copyright 1994 X Consortium
- .br
- See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
- .SH AUTHORS
-diff -urN xc.orig/programs/xditview/xditview.man xc/programs/xditview/xditview.man
---- xc.orig/programs/xditview/xditview.man 2001-01-28 05:21:10.000000000 +1100
-+++ xc/programs/xditview/xditview.man 2003-04-09 04:43:11.000000000 +1000
-@@ -1,6 +1,6 @@
- .\" $XConsortium: xditview.man,v 1.10 94/04/17 20:43:37 gildea Exp $
- .\"
--.\" $XFree86: xc/programs/xditview/xditview.man,v 1.3 2001/01/27 18:21:10 dawes Exp $
-+.\" $XFree86: xc/programs/xditview/xditview.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
- .\"
- .TH XDITVIEW 1 __xorgversion__
- .SH NAME
-@@ -162,7 +162,7 @@
- from
- .I suntroff.
- .SH COPYRIGHT
--Copyright ([\d,\s]*) X Consortium
-+Copyright 1994 X Consortium
- .br
- See \fIX\fP(1) for a full statement of rights and permissions.
- .SH AUTHORS
-diff -urN xc.orig/programs/xrandr/xrandr.man xc/programs/xrandr/xrandr.man
---- xc.orig/programs/xrandr/xrandr.man 2002-10-03 02:58:05.000000000 +1000
-+++ xc/programs/xrandr/xrandr.man 2003-04-09 04:43:11.000000000 +1000
-@@ -20,7 +20,7 @@
- .\" PERFORMANCE OF THIS SOFTWARE.
- .\"
- .\"
--.\" $XFree86: xc/programs/xrandr/xrandr.man,v 1.4 2002/10/02 16:58:05 keithp Exp $
-+.\" $XFree86: xc/programs/xrandr/xrandr.man,v 1.5 2003/03/19 01:49:29 dawes Exp $
- .\"
- .TH XRANDR 1 "Version 1.0" "XFree86"
- .SH NAME
-@@ -49,7 +49,7 @@
- .I -o
- option is used to specify the orientation of the screen,
- and can be one of
--\f"Inormal inverted left right 0 1 2 3"\fP.
-+\fI"normal inverted left right 0 1 2 3"\fP.
- .PP
- The
- .I -x
Deleted: trunk/debian/patches/006_dont_ref_rman.man.diff
===================================================================
--- trunk/debian/patches/006_dont_ref_rman.man.diff 2004-05-13 18:44:38 UTC (rev 1402)
+++ trunk/debian/patches/006_dont_ref_rman.man.diff 2004-05-13 19:54:32 UTC (rev 1403)
@@ -1,16 +0,0 @@
-$Id$
-
-Don't reference the rman manpage, as it's now an "extra".
-
-This patch by Daniel Stone.
-
---- xc/doc/specs/programs/Imakefile.orig 2003-03-02 14:20:01.000000000 +1100
-+++ xc/doc/specs/programs/Imakefile 2003-03-02 14:19:47.000000000 +1100
-@@ -137,7 +137,6 @@
- $(TOP)/config/pswrap/pswrap.man \
- $(TOP)/programs/xterm/resize.man \
- $(TOP)/config/util/revpath.man \
-- $(TOP)/config/util/rman.man \
- $(TOP)/programs/rstart/rstart.man \
- $(TOP)/programs/rstart/rstartd.man \
- $(TOP)/programs/xdm/sessreg.man \
Reply to: