Hi, I rebuilt the 6.9RC0 tree with the attached patch, which gave me the following MANIFEST diff:
--- debian/MANIFEST.alpha 2005-10-22 00:25:25.000000000 +0000 +++ debian/MANIFEST.alpha.new 2005-10-22 00:25:25.000000000 +0000 @@ -18,2 +17,0 @@ -etc/X11/app-defaults/KOI8RXTerm -etc/X11/app-defaults/UXTerm @@ -34,2 +31,0 @@ -etc/X11/app-defaults/XTerm -etc/X11/app-defaults/XTerm-color @@ -455 +450,0 @@ -usr/X11R6/bin/Xorg-debug @@ -470,2 +464,0 @@ -usr/X11R6/bin/dpsexec -usr/X11R6/bin/dpsinfo @@ -485 +477,0 @@ -usr/X11R6/bin/koi8rxterm @@ -490 +481,0 @@ -usr/X11R6/bin/lxterm @@ -493 +483,0 @@ -usr/X11R6/bin/makepsres @@ -504,0 +495 @@ +usr/X11R6/bin/pclcomp @@ -506,2 +496,0 @@ -usr/X11R6/bin/pswrap -usr/X11R6/bin/resize @@ -520 +508,0 @@ -usr/X11R6/bin/texteroids @@ -523 +510,0 @@ -usr/X11R6/bin/uxterm @@ -528,0 +516 @@ +usr/X11R6/bin/xauth_switch_to_sun-des-1 @@ -536,0 +525 @@ +usr/X11R6/bin/xdbedizzy @@ -539,0 +529 @@ +usr/X11R6/bin/xdpr @@ -577,0 +568 @@ +usr/X11R6/bin/xpr @@ -591 +581,0 @@ -usr/X11R6/bin/xterm @@ -604,26 +593,0 @@ -usr/X11R6/include/DPS/ColorSB.h -usr/X11R6/include/DPS/ColorSBP.h -usr/X11R6/include/DPS/DPSScrollW.h -usr/X11R6/include/DPS/DPSScrollWP.h -usr/X11R6/include/DPS/FontCreatP.h -usr/X11R6/include/DPS/FontCreato.h -usr/X11R6/include/DPS/FontSB.h -usr/X11R6/include/DPS/FontSBP.h -usr/X11R6/include/DPS/FontSamplP.h -usr/X11R6/include/DPS/FontSample.h -usr/X11R6/include/DPS/PSres.h -usr/X11R6/include/DPS/XDPS.h -usr/X11R6/include/DPS/XDPSlib.h -usr/X11R6/include/DPS/XDPSproto.h -usr/X11R6/include/DPS/dpsNXargs.h -usr/X11R6/include/DPS/dpsXclient.h -usr/X11R6/include/DPS/dpsXcommon.h -usr/X11R6/include/DPS/dpsXpreview.h -usr/X11R6/include/DPS/dpsXshare.h -usr/X11R6/include/DPS/dpsXuserpath.h -usr/X11R6/include/DPS/dpsclient.h -usr/X11R6/include/DPS/dpsconfig.h -usr/X11R6/include/DPS/dpsexcept.h -usr/X11R6/include/DPS/dpsfriends.h -usr/X11R6/include/DPS/dpsops.h -usr/X11R6/include/DPS/psops.h @@ -643,0 +608 @@ +usr/X11R6/include/X11/CallbackI.h @@ -647,0 +613 @@ +usr/X11R6/include/X11/ConvertI.h @@ -649,0 +616 @@ +usr/X11R6/include/X11/CreateI.h @@ -650,0 +618 @@ +usr/X11R6/include/X11/EventI.h @@ -651,0 +620 @@ +usr/X11R6/include/X11/HookObjI.h @@ -657,0 +627,2 @@ +usr/X11R6/include/X11/ImUtil.h +usr/X11R6/include/X11/InitialI.h @@ -658,0 +630 @@ +usr/X11R6/include/X11/IntrinsicI.h @@ -663,0 +636 @@ +usr/X11R6/include/X11/PassivGraI.h @@ -665,0 +639 @@ +usr/X11R6/include/X11/ResourceI.h @@ -668,0 +643 @@ +usr/X11R6/include/X11/SelectionI.h @@ -669,0 +645 @@ +usr/X11R6/include/X11/ShellI.h @@ -672,0 +649,3 @@ +usr/X11R6/include/X11/ThreadsI.h +usr/X11R6/include/X11/TranslateI.h +usr/X11R6/include/X11/VarargsI.h @@ -762,0 +742 @@ +usr/X11R6/include/X11/XlibConf.h @@ -795,0 +776 @@ +usr/X11R6/include/X11/Xregion.h @@ -981,0 +963 @@ +usr/X11R6/include/X11/extensions/vldXvMC.h @@ -1009,0 +992,7 @@ +usr/X11R6/include/X11/fonts/bdfint.h +usr/X11R6/include/X11/fonts/bitmap.h +usr/X11R6/include/X11/fonts/bufio.h +usr/X11R6/include/X11/fonts/fntfil.h +usr/X11R6/include/X11/fonts/fntfilio.h +usr/X11R6/include/X11/fonts/fntfilst.h +usr/X11R6/include/X11/fonts/font.h @@ -1010,0 +1000,7 @@ +usr/X11R6/include/X11/fonts/fontencc.h +usr/X11R6/include/X11/fonts/fontmisc.h +usr/X11R6/include/X11/fonts/fontmod.h +usr/X11R6/include/X11/fonts/fontshow.h +usr/X11R6/include/X11/fonts/fontstruct.h +usr/X11R6/include/X11/fonts/fontutil.h +usr/X11R6/include/X11/fonts/fontxlfd.h @@ -1011,0 +1008 @@ +usr/X11R6/include/X11/fonts/pcf.h @@ -1013,0 +1011,2 @@ +usr/X11R6/include/X11/misc.h +usr/X11R6/include/X11/os.h @@ -1028,0 +1028 @@ +usr/X11R6/lib/X11/config/DragonFly.cf @@ -1087,0 +1088,3 @@ +usr/X11R6/lib/X11/config/mingw.cf +usr/X11R6/lib/X11/config/mingw.rules +usr/X11R6/lib/X11/config/mingw.tmpl @@ -1175,2 +1177,0 @@ -usr/X11R6/lib/X11/etc/xterm.termcap -usr/X11R6/lib/X11/etc/xterm.terminfo @@ -1449,0 +1451,3 @@ +usr/X11R6/lib/X11/locale/zh_CN.gb18030/Compose +usr/X11R6/lib/X11/locale/zh_CN.gb18030/XI18N_OBJS +usr/X11R6/lib/X11/locale/zh_CN.gb18030/XLC_LOCALE @@ -1455,0 +1460,4 @@ +usr/X11R6/lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS +usr/X11R6/lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE +usr/X11R6/lib/X11/locale/zh_HK.big5/Compose +usr/X11R6/lib/X11/locale/zh_HK.big5/XI18N_OBJS @@ -1456,0 +1465 @@ +usr/X11R6/lib/X11/locale/zh_HK.big5hkscs/Compose @@ -1487,0 +1497 @@ +usr/X11R6/lib/X11/xorg.conf.eg @@ -1499 +1509 @@ -usr/X11R6/lib/libICE.so.6.3 +usr/X11R6/lib/libICE.so.6.4 @@ -1558,0 +1569,2 @@ +usr/X11R6/lib/libXvMCW.a +usr/X11R6/lib/libXvMCW.so.1.0 @@ -1569,4 +1580,0 @@ -usr/X11R6/lib/libdps.a -usr/X11R6/lib/libdps.so.1.0 -usr/X11R6/lib/libdpstk.a -usr/X11R6/lib/libdpstk.so.1.0 @@ -1576,2 +1584,4 @@ -usr/X11R6/lib/libpsres.a -usr/X11R6/lib/libpsres.so.1.0 +usr/X11R6/lib/libviaXvMC.a +usr/X11R6/lib/libviaXvMC.so.1.0 +usr/X11R6/lib/libviaXvMCPro.a +usr/X11R6/lib/libviaXvMCPro.so.1.0 @@ -1584 +1593,0 @@ -usr/X11R6/lib/modules/dri/gamma_dri.so @@ -1590,84 +1599,95 @@ -usr/X11R6/lib/modules/drivers/ati_drv.o -usr/X11R6/lib/modules/drivers/atimisc_drv.o -usr/X11R6/lib/modules/drivers/cirrus_alpine_drv.o -usr/X11R6/lib/modules/drivers/cirrus_drv.o -usr/X11R6/lib/modules/drivers/cirrus_laguna_drv.o -usr/X11R6/lib/modules/drivers/fbdev_drv.o -usr/X11R6/lib/modules/drivers/glint_drv.o -usr/X11R6/lib/modules/drivers/linux/v4l_drv.o -usr/X11R6/lib/modules/drivers/mga_drv.o -usr/X11R6/lib/modules/drivers/nv_drv.o -usr/X11R6/lib/modules/drivers/r128_drv.o -usr/X11R6/lib/modules/drivers/radeon_drv.o -usr/X11R6/lib/modules/drivers/rendition_drv.o -usr/X11R6/lib/modules/drivers/riva128_drv.o -usr/X11R6/lib/modules/drivers/s3_drv.o -usr/X11R6/lib/modules/drivers/s3virge_drv.o -usr/X11R6/lib/modules/drivers/savage_drv.o -usr/X11R6/lib/modules/drivers/siliconmotion_drv.o -usr/X11R6/lib/modules/drivers/tdfx_drv.o -usr/X11R6/lib/modules/drivers/tga_drv.o -usr/X11R6/lib/modules/drivers/vga_drv.o -usr/X11R6/lib/modules/extensions/libGLcore.a -usr/X11R6/lib/modules/extensions/libdbe.a -usr/X11R6/lib/modules/extensions/libdri.a -usr/X11R6/lib/modules/extensions/libextmod.a -usr/X11R6/lib/modules/extensions/libglx.a -usr/X11R6/lib/modules/extensions/librecord.a -usr/X11R6/lib/modules/extensions/libxtrap.a -usr/X11R6/lib/modules/fonts/libbitmap.a -usr/X11R6/lib/modules/fonts/libfreetype.a -usr/X11R6/lib/modules/fonts/libtype1.a -usr/X11R6/lib/modules/input/acecad_drv.o -usr/X11R6/lib/modules/input/aiptek_drv.o -usr/X11R6/lib/modules/input/calcomp_drv.o -usr/X11R6/lib/modules/input/citron_drv.o -usr/X11R6/lib/modules/input/digitaledge_drv.o -usr/X11R6/lib/modules/input/dmc_drv.o -usr/X11R6/lib/modules/input/dynapro_drv.o -usr/X11R6/lib/modules/input/elographics_drv.o -usr/X11R6/lib/modules/input/fpit_drv.o -usr/X11R6/lib/modules/input/hyperpen_drv.o -usr/X11R6/lib/modules/input/js_x_drv.o -usr/X11R6/lib/modules/input/kbd_drv.o -usr/X11R6/lib/modules/input/keyboard_drv.o -usr/X11R6/lib/modules/input/linux/ur98_drv.o -usr/X11R6/lib/modules/input/magellan_drv.o -usr/X11R6/lib/modules/input/microtouch_drv.o -usr/X11R6/lib/modules/input/mouse_drv.o -usr/X11R6/lib/modules/input/mutouch_drv.o -usr/X11R6/lib/modules/input/palmax_drv.o -usr/X11R6/lib/modules/input/penmount_drv.o -usr/X11R6/lib/modules/input/spaceorb_drv.o -usr/X11R6/lib/modules/input/summa_drv.o -usr/X11R6/lib/modules/input/tek4957_drv.o -usr/X11R6/lib/modules/input/void_drv.o -usr/X11R6/lib/modules/input/wacom_drv.o -usr/X11R6/lib/modules/libcfb.a -usr/X11R6/lib/modules/libcfb16.a -usr/X11R6/lib/modules/libcfb24.a -usr/X11R6/lib/modules/libcfb32.a -usr/X11R6/lib/modules/libcw.a -usr/X11R6/lib/modules/libdamage.a -usr/X11R6/lib/modules/libddc.a -usr/X11R6/lib/modules/libfb.a -usr/X11R6/lib/modules/libi2c.a -usr/X11R6/lib/modules/libint10.a -usr/X11R6/lib/modules/liblayer.a -usr/X11R6/lib/modules/libmfb.a -usr/X11R6/lib/modules/libpcidata.a -usr/X11R6/lib/modules/librac.a -usr/X11R6/lib/modules/libramdac.a -usr/X11R6/lib/modules/libscanpci.a -usr/X11R6/lib/modules/libshadow.a -usr/X11R6/lib/modules/libshadowfb.a -usr/X11R6/lib/modules/libvbe.a -usr/X11R6/lib/modules/libvgahw.a -usr/X11R6/lib/modules/libxaa.a -usr/X11R6/lib/modules/libxf1bpp.a -usr/X11R6/lib/modules/libxf24_32bpp.a -usr/X11R6/lib/modules/libxf4bpp.a -usr/X11R6/lib/modules/libxf8_16bpp.a -usr/X11R6/lib/modules/libxf8_32bpp.a -usr/X11R6/lib/modules/linux/libdrm.a -usr/X11R6/lib/modules/linux/libfbdevhw.a +usr/X11R6/lib/modules/drivers/ati_drv.so +usr/X11R6/lib/modules/drivers/atimisc_drv.so +usr/X11R6/lib/modules/drivers/cirrus_alpine_drv.so +usr/X11R6/lib/modules/drivers/cirrus_drv.so +usr/X11R6/lib/modules/drivers/cirrus_laguna_drv.so +usr/X11R6/lib/modules/drivers/dummy_drv.so +usr/X11R6/lib/modules/drivers/fbdev_drv.so +usr/X11R6/lib/modules/drivers/glint_drv.so +usr/X11R6/lib/modules/drivers/mga_drv.so +usr/X11R6/lib/modules/drivers/nv_drv.so +usr/X11R6/lib/modules/drivers/r128_drv.so +usr/X11R6/lib/modules/drivers/radeon_drv.so +usr/X11R6/lib/modules/drivers/rendition_drv.so +usr/X11R6/lib/modules/drivers/riva128_drv.so +usr/X11R6/lib/modules/drivers/s3_drv.so +usr/X11R6/lib/modules/drivers/s3virge_drv.so +usr/X11R6/lib/modules/drivers/savage_drv.so +usr/X11R6/lib/modules/drivers/siliconmotion_drv.so +usr/X11R6/lib/modules/drivers/sisusb_drv.so +usr/X11R6/lib/modules/drivers/tdfx_drv.so +usr/X11R6/lib/modules/drivers/tga_drv.so +usr/X11R6/lib/modules/drivers/v4l_drv.so +usr/X11R6/lib/modules/drivers/vga_drv.so +usr/X11R6/lib/modules/extensions/libGLcore.so +usr/X11R6/lib/modules/extensions/libdbe.so +usr/X11R6/lib/modules/extensions/libdri.so +usr/X11R6/lib/modules/extensions/libextmod.so +usr/X11R6/lib/modules/extensions/libglx.so +usr/X11R6/lib/modules/extensions/librecord.so +usr/X11R6/lib/modules/extensions/libxtrap.so +usr/X11R6/lib/modules/fonts/libbitmap.so +usr/X11R6/lib/modules/fonts/libfreetype.so +usr/X11R6/lib/modules/fonts/libtype1.so +usr/X11R6/lib/modules/input/acecad_drv.so +usr/X11R6/lib/modules/input/aiptek_drv.so +usr/X11R6/lib/modules/input/calcomp_drv.so +usr/X11R6/lib/modules/input/citron_drv.so +usr/X11R6/lib/modules/input/digitaledge_drv.so +usr/X11R6/lib/modules/input/dmc_drv.so +usr/X11R6/lib/modules/input/dynapro_drv.so +usr/X11R6/lib/modules/input/elographics_drv.so +usr/X11R6/lib/modules/input/evdev_drv.so +usr/X11R6/lib/modules/input/fpit_drv.so +usr/X11R6/lib/modules/input/hyperpen_drv.so +usr/X11R6/lib/modules/input/js_x_drv.so +usr/X11R6/lib/modules/input/kbd_drv.so +usr/X11R6/lib/modules/input/keyboard_drv.so +usr/X11R6/lib/modules/input/magellan_drv.so +usr/X11R6/lib/modules/input/microtouch_drv.so +usr/X11R6/lib/modules/input/mouse_drv.so +usr/X11R6/lib/modules/input/mutouch_drv.so +usr/X11R6/lib/modules/input/palmax_drv.so +usr/X11R6/lib/modules/input/penmount_drv.so +usr/X11R6/lib/modules/input/spaceorb_drv.so +usr/X11R6/lib/modules/input/summa_drv.so +usr/X11R6/lib/modules/input/tek4957_drv.so +usr/X11R6/lib/modules/input/ur98_drv.so +usr/X11R6/lib/modules/input/void_drv.so +usr/X11R6/lib/modules/input/wacom_drv.so +usr/X11R6/lib/modules/libcfb.so +usr/X11R6/lib/modules/libcfb16.so +usr/X11R6/lib/modules/libcfb24.so +usr/X11R6/lib/modules/libcfb32.so +usr/X11R6/lib/modules/libddc.so +usr/X11R6/lib/modules/libexa.so +usr/X11R6/lib/modules/libfb.so +usr/X11R6/lib/modules/libi2c.so +usr/X11R6/lib/modules/libint10.so +usr/X11R6/lib/modules/liblayer.so +usr/X11R6/lib/modules/libmfb.so +usr/X11R6/lib/modules/libpcidata.so +usr/X11R6/lib/modules/librac.so +usr/X11R6/lib/modules/libramdac.so +usr/X11R6/lib/modules/libscanpci.so +usr/X11R6/lib/modules/libshadow.so +usr/X11R6/lib/modules/libshadowfb.so +usr/X11R6/lib/modules/libvbe.so +usr/X11R6/lib/modules/libvgahw.so +usr/X11R6/lib/modules/libxaa.so +usr/X11R6/lib/modules/libxf1bpp.so +usr/X11R6/lib/modules/libxf4bpp.so +usr/X11R6/lib/modules/libxf8_16bpp.so +usr/X11R6/lib/modules/libxf8_32bpp.so +usr/X11R6/lib/modules/linux/libdrm.so +usr/X11R6/lib/modules/linux/libfbdevhw.so +usr/X11R6/lib/modules/multimedia/bt829_drv.so +usr/X11R6/lib/modules/multimedia/fi1236_drv.so +usr/X11R6/lib/modules/multimedia/msp3430_drv.so +usr/X11R6/lib/modules/multimedia/tda8425_drv.so +usr/X11R6/lib/modules/multimedia/tda9850_drv.so +usr/X11R6/lib/modules/multimedia/tda9885_drv.so +usr/X11R6/lib/modules/multimedia/theatre200_drv.so +usr/X11R6/lib/modules/multimedia/theatre_detect_drv.so +usr/X11R6/lib/modules/multimedia/theatre_drv.so +usr/X11R6/lib/modules/multimedia/uda1380_drv.so @@ -1697,2 +1716,0 @@ -usr/X11R6/man/man1/dpsexec.1x -usr/X11R6/man/man1/dpsinfo.1x @@ -1711 +1728,0 @@ -usr/X11R6/man/man1/koi8rxterm.1x @@ -1716 +1732,0 @@ -usr/X11R6/man/man1/lxterm.1x @@ -1719 +1734,0 @@ -usr/X11R6/man/man1/makepsres.1x @@ -1728,0 +1744 @@ +usr/X11R6/man/man1/pclcomp.1x @@ -1730,2 +1745,0 @@ -usr/X11R6/man/man1/pswrap.1x -usr/X11R6/man/man1/resize.1x @@ -1743 +1756,0 @@ -usr/X11R6/man/man1/texteroids.1x @@ -1746 +1758,0 @@ -usr/X11R6/man/man1/uxterm.1x @@ -1759,0 +1772 @@ +usr/X11R6/man/man1/xdbedizzy.1x @@ -1762,0 +1776 @@ +usr/X11R6/man/man1/xdpr.1x @@ -1797,0 +1812 @@ +usr/X11R6/man/man1/xpr.1x @@ -1811 +1825,0 @@ -usr/X11R6/man/man1/xterm.1x @@ -1853,0 +1868,9 @@ +usr/X11R6/man/man3/DPMSCapable.3x +usr/X11R6/man/man3/DPMSDisable.3x +usr/X11R6/man/man3/DPMSEnable.3x +usr/X11R6/man/man3/DPMSForceLevel.3x +usr/X11R6/man/man3/DPMSGetTimeouts.3x +usr/X11R6/man/man3/DPMSGetVersion.3x +usr/X11R6/man/man3/DPMSInfo.3x +usr/X11R6/man/man3/DPMSQueryExtension.3x +usr/X11R6/man/man3/DPMSSetTimeouts.3x @@ -1894 +1917 @@ -usr/X11R6/man/man3/IsModiferKey.3x +usr/X11R6/man/man3/IsModifierKey.3x @@ -2073,0 +2097,9 @@ +usr/X11R6/man/man3/XF86Misc.3x +usr/X11R6/man/man3/XF86MiscGetKbdSettings.3x +usr/X11R6/man/man3/XF86MiscGetMouseSettings.3x +usr/X11R6/man/man3/XF86MiscGetSaver.3x +usr/X11R6/man/man3/XF86MiscQueryExtension.3x +usr/X11R6/man/man3/XF86MiscQueryVersion.3x +usr/X11R6/man/man3/XF86MiscSetKbdSettings.3x +usr/X11R6/man/man3/XF86MiscSetMouseSettings.3x +usr/X11R6/man/man3/XF86MiscSetSaver.3x @@ -2118,0 +2151 @@ +usr/X11R6/man/man3/XFreeExtensionList.3x @@ -2212,0 +2246 @@ +usr/X11R6/man/man3/XListExtensions.3x @@ -2273,0 +2308 @@ +usr/X11R6/man/man3/XQueryExtension.3x @@ -2517,0 +2553,3 @@ +usr/X11R6/man/man3/XcupGetReservedColormapEntries.3x +usr/X11R6/man/man3/XcupQueryVersion.3x +usr/X11R6/man/man3/XcupStoreColors.3x @@ -2631,0 +2670 @@ +usr/X11R6/man/man3/XtAddWorkProc.3x @@ -3476,0 +3516 @@ +usr/X11R6/man/man4/sisusb.4x
Index:
xorg-x11-6.8.99.900.dfsg.1/xc/programs/Xserver/hw/xfree86/common/compiler.h
===================================================================
---
xorg-x11-6.8.99.900.dfsg.1.orig/xc/programs/Xserver/hw/xfree86/common/compiler.h
2005-10-19 18:11:45.000000000 +0200
+++ xorg-x11-6.8.99.900.dfsg.1/xc/programs/Xserver/hw/xfree86/common/compiler.h
2005-10-21 16:31:00.000000000 +0200
@@ -66,6 +66,8 @@
# define DO_PROTOTYPES
#endif
+# include <X11/Xmd.h>
+
/* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
# ifndef __inline__
# if defined(__GNUC__)
signature.asc
Description: Digital signature
