Enable html specs generation
Attached patch fixes and enables building of html versions of xspecs and
adds them to MANIFEST.all and xspecs.docs. Also some patches are
unfuzzied. general/fix-html-specs-generation.diff is added on top of
patch stack. Feel free to move.
diff -Nru debian.orig/MANIFEST.all debian/MANIFEST.all
--- debian.orig/MANIFEST.all 2005-06-08 08:15:42.000000000 +0800
+++ debian/MANIFEST.all 2005-07-31 03:24:34.000000000 +0800
@@ -102,6 +102,589 @@
usr/X11R6/lib/X11/doc/xtest.txt
usr/X11R6/lib/X11/doc/xtestlib.txt
usr/X11R6/lib/X11/doc/xv-protocol-v2.txt
+usr/X11R6/lib/X11/doc/html/appgroup.html
+usr/X11R6/lib/X11/doc/html/bdf.html
+usr/X11R6/lib/X11/doc/html/bigreq.html
+usr/X11R6/lib/X11/doc/html/buffer10.png
+usr/X11R6/lib/X11/doc/html/buffer11.png
+usr/X11R6/lib/X11/doc/html/buffer12.png
+usr/X11R6/lib/X11/doc/html/buffer13.png
+usr/X11R6/lib/X11/doc/html/buffer14.png
+usr/X11R6/lib/X11/doc/html/buffer15.png
+usr/X11R6/lib/X11/doc/html/buffer16.png
+usr/X11R6/lib/X11/doc/html/buffer17.png
+usr/X11R6/lib/X11/doc/html/buffer1.png
+usr/X11R6/lib/X11/doc/html/buffer2.png
+usr/X11R6/lib/X11/doc/html/buffer3.png
+usr/X11R6/lib/X11/doc/html/buffer4.png
+usr/X11R6/lib/X11/doc/html/buffer5.png
+usr/X11R6/lib/X11/doc/html/buffer6.png
+usr/X11R6/lib/X11/doc/html/buffer7.png
+usr/X11R6/lib/X11/doc/html/buffer8.png
+usr/X11R6/lib/X11/doc/html/buffer9.png
+usr/X11R6/lib/X11/doc/html/buffer.html
+usr/X11R6/lib/X11/doc/html/ctext10.png
+usr/X11R6/lib/X11/doc/html/ctext11.png
+usr/X11R6/lib/X11/doc/html/ctext1.png
+usr/X11R6/lib/X11/doc/html/ctext2.png
+usr/X11R6/lib/X11/doc/html/ctext3.png
+usr/X11R6/lib/X11/doc/html/ctext4.png
+usr/X11R6/lib/X11/doc/html/ctext5.png
+usr/X11R6/lib/X11/doc/html/ctext6.png
+usr/X11R6/lib/X11/doc/html/ctext7.png
+usr/X11R6/lib/X11/doc/html/ctext8.png
+usr/X11R6/lib/X11/doc/html/ctext9.png
+usr/X11R6/lib/X11/doc/html/ctext.html
+usr/X11R6/lib/X11/doc/html/ctlseqs10.png
+usr/X11R6/lib/X11/doc/html/ctlseqs11.png
+usr/X11R6/lib/X11/doc/html/ctlseqs1.png
+usr/X11R6/lib/X11/doc/html/ctlseqs2.png
+usr/X11R6/lib/X11/doc/html/ctlseqs3.png
+usr/X11R6/lib/X11/doc/html/ctlseqs4.png
+usr/X11R6/lib/X11/doc/html/ctlseqs5.png
+usr/X11R6/lib/X11/doc/html/ctlseqs6.png
+usr/X11R6/lib/X11/doc/html/ctlseqs7.png
+usr/X11R6/lib/X11/doc/html/ctlseqs8.png
+usr/X11R6/lib/X11/doc/html/ctlseqs9.png
+usr/X11R6/lib/X11/doc/html/ctlseqs.html
+usr/X11R6/lib/X11/doc/html/ddx1.png
+usr/X11R6/lib/X11/doc/html/ddx2.png
+usr/X11R6/lib/X11/doc/html/ddx3.png
+usr/X11R6/lib/X11/doc/html/ddx4.png
+usr/X11R6/lib/X11/doc/html/ddx.html
+usr/X11R6/lib/X11/doc/html/DPMS1.png
+usr/X11R6/lib/X11/doc/html/DPMS.html
+usr/X11R6/lib/X11/doc/html/DPMSLib1.png
+usr/X11R6/lib/X11/doc/html/DPMSLib.html
+usr/X11R6/lib/X11/doc/html/evi1.png
+usr/X11R6/lib/X11/doc/html/evi.html
+usr/X11R6/lib/X11/doc/html/fontlib.html
+usr/X11R6/lib/X11/doc/html/fsproto10.png
+usr/X11R6/lib/X11/doc/html/fsproto11.png
+usr/X11R6/lib/X11/doc/html/fsproto12.png
+usr/X11R6/lib/X11/doc/html/fsproto13.png
+usr/X11R6/lib/X11/doc/html/fsproto14.png
+usr/X11R6/lib/X11/doc/html/fsproto15.png
+usr/X11R6/lib/X11/doc/html/fsproto16.png
+usr/X11R6/lib/X11/doc/html/fsproto17.png
+usr/X11R6/lib/X11/doc/html/fsproto18.png
+usr/X11R6/lib/X11/doc/html/fsproto19.png
+usr/X11R6/lib/X11/doc/html/fsproto1.png
+usr/X11R6/lib/X11/doc/html/fsproto20.png
+usr/X11R6/lib/X11/doc/html/fsproto21.png
+usr/X11R6/lib/X11/doc/html/fsproto22.png
+usr/X11R6/lib/X11/doc/html/fsproto23.png
+usr/X11R6/lib/X11/doc/html/fsproto24.png
+usr/X11R6/lib/X11/doc/html/fsproto25.png
+usr/X11R6/lib/X11/doc/html/fsproto26.png
+usr/X11R6/lib/X11/doc/html/fsproto27.png
+usr/X11R6/lib/X11/doc/html/fsproto28.png
+usr/X11R6/lib/X11/doc/html/fsproto29.png
+usr/X11R6/lib/X11/doc/html/fsproto2.png
+usr/X11R6/lib/X11/doc/html/fsproto30.png
+usr/X11R6/lib/X11/doc/html/fsproto31.png
+usr/X11R6/lib/X11/doc/html/fsproto32.png
+usr/X11R6/lib/X11/doc/html/fsproto33.png
+usr/X11R6/lib/X11/doc/html/fsproto34.png
+usr/X11R6/lib/X11/doc/html/fsproto35.png
+usr/X11R6/lib/X11/doc/html/fsproto36.png
+usr/X11R6/lib/X11/doc/html/fsproto37.png
+usr/X11R6/lib/X11/doc/html/fsproto38.png
+usr/X11R6/lib/X11/doc/html/fsproto39.png
+usr/X11R6/lib/X11/doc/html/fsproto3.png
+usr/X11R6/lib/X11/doc/html/fsproto40.png
+usr/X11R6/lib/X11/doc/html/fsproto41.png
+usr/X11R6/lib/X11/doc/html/fsproto42.png
+usr/X11R6/lib/X11/doc/html/fsproto43.png
+usr/X11R6/lib/X11/doc/html/fsproto44.png
+usr/X11R6/lib/X11/doc/html/fsproto45.png
+usr/X11R6/lib/X11/doc/html/fsproto46.png
+usr/X11R6/lib/X11/doc/html/fsproto47.png
+usr/X11R6/lib/X11/doc/html/fsproto48.png
+usr/X11R6/lib/X11/doc/html/fsproto49.png
+usr/X11R6/lib/X11/doc/html/fsproto4.png
+usr/X11R6/lib/X11/doc/html/fsproto50.png
+usr/X11R6/lib/X11/doc/html/fsproto5.png
+usr/X11R6/lib/X11/doc/html/fsproto6.png
+usr/X11R6/lib/X11/doc/html/fsproto7.png
+usr/X11R6/lib/X11/doc/html/fsproto8.png
+usr/X11R6/lib/X11/doc/html/fsproto9.png
+usr/X11R6/lib/X11/doc/html/fsproto.html
+usr/X11R6/lib/X11/doc/html/i18nFramework1.png
+usr/X11R6/lib/X11/doc/html/i18nFramework2.png
+usr/X11R6/lib/X11/doc/html/i18nFramework3.png
+usr/X11R6/lib/X11/doc/html/i18nFramework4.png
+usr/X11R6/lib/X11/doc/html/i18nFramework5.png
+usr/X11R6/lib/X11/doc/html/i18nFramework6.png
+usr/X11R6/lib/X11/doc/html/i18nFramework7.png
+usr/X11R6/lib/X11/doc/html/i18nFramework8.png
+usr/X11R6/lib/X11/doc/html/i18nFramework.html
+usr/X11R6/lib/X11/doc/html/icccm10.png
+usr/X11R6/lib/X11/doc/html/icccm11.png
+usr/X11R6/lib/X11/doc/html/icccm12.png
+usr/X11R6/lib/X11/doc/html/icccm13.png
+usr/X11R6/lib/X11/doc/html/icccm14.png
+usr/X11R6/lib/X11/doc/html/icccm15.png
+usr/X11R6/lib/X11/doc/html/icccm16.png
+usr/X11R6/lib/X11/doc/html/icccm17.png
+usr/X11R6/lib/X11/doc/html/icccm18.png
+usr/X11R6/lib/X11/doc/html/icccm19.png
+usr/X11R6/lib/X11/doc/html/icccm1.png
+usr/X11R6/lib/X11/doc/html/icccm20.png
+usr/X11R6/lib/X11/doc/html/icccm21.png
+usr/X11R6/lib/X11/doc/html/icccm22.png
+usr/X11R6/lib/X11/doc/html/icccm23.png
+usr/X11R6/lib/X11/doc/html/icccm24.png
+usr/X11R6/lib/X11/doc/html/icccm25.png
+usr/X11R6/lib/X11/doc/html/icccm26.png
+usr/X11R6/lib/X11/doc/html/icccm27.png
+usr/X11R6/lib/X11/doc/html/icccm28.png
+usr/X11R6/lib/X11/doc/html/icccm29.png
+usr/X11R6/lib/X11/doc/html/icccm2.png
+usr/X11R6/lib/X11/doc/html/icccm30.png
+usr/X11R6/lib/X11/doc/html/icccm31.png
+usr/X11R6/lib/X11/doc/html/icccm32.png
+usr/X11R6/lib/X11/doc/html/icccm33.png
+usr/X11R6/lib/X11/doc/html/icccm34.png
+usr/X11R6/lib/X11/doc/html/icccm35.png
+usr/X11R6/lib/X11/doc/html/icccm36.png
+usr/X11R6/lib/X11/doc/html/icccm37.png
+usr/X11R6/lib/X11/doc/html/icccm38.png
+usr/X11R6/lib/X11/doc/html/icccm39.png
+usr/X11R6/lib/X11/doc/html/icccm3.png
+usr/X11R6/lib/X11/doc/html/icccm40.png
+usr/X11R6/lib/X11/doc/html/icccm41.png
+usr/X11R6/lib/X11/doc/html/icccm43.png
+usr/X11R6/lib/X11/doc/html/icccm44.png
+usr/X11R6/lib/X11/doc/html/icccm45.png
+usr/X11R6/lib/X11/doc/html/icccm46.png
+usr/X11R6/lib/X11/doc/html/icccm47.png
+usr/X11R6/lib/X11/doc/html/icccm48.png
+usr/X11R6/lib/X11/doc/html/icccm49.png
+usr/X11R6/lib/X11/doc/html/icccm4.png
+usr/X11R6/lib/X11/doc/html/icccm51.png
+usr/X11R6/lib/X11/doc/html/icccm52.png
+usr/X11R6/lib/X11/doc/html/icccm5.png
+usr/X11R6/lib/X11/doc/html/icccm6.png
+usr/X11R6/lib/X11/doc/html/icccm7.png
+usr/X11R6/lib/X11/doc/html/icccm8.png
+usr/X11R6/lib/X11/doc/html/icccm9.png
+usr/X11R6/lib/X11/doc/html/icccm.html
+usr/X11R6/lib/X11/doc/html/ice10.png
+usr/X11R6/lib/X11/doc/html/ice11.png
+usr/X11R6/lib/X11/doc/html/ice12.png
+usr/X11R6/lib/X11/doc/html/ice13.png
+usr/X11R6/lib/X11/doc/html/ice1.png
+usr/X11R6/lib/X11/doc/html/ice2.png
+usr/X11R6/lib/X11/doc/html/ice3.png
+usr/X11R6/lib/X11/doc/html/ice4.png
+usr/X11R6/lib/X11/doc/html/ice5.png
+usr/X11R6/lib/X11/doc/html/ice6.png
+usr/X11R6/lib/X11/doc/html/ice7.png
+usr/X11R6/lib/X11/doc/html/ice8.png
+usr/X11R6/lib/X11/doc/html/ice9.png
+usr/X11R6/lib/X11/doc/html/ice.html
+usr/X11R6/lib/X11/doc/html/ICElib1.png
+usr/X11R6/lib/X11/doc/html/ICElib2.png
+usr/X11R6/lib/X11/doc/html/ICElib3.png
+usr/X11R6/lib/X11/doc/html/ICElib4.png
+usr/X11R6/lib/X11/doc/html/ICElib5.png
+usr/X11R6/lib/X11/doc/html/ICElib6.png
+usr/X11R6/lib/X11/doc/html/ICElib.html
+usr/X11R6/lib/X11/doc/html/intrinsics10.png
+usr/X11R6/lib/X11/doc/html/intrinsics11.png
+usr/X11R6/lib/X11/doc/html/intrinsics12.png
+usr/X11R6/lib/X11/doc/html/intrinsics13.png
+usr/X11R6/lib/X11/doc/html/intrinsics14.png
+usr/X11R6/lib/X11/doc/html/intrinsics15.png
+usr/X11R6/lib/X11/doc/html/intrinsics16.png
+usr/X11R6/lib/X11/doc/html/intrinsics17.png
+usr/X11R6/lib/X11/doc/html/intrinsics18.png
+usr/X11R6/lib/X11/doc/html/intrinsics19.png
+usr/X11R6/lib/X11/doc/html/intrinsics1.png
+usr/X11R6/lib/X11/doc/html/intrinsics20.png
+usr/X11R6/lib/X11/doc/html/intrinsics21.png
+usr/X11R6/lib/X11/doc/html/intrinsics22.png
+usr/X11R6/lib/X11/doc/html/intrinsics23.png
+usr/X11R6/lib/X11/doc/html/intrinsics24.png
+usr/X11R6/lib/X11/doc/html/intrinsics25.png
+usr/X11R6/lib/X11/doc/html/intrinsics26.png
+usr/X11R6/lib/X11/doc/html/intrinsics27.png
+usr/X11R6/lib/X11/doc/html/intrinsics28.png
+usr/X11R6/lib/X11/doc/html/intrinsics29.png
+usr/X11R6/lib/X11/doc/html/intrinsics2.png
+usr/X11R6/lib/X11/doc/html/intrinsics30.png
+usr/X11R6/lib/X11/doc/html/intrinsics31.png
+usr/X11R6/lib/X11/doc/html/intrinsics32.png
+usr/X11R6/lib/X11/doc/html/intrinsics33.png
+usr/X11R6/lib/X11/doc/html/intrinsics34.png
+usr/X11R6/lib/X11/doc/html/intrinsics35.png
+usr/X11R6/lib/X11/doc/html/intrinsics36.png
+usr/X11R6/lib/X11/doc/html/intrinsics37.png
+usr/X11R6/lib/X11/doc/html/intrinsics38.png
+usr/X11R6/lib/X11/doc/html/intrinsics39.png
+usr/X11R6/lib/X11/doc/html/intrinsics3.png
+usr/X11R6/lib/X11/doc/html/intrinsics40.png
+usr/X11R6/lib/X11/doc/html/intrinsics41.png
+usr/X11R6/lib/X11/doc/html/intrinsics42.png
+usr/X11R6/lib/X11/doc/html/intrinsics43.png
+usr/X11R6/lib/X11/doc/html/intrinsics44.png
+usr/X11R6/lib/X11/doc/html/intrinsics45.png
+usr/X11R6/lib/X11/doc/html/intrinsics46.png
+usr/X11R6/lib/X11/doc/html/intrinsics47.png
+usr/X11R6/lib/X11/doc/html/intrinsics48.png
+usr/X11R6/lib/X11/doc/html/intrinsics49.png
+usr/X11R6/lib/X11/doc/html/intrinsics4.png
+usr/X11R6/lib/X11/doc/html/intrinsics50.png
+usr/X11R6/lib/X11/doc/html/intrinsics51.png
+usr/X11R6/lib/X11/doc/html/intrinsics52.png
+usr/X11R6/lib/X11/doc/html/intrinsics53.png
+usr/X11R6/lib/X11/doc/html/intrinsics54.png
+usr/X11R6/lib/X11/doc/html/intrinsics55.png
+usr/X11R6/lib/X11/doc/html/intrinsics56.png
+usr/X11R6/lib/X11/doc/html/intrinsics57.png
+usr/X11R6/lib/X11/doc/html/intrinsics58.png
+usr/X11R6/lib/X11/doc/html/intrinsics59.png
+usr/X11R6/lib/X11/doc/html/intrinsics5.png
+usr/X11R6/lib/X11/doc/html/intrinsics60.png
+usr/X11R6/lib/X11/doc/html/intrinsics61.png
+usr/X11R6/lib/X11/doc/html/intrinsics62.png
+usr/X11R6/lib/X11/doc/html/intrinsics63.png
+usr/X11R6/lib/X11/doc/html/intrinsics64.png
+usr/X11R6/lib/X11/doc/html/intrinsics8.png
+usr/X11R6/lib/X11/doc/html/intrinsics9.png
+usr/X11R6/lib/X11/doc/html/intrinsics.html
+usr/X11R6/lib/X11/doc/html/LocaleDB1.png
+usr/X11R6/lib/X11/doc/html/LocaleDB2.png
+usr/X11R6/lib/X11/doc/html/LocaleDB3.png
+usr/X11R6/lib/X11/doc/html/LocaleDB4.png
+usr/X11R6/lib/X11/doc/html/LocaleDB5.png
+usr/X11R6/lib/X11/doc/html/LocaleDB6.png
+usr/X11R6/lib/X11/doc/html/LocaleDB7.png
+usr/X11R6/lib/X11/doc/html/LocaleDB.html
+usr/X11R6/lib/X11/doc/html/mit-shm.html
+usr/X11R6/lib/X11/doc/html/proto10.png
+usr/X11R6/lib/X11/doc/html/proto11.png
+usr/X11R6/lib/X11/doc/html/proto12.png
+usr/X11R6/lib/X11/doc/html/proto13.png
+usr/X11R6/lib/X11/doc/html/proto14.png
+usr/X11R6/lib/X11/doc/html/proto15.png
+usr/X11R6/lib/X11/doc/html/proto16.png
+usr/X11R6/lib/X11/doc/html/proto17.png
+usr/X11R6/lib/X11/doc/html/proto18.png
+usr/X11R6/lib/X11/doc/html/proto19.png
+usr/X11R6/lib/X11/doc/html/proto1.png
+usr/X11R6/lib/X11/doc/html/proto20.png
+usr/X11R6/lib/X11/doc/html/proto21.png
+usr/X11R6/lib/X11/doc/html/proto22.png
+usr/X11R6/lib/X11/doc/html/proto23.png
+usr/X11R6/lib/X11/doc/html/proto24.png
+usr/X11R6/lib/X11/doc/html/proto25.png
+usr/X11R6/lib/X11/doc/html/proto26.png
+usr/X11R6/lib/X11/doc/html/proto27.png
+usr/X11R6/lib/X11/doc/html/proto28.png
+usr/X11R6/lib/X11/doc/html/proto29.png
+usr/X11R6/lib/X11/doc/html/proto2.png
+usr/X11R6/lib/X11/doc/html/proto30.png
+usr/X11R6/lib/X11/doc/html/proto31.png
+usr/X11R6/lib/X11/doc/html/proto32.png
+usr/X11R6/lib/X11/doc/html/proto33.png
+usr/X11R6/lib/X11/doc/html/proto3.png
+usr/X11R6/lib/X11/doc/html/proto4.png
+usr/X11R6/lib/X11/doc/html/proto6.png
+usr/X11R6/lib/X11/doc/html/proto7.png
+usr/X11R6/lib/X11/doc/html/proto8.png
+usr/X11R6/lib/X11/doc/html/proto9.png
+usr/X11R6/lib/X11/doc/html/proto.html
+usr/X11R6/lib/X11/doc/html/record1.png
+usr/X11R6/lib/X11/doc/html/record2.png
+usr/X11R6/lib/X11/doc/html/record3.png
+usr/X11R6/lib/X11/doc/html/record4.png
+usr/X11R6/lib/X11/doc/html/record5.png
+usr/X11R6/lib/X11/doc/html/record6.png
+usr/X11R6/lib/X11/doc/html/record7.png
+usr/X11R6/lib/X11/doc/html/record8.png
+usr/X11R6/lib/X11/doc/html/record.html
+usr/X11R6/lib/X11/doc/html/recordlib.html
+usr/X11R6/lib/X11/doc/html/rstart.html
+usr/X11R6/lib/X11/doc/html/shape.html
+usr/X11R6/lib/X11/doc/html/shapelib.html
+usr/X11R6/lib/X11/doc/html/SMlib1.png
+usr/X11R6/lib/X11/doc/html/SMlib2.png
+usr/X11R6/lib/X11/doc/html/SMlib3.png
+usr/X11R6/lib/X11/doc/html/SMlib.html
+usr/X11R6/lib/X11/doc/html/specindex.html
+usr/X11R6/lib/X11/doc/html/tog-cup.html
+usr/X11R6/lib/X11/doc/html/widgets10.png
+usr/X11R6/lib/X11/doc/html/widgets11.png
+usr/X11R6/lib/X11/doc/html/widgets12.png
+usr/X11R6/lib/X11/doc/html/widgets13.png
+usr/X11R6/lib/X11/doc/html/widgets14.png
+usr/X11R6/lib/X11/doc/html/widgets15.png
+usr/X11R6/lib/X11/doc/html/widgets16.png
+usr/X11R6/lib/X11/doc/html/widgets17.png
+usr/X11R6/lib/X11/doc/html/widgets18.png
+usr/X11R6/lib/X11/doc/html/widgets19.png
+usr/X11R6/lib/X11/doc/html/widgets1.png
+usr/X11R6/lib/X11/doc/html/widgets20.png
+usr/X11R6/lib/X11/doc/html/widgets21.png
+usr/X11R6/lib/X11/doc/html/widgets22.png
+usr/X11R6/lib/X11/doc/html/widgets23.png
+usr/X11R6/lib/X11/doc/html/widgets24.png
+usr/X11R6/lib/X11/doc/html/widgets25.png
+usr/X11R6/lib/X11/doc/html/widgets26.png
+usr/X11R6/lib/X11/doc/html/widgets27.png
+usr/X11R6/lib/X11/doc/html/widgets28.png
+usr/X11R6/lib/X11/doc/html/widgets29.png
+usr/X11R6/lib/X11/doc/html/widgets2.png
+usr/X11R6/lib/X11/doc/html/widgets30.png
+usr/X11R6/lib/X11/doc/html/widgets31.png
+usr/X11R6/lib/X11/doc/html/widgets32.png
+usr/X11R6/lib/X11/doc/html/widgets33.png
+usr/X11R6/lib/X11/doc/html/widgets34.png
+usr/X11R6/lib/X11/doc/html/widgets35.png
+usr/X11R6/lib/X11/doc/html/widgets36.png
+usr/X11R6/lib/X11/doc/html/widgets37.png
+usr/X11R6/lib/X11/doc/html/widgets38.png
+usr/X11R6/lib/X11/doc/html/widgets39.png
+usr/X11R6/lib/X11/doc/html/widgets3.png
+usr/X11R6/lib/X11/doc/html/widgets40.png
+usr/X11R6/lib/X11/doc/html/widgets4.png
+usr/X11R6/lib/X11/doc/html/widgets5.png
+usr/X11R6/lib/X11/doc/html/widgets6.png
+usr/X11R6/lib/X11/doc/html/widgets7.png
+usr/X11R6/lib/X11/doc/html/widgets8.png
+usr/X11R6/lib/X11/doc/html/widgets9.png
+usr/X11R6/lib/X11/doc/html/widgets.html
+usr/X11R6/lib/X11/doc/html/xc-misc.html
+usr/X11R6/lib/X11/doc/html/xdmcp10.png
+usr/X11R6/lib/X11/doc/html/xdmcp11.png
+usr/X11R6/lib/X11/doc/html/xdmcp12.png
+usr/X11R6/lib/X11/doc/html/xdmcp13.png
+usr/X11R6/lib/X11/doc/html/xdmcp14.png
+usr/X11R6/lib/X11/doc/html/xdmcp15.png
+usr/X11R6/lib/X11/doc/html/xdmcp16.png
+usr/X11R6/lib/X11/doc/html/xdmcp17.png
+usr/X11R6/lib/X11/doc/html/xdmcp18.png
+usr/X11R6/lib/X11/doc/html/xdmcp19.png
+usr/X11R6/lib/X11/doc/html/xdmcp1.png
+usr/X11R6/lib/X11/doc/html/xdmcp2.png
+usr/X11R6/lib/X11/doc/html/xdmcp3.png
+usr/X11R6/lib/X11/doc/html/xdmcp4.png
+usr/X11R6/lib/X11/doc/html/xdmcp5.png
+usr/X11R6/lib/X11/doc/html/xdmcp6.png
+usr/X11R6/lib/X11/doc/html/xdmcp7.png
+usr/X11R6/lib/X11/doc/html/xdmcp8.png
+usr/X11R6/lib/X11/doc/html/xdmcp9.png
+usr/X11R6/lib/X11/doc/html/xdmcp.html
+usr/X11R6/lib/X11/doc/html/xfs-design.html
+usr/X11R6/lib/X11/doc/html/XiLib1.png
+usr/X11R6/lib/X11/doc/html/XiLib2.png
+usr/X11R6/lib/X11/doc/html/XiLib3.png
+usr/X11R6/lib/X11/doc/html/XiLib4.png
+usr/X11R6/lib/X11/doc/html/XiLib5.png
+usr/X11R6/lib/X11/doc/html/XiLib6.png
+usr/X11R6/lib/X11/doc/html/XiLib7.png
+usr/X11R6/lib/X11/doc/html/XiLib.html
+usr/X11R6/lib/X11/doc/html/xim10.png
+usr/X11R6/lib/X11/doc/html/xim11.png
+usr/X11R6/lib/X11/doc/html/xim12.png
+usr/X11R6/lib/X11/doc/html/xim13.png
+usr/X11R6/lib/X11/doc/html/xim14.png
+usr/X11R6/lib/X11/doc/html/xim15.png
+usr/X11R6/lib/X11/doc/html/xim16.png
+usr/X11R6/lib/X11/doc/html/xim17.png
+usr/X11R6/lib/X11/doc/html/xim18.png
+usr/X11R6/lib/X11/doc/html/xim19.png
+usr/X11R6/lib/X11/doc/html/xim1.png
+usr/X11R6/lib/X11/doc/html/xim20.png
+usr/X11R6/lib/X11/doc/html/xim21.png
+usr/X11R6/lib/X11/doc/html/xim22.png
+usr/X11R6/lib/X11/doc/html/xim23.png
+usr/X11R6/lib/X11/doc/html/xim24.png
+usr/X11R6/lib/X11/doc/html/xim25.png
+usr/X11R6/lib/X11/doc/html/xim26.png
+usr/X11R6/lib/X11/doc/html/xim27.png
+usr/X11R6/lib/X11/doc/html/xim28.png
+usr/X11R6/lib/X11/doc/html/xim29.png
+usr/X11R6/lib/X11/doc/html/xim2.png
+usr/X11R6/lib/X11/doc/html/xim30.png
+usr/X11R6/lib/X11/doc/html/xim31.png
+usr/X11R6/lib/X11/doc/html/xim32.png
+usr/X11R6/lib/X11/doc/html/xim33.png
+usr/X11R6/lib/X11/doc/html/xim34.png
+usr/X11R6/lib/X11/doc/html/xim35.png
+usr/X11R6/lib/X11/doc/html/xim36.png
+usr/X11R6/lib/X11/doc/html/xim37.png
+usr/X11R6/lib/X11/doc/html/xim38.png
+usr/X11R6/lib/X11/doc/html/xim39.png
+usr/X11R6/lib/X11/doc/html/xim3.png
+usr/X11R6/lib/X11/doc/html/xim40.png
+usr/X11R6/lib/X11/doc/html/xim41.png
+usr/X11R6/lib/X11/doc/html/xim42.png
+usr/X11R6/lib/X11/doc/html/xim43.png
+usr/X11R6/lib/X11/doc/html/xim44.png
+usr/X11R6/lib/X11/doc/html/xim45.png
+usr/X11R6/lib/X11/doc/html/xim46.png
+usr/X11R6/lib/X11/doc/html/xim47.png
+usr/X11R6/lib/X11/doc/html/xim48.png
+usr/X11R6/lib/X11/doc/html/xim49.png
+usr/X11R6/lib/X11/doc/html/xim4.png
+usr/X11R6/lib/X11/doc/html/xim50.png
+usr/X11R6/lib/X11/doc/html/xim51.png
+usr/X11R6/lib/X11/doc/html/xim52.png
+usr/X11R6/lib/X11/doc/html/xim53.png
+usr/X11R6/lib/X11/doc/html/xim54.png
+usr/X11R6/lib/X11/doc/html/xim55.png
+usr/X11R6/lib/X11/doc/html/xim56.png
+usr/X11R6/lib/X11/doc/html/xim57.png
+usr/X11R6/lib/X11/doc/html/xim58.png
+usr/X11R6/lib/X11/doc/html/xim59.png
+usr/X11R6/lib/X11/doc/html/xim5.png
+usr/X11R6/lib/X11/doc/html/xim6.png
+usr/X11R6/lib/X11/doc/html/xim7.png
+usr/X11R6/lib/X11/doc/html/xim8.png
+usr/X11R6/lib/X11/doc/html/xim9.png
+usr/X11R6/lib/X11/doc/html/xim.html
+usr/X11R6/lib/X11/doc/html/XIMTransport10.png
+usr/X11R6/lib/X11/doc/html/XIMTransport11.png
+usr/X11R6/lib/X11/doc/html/XIMTransport12.png
+usr/X11R6/lib/X11/doc/html/XIMTransport13.png
+usr/X11R6/lib/X11/doc/html/XIMTransport14.png
+usr/X11R6/lib/X11/doc/html/XIMTransport15.png
+usr/X11R6/lib/X11/doc/html/XIMTransport1.png
+usr/X11R6/lib/X11/doc/html/XIMTransport2.png
+usr/X11R6/lib/X11/doc/html/XIMTransport3.png
+usr/X11R6/lib/X11/doc/html/XIMTransport4.png
+usr/X11R6/lib/X11/doc/html/XIMTransport5.png
+usr/X11R6/lib/X11/doc/html/XIMTransport6.png
+usr/X11R6/lib/X11/doc/html/XIMTransport7.png
+usr/X11R6/lib/X11/doc/html/XIMTransport8.png
+usr/X11R6/lib/X11/doc/html/XIMTransport9.png
+usr/X11R6/lib/X11/doc/html/XIMTransport.html
+usr/X11R6/lib/X11/doc/html/XiPorting.html
+usr/X11R6/lib/X11/doc/html/XiProtocol10.png
+usr/X11R6/lib/X11/doc/html/XiProtocol11.png
+usr/X11R6/lib/X11/doc/html/XiProtocol12.png
+usr/X11R6/lib/X11/doc/html/XiProtocol13.png
+usr/X11R6/lib/X11/doc/html/XiProtocol14.png
+usr/X11R6/lib/X11/doc/html/XiProtocol15.png
+usr/X11R6/lib/X11/doc/html/XiProtocol16.png
+usr/X11R6/lib/X11/doc/html/XiProtocol17.png
+usr/X11R6/lib/X11/doc/html/XiProtocol18.png
+usr/X11R6/lib/X11/doc/html/XiProtocol19.png
+usr/X11R6/lib/X11/doc/html/XiProtocol1.png
+usr/X11R6/lib/X11/doc/html/XiProtocol20.png
+usr/X11R6/lib/X11/doc/html/XiProtocol21.png
+usr/X11R6/lib/X11/doc/html/XiProtocol22.png
+usr/X11R6/lib/X11/doc/html/XiProtocol2.png
+usr/X11R6/lib/X11/doc/html/XiProtocol3.png
+usr/X11R6/lib/X11/doc/html/XiProtocol4.png
+usr/X11R6/lib/X11/doc/html/XiProtocol5.png
+usr/X11R6/lib/X11/doc/html/XiProtocol6.png
+usr/X11R6/lib/X11/doc/html/XiProtocol7.png
+usr/X11R6/lib/X11/doc/html/XiProtocol8.png
+usr/X11R6/lib/X11/doc/html/XiProtocol9.png
+usr/X11R6/lib/X11/doc/html/XiProtocol.html
+usr/X11R6/lib/X11/doc/html/xlfd10.png
+usr/X11R6/lib/X11/doc/html/xlfd11.png
+usr/X11R6/lib/X11/doc/html/xlfd12.png
+usr/X11R6/lib/X11/doc/html/xlfd13.png
+usr/X11R6/lib/X11/doc/html/xlfd14.png
+usr/X11R6/lib/X11/doc/html/xlfd15.png
+usr/X11R6/lib/X11/doc/html/xlfd1.png
+usr/X11R6/lib/X11/doc/html/xlfd2.png
+usr/X11R6/lib/X11/doc/html/xlfd3.png
+usr/X11R6/lib/X11/doc/html/xlfd4.png
+usr/X11R6/lib/X11/doc/html/xlfd5.png
+usr/X11R6/lib/X11/doc/html/xlfd6.png
+usr/X11R6/lib/X11/doc/html/xlfd7.png
+usr/X11R6/lib/X11/doc/html/xlfd8.png
+usr/X11R6/lib/X11/doc/html/xlfd9.png
+usr/X11R6/lib/X11/doc/html/xlfd.html
+usr/X11R6/lib/X11/doc/html/xlib10.png
+usr/X11R6/lib/X11/doc/html/xlib11.png
+usr/X11R6/lib/X11/doc/html/xlib12.png
+usr/X11R6/lib/X11/doc/html/xlib13.png
+usr/X11R6/lib/X11/doc/html/xlib14.png
+usr/X11R6/lib/X11/doc/html/xlib15.png
+usr/X11R6/lib/X11/doc/html/xlib22.png
+usr/X11R6/lib/X11/doc/html/xlib23.png
+usr/X11R6/lib/X11/doc/html/xlib24.png
+usr/X11R6/lib/X11/doc/html/xlib25.png
+usr/X11R6/lib/X11/doc/html/xlib26.png
+usr/X11R6/lib/X11/doc/html/xlib27.png
+usr/X11R6/lib/X11/doc/html/xlib28.png
+usr/X11R6/lib/X11/doc/html/xlib29.png
+usr/X11R6/lib/X11/doc/html/xlib30.png
+usr/X11R6/lib/X11/doc/html/xlib31.png
+usr/X11R6/lib/X11/doc/html/xlib33.png
+usr/X11R6/lib/X11/doc/html/xlib34.png
+usr/X11R6/lib/X11/doc/html/xlib35.png
+usr/X11R6/lib/X11/doc/html/xlib36.png
+usr/X11R6/lib/X11/doc/html/xlib37.png
+usr/X11R6/lib/X11/doc/html/xlib38.png
+usr/X11R6/lib/X11/doc/html/xlib39.png
+usr/X11R6/lib/X11/doc/html/xlib3.png
+usr/X11R6/lib/X11/doc/html/xlib40.png
+usr/X11R6/lib/X11/doc/html/xlib41.png
+usr/X11R6/lib/X11/doc/html/xlib42.png
+usr/X11R6/lib/X11/doc/html/xlib43.png
+usr/X11R6/lib/X11/doc/html/xlib44.png
+usr/X11R6/lib/X11/doc/html/xlib45.png
+usr/X11R6/lib/X11/doc/html/xlib46.png
+usr/X11R6/lib/X11/doc/html/xlib47.png
+usr/X11R6/lib/X11/doc/html/xlib48.png
+usr/X11R6/lib/X11/doc/html/xlib49.png
+usr/X11R6/lib/X11/doc/html/xlib4.png
+usr/X11R6/lib/X11/doc/html/xlib50.png
+usr/X11R6/lib/X11/doc/html/xlib51.png
+usr/X11R6/lib/X11/doc/html/xlib52.png
+usr/X11R6/lib/X11/doc/html/xlib53.png
+usr/X11R6/lib/X11/doc/html/xlib54.png
+usr/X11R6/lib/X11/doc/html/xlib55.png
+usr/X11R6/lib/X11/doc/html/xlib56.png
+usr/X11R6/lib/X11/doc/html/xlib57.png
+usr/X11R6/lib/X11/doc/html/xlib58.png
+usr/X11R6/lib/X11/doc/html/xlib59.png
+usr/X11R6/lib/X11/doc/html/xlib5.png
+usr/X11R6/lib/X11/doc/html/xlib60.png
+usr/X11R6/lib/X11/doc/html/xlib61.png
+usr/X11R6/lib/X11/doc/html/xlib62.png
+usr/X11R6/lib/X11/doc/html/xlib63.png
+usr/X11R6/lib/X11/doc/html/xlib64.png
+usr/X11R6/lib/X11/doc/html/xlib65.png
+usr/X11R6/lib/X11/doc/html/xlib66.png
+usr/X11R6/lib/X11/doc/html/xlib67.png
+usr/X11R6/lib/X11/doc/html/xlib68.png
+usr/X11R6/lib/X11/doc/html/xlib69.png
+usr/X11R6/lib/X11/doc/html/xlib6.png
+usr/X11R6/lib/X11/doc/html/xlib70.png
+usr/X11R6/lib/X11/doc/html/xlib71.png
+usr/X11R6/lib/X11/doc/html/xlib72.png
+usr/X11R6/lib/X11/doc/html/xlib73.png
+usr/X11R6/lib/X11/doc/html/xlib74.png
+usr/X11R6/lib/X11/doc/html/xlib75.png
+usr/X11R6/lib/X11/doc/html/xlib76.png
+usr/X11R6/lib/X11/doc/html/xlib78.png
+usr/X11R6/lib/X11/doc/html/xlib79.png
+usr/X11R6/lib/X11/doc/html/xlib7.png
+usr/X11R6/lib/X11/doc/html/xlib80.png
+usr/X11R6/lib/X11/doc/html/xlib81.png
+usr/X11R6/lib/X11/doc/html/xlib82.png
+usr/X11R6/lib/X11/doc/html/xlib83.png
+usr/X11R6/lib/X11/doc/html/xlib8.png
+usr/X11R6/lib/X11/doc/html/xlib9.png
+usr/X11R6/lib/X11/doc/html/xlib.html
+usr/X11R6/lib/X11/doc/html/xmu.html
+usr/X11R6/lib/X11/doc/html/Xprint_FAQ.html
+usr/X11R6/lib/X11/doc/html/xsmp1.png
+usr/X11R6/lib/X11/doc/html/xsmp2.png
+usr/X11R6/lib/X11/doc/html/xsmp3.png
+usr/X11R6/lib/X11/doc/html/xsmp.html
+usr/X11R6/lib/X11/doc/html/xtest.html
+usr/X11R6/lib/X11/doc/html/xtestlib.html
+usr/X11R6/lib/X11/doc/html/Xtrans.html
usr/X11R6/lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
usr/X11R6/lib/X11/fonts/100dpi/UTBI__10-ISO8859-10.pcf.gz
usr/X11R6/lib/X11/fonts/100dpi/UTBI__10-ISO8859-13.pcf.gz
diff -Nru debian.orig/patches/amd64/600_amd64_support.diff debian/patches/amd64/600_amd64_support.diff
--- debian.orig/patches/amd64/600_amd64_support.diff 2005-07-23 05:34:44.000000000 +0800
+++ debian/patches/amd64/600_amd64_support.diff 2005-07-31 03:24:34.000000000 +0800
@@ -8,10 +8,11 @@
Not submitted upstream.
-diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
---- xc-old/config/cf/linux.cf 2004-10-18 14:39:52.737468000 +0200
-+++ xc/config/cf/linux.cf 2004-10-18 14:41:57.429512384 +0200
-@@ -640,7 +640,7 @@
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc/config/cf/linux.cf.orig 2005-07-26 14:32:53.000000000 +0800
++++ xc/config/cf/linux.cf 2005-07-26 14:33:14.000000000 +0800
+@@ -641,7 +641,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
diff -Nru debian.orig/patches/general/003_linux.cf_and_xfree86.cf.diff debian/patches/general/003_linux.cf_and_xfree86.cf.diff
--- debian.orig/patches/general/003_linux.cf_and_xfree86.cf.diff 2005-07-23 05:45:02.000000000 +0800
+++ debian/patches/general/003_linux.cf_and_xfree86.cf.diff 2005-07-31 03:24:34.000000000 +0800
@@ -22,9 +22,10 @@
as they had no place in the upstream tree, per the policy of not placing
debian/ and the like in upstream trees. Due to be maintained externally.
-diff -urN xc/config/cf~/linux.cf xc/config/cf/linux.cf
---- xc/config/cf~/linux.cf 2005-06-13 19:41:23.384951000 -0500
-+++ xc/config/cf/linux.cf 2005-06-13 19:42:04.195129471 -0500
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc/config/cf/linux.cf.orig 2005-07-26 14:26:39.000000000 +0800
++++ xc/config/cf/linux.cf 2005-07-26 14:27:12.000000000 +0800
@@ -101,12 +101,22 @@
#endif
@@ -64,7 +65,7 @@
# define FSUseSyslog YES
# define DriverManSuffix 4x
-@@ -142,53 +150,120 @@
+@@ -142,53 +150,121 @@
*/
# ifdef DebianMaintainer
@@ -175,6 +176,7 @@
+# define HasFreetype2 YES
+# define FontLibSharedFreeType NO
+# define HasLatex YES
++# define HasGroffHtml YES
+
+# ifdef UseInstalled
+# define RenderLibraryDir /usr
@@ -217,7 +219,7 @@
# endif /* DebianMaintainer */
#endif /* LinuxDebian */
-@@ -675,10 +750,10 @@
+@@ -675,10 +751,10 @@
# if UseElfFormat
# ifdef AlphaArchitecture
# define CcCmd gcc -b alpha-linux
@@ -229,7 +231,7 @@
# endif /* AlphaArchitecture */
# ifdef HPArchitecture
# define CcCmd gcc
-@@ -690,10 +765,10 @@
+@@ -690,10 +766,10 @@
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
@@ -241,7 +243,7 @@
# endif /* i386Architecture */
# ifdef ia64Architecture
# define CcCmd gcc
-@@ -704,10 +779,10 @@
+@@ -704,10 +780,10 @@
# endif /* ia64Architecture */
# ifdef Mc68020Architecture
# define CcCmd gcc -b m68k-linux
@@ -253,7 +255,7 @@
# endif /* Mc68020Architecture */
# ifdef AMD64Architecture
# define CcCmd gcc
-@@ -720,13 +795,14 @@
+@@ -720,13 +796,14 @@
# define CcCmd gcc
# define AsCmd CcCmd -c -x assembler
# define LdCmd CcCmd -nostdlib
@@ -270,7 +272,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -793,7 +869,7 @@
+@@ -793,7 +870,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -279,7 +281,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -806,7 +882,7 @@
+@@ -806,7 +883,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -288,7 +290,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -814,7 +890,9 @@
+@@ -814,7 +891,9 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -299,7 +301,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -822,7 +900,7 @@
+@@ -822,7 +901,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -308,7 +310,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -831,7 +909,7 @@
+@@ -831,7 +910,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -317,7 +319,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -840,7 +918,7 @@
+@@ -840,7 +919,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -326,7 +328,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -849,7 +927,7 @@
+@@ -849,7 +928,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -335,7 +337,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -859,7 +937,7 @@
+@@ -859,7 +938,7 @@
#ifdef Ppc64Architecture
# define DefaultCCOptions -fsigned-char -mminimal-toc
# ifndef OptimizedCDebugFlags
@@ -344,7 +346,7 @@
# endif
# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -869,7 +947,7 @@
+@@ -869,7 +948,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -353,7 +355,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -878,7 +956,7 @@
+@@ -878,7 +957,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -362,7 +364,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -886,16 +964,17 @@
+@@ -886,16 +965,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -384,7 +386,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -926,7 +1005,7 @@
+@@ -926,7 +1006,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
@@ -393,7 +395,7 @@
# endif
# define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -938,7 +1017,7 @@
+@@ -938,7 +1018,7 @@
#ifdef AMD64Architecture
# ifndef OptimizedCDebugFlags
@@ -402,9 +404,10 @@
# endif
# define LinuxMachineDefines -D__amd64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-diff -urN xc/config/cf~/xfree86.cf xc/config/cf/xfree86.cf
---- xc/config/cf~/xfree86.cf 2005-02-28 12:35:18.000000000 -0500
-+++ xc/config/cf/xfree86.cf 2005-06-13 19:41:42.010491371 -0500
+Index: xc/config/cf/xfree86.cf
+===================================================================
+--- xc/config/cf/xfree86.cf.orig 2005-07-26 14:25:20.000000000 +0800
++++ xc/config/cf/xfree86.cf 2005-07-26 14:26:39.000000000 +0800
@@ -233,6 +233,11 @@
#define GlideDriver /**/
#endif
@@ -509,9 +512,10 @@
# endif
#endif
-diff -urN xc/config/cf~/xorg.cf xc/config/cf/xorg.cf
---- xc/config/cf~/xorg.cf 2005-06-13 19:41:22.971939000 -0500
-+++ xc/config/cf/xorg.cf 2005-06-13 19:41:42.012491429 -0500
+Index: xc/config/cf/xorg.cf
+===================================================================
+--- xc/config/cf/xorg.cf.orig 2005-07-26 14:26:37.000000000 +0800
++++ xc/config/cf/xorg.cf 2005-07-26 14:26:39.000000000 +0800
@@ -257,6 +257,11 @@
#define GlideDriver /**/
#endif
diff -Nru debian.orig/patches/general/004_imake_manpage_handling_overhaul.diff debian/patches/general/004_imake_manpage_handling_overhaul.diff
--- debian.orig/patches/general/004_imake_manpage_handling_overhaul.diff 2005-07-23 05:45:02.000000000 +0800
+++ debian/patches/general/004_imake_manpage_handling_overhaul.diff 2005-07-31 03:24:34.000000000 +0800
@@ -8,9 +8,10 @@
Not submitted upstream.
-diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
---- xc.orig/config/cf/Imake.tmpl 2005-02-02 00:17:15.186147368 +1100
-+++ xc/config/cf/Imake.tmpl 2005-02-02 00:20:07.980878576 +1100
+Index: xc/config/cf/Imake.tmpl
+===================================================================
+--- xc/config/cf/Imake.tmpl.orig 2005-07-26 14:29:22.000000000 +0800
++++ xc/config/cf/Imake.tmpl 2005-07-26 14:31:11.000000000 +0800
@@ -883,37 +883,82 @@
#define ManSourcePath $(MANPATH)/man
#endif
@@ -221,9 +222,10 @@
COMPRESSMANCMD = CompressManCmd
-diff -urN xc.orig/config/cf/gnu.cf xc/config/cf/gnu.cf
---- xc.orig/config/cf/gnu.cf 2005-02-02 00:17:15.217142656 +1100
-+++ xc/config/cf/gnu.cf 2005-02-02 00:20:07.951882984 +1100
+Index: xc/config/cf/gnu.cf
+===================================================================
+--- xc/config/cf/gnu.cf.orig 2005-07-26 14:29:42.000000000 +0800
++++ xc/config/cf/gnu.cf 2005-07-26 14:31:06.000000000 +0800
@@ -146,26 +146,6 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
@@ -251,9 +253,10 @@
#ifndef StaticLibrary
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
-diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf 2005-02-02 00:17:15.203144784 +1100
-+++ xc/config/cf/linux.cf 2005-02-02 00:20:48.022791280 +1100
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc/config/cf/linux.cf.orig 2005-07-26 14:29:43.000000000 +0800
++++ xc/config/cf/linux.cf 2005-07-26 14:31:13.000000000 +0800
@@ -141,6 +141,8 @@
# define MiscManSuffix 7x
# define MiscManDir $(MANSOURCEPATH)7
@@ -263,7 +266,7 @@
/*
*
*
-@@ -1054,26 +1056,6 @@
+@@ -1055,26 +1057,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
@@ -290,9 +293,10 @@
#ifndef StaticLibrary
# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
-diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
---- xc.orig/config/cf/xfree86.cf 2005-02-02 00:17:15.298130344 +1100
-+++ xc/config/cf/xfree86.cf 2005-02-02 00:20:08.062866112 +1100
+Index: xc/config/cf/xfree86.cf
+===================================================================
+--- xc/config/cf/xfree86.cf.orig 2005-07-26 14:29:43.000000000 +0800
++++ xc/config/cf/xfree86.cf 2005-07-26 14:31:13.000000000 +0800
@@ -1843,10 +1843,6 @@
# define UseRgbTxt YES
#endif
@@ -304,9 +308,10 @@
/*
* GNU Compiler stuff
*/
-diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
---- xc.orig/config/cf/xorg.cf 2005-02-02 00:17:15.219142352 +1100
-+++ xc/config/cf/xorg.cf 2005-02-02 00:21:15.937547592 +1100
+Index: xc/config/cf/xorg.cf
+===================================================================
+--- xc/config/cf/xorg.cf.orig 2005-07-26 14:29:43.000000000 +0800
++++ xc/config/cf/xorg.cf 2005-07-26 14:29:43.000000000 +0800
@@ -1503,10 +1503,6 @@
# define UseRgbTxt YES
#endif
diff -Nru debian.orig/patches/general/009_disable_Xprt.diff debian/patches/general/009_disable_Xprt.diff
--- debian.orig/patches/general/009_disable_Xprt.diff 2005-07-23 05:45:02.000000000 +0800
+++ debian/patches/general/009_disable_Xprt.diff 2005-07-31 03:24:34.000000000 +0800
@@ -1,9 +1,10 @@
-diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf 2005-07-07 20:40:56.000000000 +0800
-+++ xc/config/cf/linux.cf 2005-07-07 20:41:57.000000000 +0800
-@@ -233,6 +233,15 @@
- # define FontLibSharedFreeType NO
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc/config/cf/linux.cf.orig 2005-07-26 14:31:24.000000000 +0800
++++ xc/config/cf/linux.cf 2005-07-26 14:32:04.000000000 +0800
+@@ -234,6 +234,15 @@
# define HasLatex YES
+ # define HasGroffHtml YES
+/*
+ * The XFree86 Debian package no longer builds the Xprt server, in favor
@@ -17,9 +18,10 @@
# ifdef UseInstalled
# define RenderLibraryDir /usr
# define XftLibraryDir /usr
-diff -Nru xc.orig/programs/Xserver/Xprint/Imakefile xc/programs/Xserver/Xprint/Imakefile
---- xc.orig/programs/Xserver/Xprint/Imakefile 2005-07-07 20:40:46.000000000 +0800
-+++ xc/programs/Xserver/Xprint/Imakefile 2005-07-07 20:41:57.000000000 +0800
+Index: xc/programs/Xserver/Xprint/Imakefile
+===================================================================
+--- xc/programs/Xserver/Xprint/Imakefile.orig 2005-07-26 14:31:13.000000000 +0800
++++ xc/programs/Xserver/Xprint/Imakefile 2005-07-26 14:31:25.000000000 +0800
@@ -125,12 +125,3 @@
#endif
diff -Nru debian.orig/patches/general/099s_selinux_support.diff debian/patches/general/099s_selinux_support.diff
--- debian.orig/patches/general/099s_selinux_support.diff 2005-07-31 00:29:10.000000000 +0800
+++ debian/patches/general/099s_selinux_support.diff 2005-07-31 03:25:52.000000000 +0800
@@ -36,9 +36,9 @@
Index: xc/config/cf/linux.cf
===================================================================
---- xc/config/cf/linux.cf.orig 2005-07-30 12:14:56.000000000 -0400
-+++ xc/config/cf/linux.cf 2005-07-30 12:21:02.000000000 -0400
-@@ -1114,3 +1114,59 @@
+--- xc/config/cf/linux.cf.orig 2005-07-31 03:25:14.000000000 +0800
++++ xc/config/cf/linux.cf 2005-07-31 03:25:47.000000000 +0800
+@@ -1115,3 +1115,59 @@
#ifndef XFree86ServerOSDefines
# define XFree86ServerOSDefines
#endif
@@ -100,8 +100,8 @@
+#endif
Index: xc/programs/xdm/session.c
===================================================================
---- xc/programs/xdm/session.c.orig 2005-07-30 12:14:55.000000000 -0400
-+++ xc/programs/xdm/session.c 2005-07-30 12:14:58.000000000 -0400
+--- xc/programs/xdm/session.c.orig 2005-07-31 03:25:09.000000000 +0800
++++ xc/programs/xdm/session.c 2005-07-31 03:25:17.000000000 +0800
@@ -61,6 +61,11 @@
# include <krb5/krb5.h>
#endif
@@ -169,8 +169,8 @@
if (chdir (home) == -1) {
Index: xc/programs/xdm/Imakefile
===================================================================
---- xc/programs/xdm/Imakefile.orig 2005-07-30 12:14:43.000000000 -0400
-+++ xc/programs/xdm/Imakefile 2005-07-30 12:14:58.000000000 -0400
+--- xc/programs/xdm/Imakefile.orig 2005-07-31 03:25:08.000000000 +0800
++++ xc/programs/xdm/Imakefile 2005-07-31 03:25:47.000000000 +0800
@@ -200,12 +200,13 @@
XDMCONFIGDIR = XdmConfigurationSubdirectory
SUBDIRS = $(GREET_DIR) $(XDMCONFIGDIR)
diff -Nru debian.orig/patches/general/fix-html-specs-generation.diff debian/patches/general/fix-html-specs-generation.diff
--- debian.orig/patches/general/fix-html-specs-generation.diff 1970-01-01 07:00:00.000000000 +0700
+++ debian/patches/general/fix-html-specs-generation.diff 2005-07-31 03:24:34.000000000 +0800
@@ -0,0 +1,21 @@
+diff -Nru xc-old/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc-old/config/cf/X11.tmpl 2005-07-26 14:14:29.000000000 +0800
++++ xc/config/cf/X11.tmpl 2005-07-26 12:53:15.000000000 +0800
+@@ -4656,7 +4656,7 @@
+
+ #ifndef MakeTblHtmlDoc
+ #ifdef HTMLroffCmd
+-#define MakeTblHtmlDoc @@\
++#define MakeTblHtmlDoc(file,srcs) @@\
+ file.html: srcs @@\
+ $(TBL) $(XDOCMACROS) srcs | $(HTMLROFF) $(MSMACROS) Concat(-P-I,file) \ @@\
+ 2> index.raw > file.nhtml \ @@\
+@@ -4668,7 +4668,7 @@
+
+ #ifndef MakeEqnHtmlDoc
+ #ifdef HTMLroffCmd
+-#define MakeEqnHtmlDoc @@\
++#define MakeEqnHtmlDoc(file,srcs) @@\
+ file.html: srcs @@\
+ $(TBL) $(XDOCMACROS) srcs | $(EQN) | $(HTMLROFF) $(MSMACROS) Concat(-P-I,file) \ @@\
+ 2> index.raw > file.nhtml \ @@\
diff -Nru debian.orig/patches/series debian/patches/series
--- debian.orig/patches/series 2005-07-31 00:29:10.000000000 +0800
+++ debian/patches/series 2005-07-31 03:24:34.000000000 +0800
@@ -150,3 +150,4 @@
debian/989_ubuntu_add_extra_modelines_from_xorg.diff -p0
debian/990_ubuntu_accept_enabled_for_extensions.diff -p0
debian/991_ubuntu_gcc_flags.diff -p0
+general/fix-html-specs-generation.diff -p0
diff -Nru debian.orig/xspecs.docs debian/xspecs.docs
--- debian.orig/xspecs.docs 2005-05-09 11:50:46.000000000 +0800
+++ debian/xspecs.docs 2005-07-31 03:24:34.000000000 +0800
@@ -101,3 +101,4 @@
debian/tmp/usr/X11R6/lib/X11/doc/xtest.txt
debian/tmp/usr/X11R6/lib/X11/doc/xtestlib.txt
debian/tmp/usr/X11R6/lib/X11/doc/xv-protocol-v2.txt
+debian/tmp/usr/X11R6/lib/X11/doc/html/
Reply to: