[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r1034 - in trunk/debian: . patches patches/hurd



Author: dnusinow
Date: 2006-01-08 19:22:38 -0500 (Sun, 08 Jan 2006)
New Revision: 1034

Added:
   trunk/debian/patches/hurd/809_keyboard.diff
   trunk/debian/patches/hurd/810_xdm_utsname.diff
   trunk/debian/patches/hurd/811_ioperms.diff
Modified:
   trunk/debian/MANIFEST.hurd-i386.in
   trunk/debian/changelog
   trunk/debian/patches/hurd/800_gnu_config.diff
   trunk/debian/patches/series
   trunk/debian/xserver-xorg.install.hurd-i386
Log:
* HURD patch and MANIFEST updates. Thanks Samuel Thibault and Michael Banck.
  (closes: #346500)


Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in	2006-01-09 00:02:43 UTC (rev 1033)
+++ trunk/debian/MANIFEST.hurd-i386.in	2006-01-09 00:22:38 UTC (rev 1034)
@@ -14,8 +14,6 @@
 etc/X11/app-defaults/Clock-color
 etc/X11/app-defaults/Editres
 etc/X11/app-defaults/Editres-color
-etc/X11/app-defaults/KOI8RXTerm
-etc/X11/app-defaults/UXTerm
 etc/X11/app-defaults/Viewres
 etc/X11/app-defaults/XCalc
 etc/X11/app-defaults/XCalc-color
@@ -30,8 +28,6 @@
 etc/X11/app-defaults/XMore
 etc/X11/app-defaults/XOrgCfg
 etc/X11/app-defaults/XSm
-etc/X11/app-defaults/XTerm
-etc/X11/app-defaults/XTerm-color
 etc/X11/app-defaults/Xditview
 etc/X11/app-defaults/Xditview-chrtr
 etc/X11/app-defaults/Xedit
@@ -91,11 +87,12 @@
 etc/X11/xkb/compat/basic
 etc/X11/xkb/compat/complete
 etc/X11/xkb/compat/default
-etc/X11/xkb/compat/group_led
 etc/X11/xkb/compat/iso9995
 etc/X11/xkb/compat/japan
 etc/X11/xkb/compat/keypad
-etc/X11/xkb/compat/leds
+etc/X11/xkb/compat/ledcaps
+etc/X11/xkb/compat/lednum
+etc/X11/xkb/compat/ledscroll
 etc/X11/xkb/compat/misc
 etc/X11/xkb/compat/mousekeys
 etc/X11/xkb/compat/norepeat
@@ -224,6 +221,7 @@
 etc/X11/xkb/symbols/by
 etc/X11/xkb/symbols/ca
 etc/X11/xkb/symbols/ca_enhanced
+etc/X11/xkb/symbols/capslock
 etc/X11/xkb/symbols/compose
 etc/X11/xkb/symbols/ctrl
 etc/X11/xkb/symbols/cz
@@ -242,7 +240,9 @@
 etc/X11/xkb/symbols/el
 etc/X11/xkb/symbols/en_US
 etc/X11/xkb/symbols/es
+etc/X11/xkb/symbols/eurosign
 etc/X11/xkb/symbols/fi
+etc/X11/xkb/symbols/fo
 etc/X11/xkb/symbols/fr
 etc/X11/xkb/symbols/fr_CH
 etc/X11/xkb/symbols/fujitsu/jp
@@ -304,89 +304,69 @@
 etc/X11/xkb/symbols/ori
 etc/X11/xkb/symbols/pc/al
 etc/X11/xkb/symbols/pc/am
-etc/X11/xkb/symbols/pc/ar
+etc/X11/xkb/symbols/pc/ara
+etc/X11/xkb/symbols/pc/az
+etc/X11/xkb/symbols/pc/ba
+etc/X11/xkb/symbols/pc/bd
 etc/X11/xkb/symbols/pc/be
-etc/X11/xkb/symbols/pc/ben
 etc/X11/xkb/symbols/pc/bg
 etc/X11/xkb/symbols/pc/br
+etc/X11/xkb/symbols/pc/bt
 etc/X11/xkb/symbols/pc/by
 etc/X11/xkb/symbols/pc/ca
 etc/X11/xkb/symbols/pc/ch
 etc/X11/xkb/symbols/pc/cz
-etc/X11/xkb/symbols/pc/cz_qwerty
 etc/X11/xkb/symbols/pc/de
-etc/X11/xkb/symbols/pc/dev
 etc/X11/xkb/symbols/pc/dk
-etc/X11/xkb/symbols/pc/dvorak
-etc/X11/xkb/symbols/pc/dz
 etc/X11/xkb/symbols/pc/ee
-etc/X11/xkb/symbols/pc/el
-etc/X11/xkb/symbols/pc/en_US
 etc/X11/xkb/symbols/pc/es
 etc/X11/xkb/symbols/pc/fi
+etc/X11/xkb/symbols/pc/fo
 etc/X11/xkb/symbols/pc/fr
-etc/X11/xkb/symbols/pc/fr-latin9
 etc/X11/xkb/symbols/pc/gb
-etc/X11/xkb/symbols/pc/ge_la
-etc/X11/xkb/symbols/pc/ge_ru
-etc/X11/xkb/symbols/pc/guj
-etc/X11/xkb/symbols/pc/gur
+etc/X11/xkb/symbols/pc/ge
+etc/X11/xkb/symbols/pc/gr
 etc/X11/xkb/symbols/pc/hr
 etc/X11/xkb/symbols/pc/hu
 etc/X11/xkb/symbols/pc/ie
 etc/X11/xkb/symbols/pc/il
-etc/X11/xkb/symbols/pc/il_phonetic
+etc/X11/xkb/symbols/pc/in
 etc/X11/xkb/symbols/pc/ir
 etc/X11/xkb/symbols/pc/is
 etc/X11/xkb/symbols/pc/it
-etc/X11/xkb/symbols/pc/iu
 etc/X11/xkb/symbols/pc/jp
-etc/X11/xkb/symbols/pc/kan
+etc/X11/xkb/symbols/pc/kg
 etc/X11/xkb/symbols/pc/la
+etc/X11/xkb/symbols/pc/latam
 etc/X11/xkb/symbols/pc/latin
-etc/X11/xkb/symbols/pc/lo
+etc/X11/xkb/symbols/pc/lk
 etc/X11/xkb/symbols/pc/lt
 etc/X11/xkb/symbols/pc/lv
-etc/X11/xkb/symbols/pc/mk
-etc/X11/xkb/symbols/pc/ml
+etc/X11/xkb/symbols/pc/mao
+etc/X11/xkb/symbols/pc/mkd
 etc/X11/xkb/symbols/pc/mm
 etc/X11/xkb/symbols/pc/mn
 etc/X11/xkb/symbols/pc/mt
-etc/X11/xkb/symbols/pc/mt_us
 etc/X11/xkb/symbols/pc/nl
 etc/X11/xkb/symbols/pc/no
-etc/X11/xkb/symbols/pc/ogham
-etc/X11/xkb/symbols/pc/ori
 etc/X11/xkb/symbols/pc/pc
+etc/X11/xkb/symbols/pc/pk
 etc/X11/xkb/symbols/pc/pl
-etc/X11/xkb/symbols/pc/pl2
 etc/X11/xkb/symbols/pc/pt
 etc/X11/xkb/symbols/pc/ro
 etc/X11/xkb/symbols/pc/ru
-etc/X11/xkb/symbols/pc/sapmi
 etc/X11/xkb/symbols/pc/se
-etc/X11/xkb/symbols/pc/se_FI
-etc/X11/xkb/symbols/pc/se_NO
-etc/X11/xkb/symbols/pc/se_SE
 etc/X11/xkb/symbols/pc/si
 etc/X11/xkb/symbols/pc/sk
-etc/X11/xkb/symbols/pc/sk_qwerty
-etc/X11/xkb/symbols/pc/sr
-etc/X11/xkb/symbols/pc/syr
-etc/X11/xkb/symbols/pc/syr_phonetic
-etc/X11/xkb/symbols/pc/tel
+etc/X11/xkb/symbols/pc/srp
+etc/X11/xkb/symbols/pc/sy
 etc/X11/xkb/symbols/pc/th
-etc/X11/xkb/symbols/pc/th_pat
-etc/X11/xkb/symbols/pc/th_tis
 etc/X11/xkb/symbols/pc/tj
-etc/X11/xkb/symbols/pc/tml
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
-etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/uz
 etc/X11/xkb/symbols/pc/vn
-etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/X11/xkb/symbols/pl
 etc/X11/xkb/symbols/pl2
@@ -450,7 +430,6 @@
 usr/X11R6/bin/Xmark
 usr/X11R6/bin/Xnest
 usr/X11R6/bin/Xorg
-usr/X11R6/bin/Xorg-debug
 usr/X11R6/bin/Xvfb
 usr/X11R6/bin/appres
 usr/X11R6/bin/atobm
@@ -465,8 +444,6 @@
 usr/X11R6/bin/cxpm
 usr/X11R6/bin/dga
 usr/X11R6/bin/dmxtodmx
-usr/X11R6/bin/dpsexec
-usr/X11R6/bin/dpsinfo
 usr/X11R6/bin/editres
 usr/X11R6/bin/fslsfonts
 usr/X11R6/bin/fstobdf
@@ -480,15 +457,12 @@
 usr/X11R6/bin/ico
 usr/X11R6/bin/imake
 usr/X11R6/bin/ioport
-usr/X11R6/bin/koi8rxterm
 usr/X11R6/bin/lbxproxy
 usr/X11R6/bin/listres
 usr/X11R6/bin/lndir
 usr/X11R6/bin/luit
-usr/X11R6/bin/lxterm
 usr/X11R6/bin/makedepend
 usr/X11R6/bin/makeg
-usr/X11R6/bin/makepsres
 usr/X11R6/bin/makestrs
 usr/X11R6/bin/mergelib
 usr/X11R6/bin/mkcfm
@@ -501,8 +475,6 @@
 usr/X11R6/bin/oclock
 usr/X11R6/bin/pcitweak
 usr/X11R6/bin/proxymngr
-usr/X11R6/bin/pswrap
-usr/X11R6/bin/resize
 usr/X11R6/bin/revpath
 usr/X11R6/bin/rstart
 usr/X11R6/bin/rstartd
@@ -515,15 +487,14 @@
 usr/X11R6/bin/smproxy
 usr/X11R6/bin/startx
 usr/X11R6/bin/sxpm
-usr/X11R6/bin/texteroids
 usr/X11R6/bin/twm
 usr/X11R6/bin/ucs2any
-usr/X11R6/bin/uxterm
 usr/X11R6/bin/vdltodmx
 usr/X11R6/bin/viewres
 usr/X11R6/bin/x11perf
 usr/X11R6/bin/x11perfcomp
 usr/X11R6/bin/xauth
+usr/X11R6/bin/xauth_switch_to_sun-des-1
 usr/X11R6/bin/xbiff
 usr/X11R6/bin/xcalc
 usr/X11R6/bin/xclipboard
@@ -532,9 +503,11 @@
 usr/X11R6/bin/xconsole
 usr/X11R6/bin/xcursorgen
 usr/X11R6/bin/xcutsel
+usr/X11R6/bin/xdbedizzy
 usr/X11R6/bin/xditview
 usr/X11R6/bin/xdm
 usr/X11R6/bin/xdmxconfig
+usr/X11R6/bin/xdpr
 usr/X11R6/bin/xdpyinfo
 usr/X11R6/bin/xdriinfo
 usr/X11R6/bin/xedit
@@ -573,6 +546,7 @@
 usr/X11R6/bin/xorgconfig
 usr/X11R6/bin/xphelloworld
 usr/X11R6/bin/xplsprinters
+usr/X11R6/bin/xpr
 usr/X11R6/bin/xprehashprinterlist
 usr/X11R6/bin/xprop
 usr/X11R6/bin/xpsimplehelloworld
@@ -586,7 +560,6 @@
 usr/X11R6/bin/xsetroot
 usr/X11R6/bin/xsm
 usr/X11R6/bin/xstdcmap
-usr/X11R6/bin/xterm
 usr/X11R6/bin/xtrapchar
 usr/X11R6/bin/xtrapin
 usr/X11R6/bin/xtrapinfo
@@ -599,32 +572,6 @@
 usr/X11R6/bin/xwd
 usr/X11R6/bin/xwininfo
 usr/X11R6/bin/xwud
-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
 usr/X11R6/include/GL/GLwDrawA.h
 usr/X11R6/include/GL/GLwDrawAP.h
 usr/X11R6/include/GL/GLwMDrawA.h
@@ -639,35 +586,50 @@
 usr/X11R6/include/GL/glxproto.h
 usr/X11R6/include/GL/glxtokens.h
 usr/X11R6/include/GL/osmesa.h
+usr/X11R6/include/X11/CallbackI.h
 usr/X11R6/include/X11/Composite.h
 usr/X11R6/include/X11/CompositeP.h
 usr/X11R6/include/X11/ConstrainP.h
 usr/X11R6/include/X11/Constraint.h
+usr/X11R6/include/X11/ConvertI.h
 usr/X11R6/include/X11/Core.h
 usr/X11R6/include/X11/CoreP.h
+usr/X11R6/include/X11/CreateI.h
 usr/X11R6/include/X11/DECkeysym.h
+usr/X11R6/include/X11/EventI.h
 usr/X11R6/include/X11/HPkeysym.h
+usr/X11R6/include/X11/HookObjI.h
 usr/X11R6/include/X11/ICE/ICE.h
 usr/X11R6/include/X11/ICE/ICEconn.h
 usr/X11R6/include/X11/ICE/ICElib.h
 usr/X11R6/include/X11/ICE/ICEmsg.h
 usr/X11R6/include/X11/ICE/ICEproto.h
 usr/X11R6/include/X11/ICE/ICEutil.h
+usr/X11R6/include/X11/ImUtil.h
+usr/X11R6/include/X11/InitialI.h
 usr/X11R6/include/X11/Intrinsic.h
+usr/X11R6/include/X11/IntrinsicI.h
 usr/X11R6/include/X11/IntrinsicP.h
 usr/X11R6/include/X11/Object.h
 usr/X11R6/include/X11/ObjectP.h
 usr/X11R6/include/X11/PM/PM.h
 usr/X11R6/include/X11/PM/PMproto.h
+usr/X11R6/include/X11/PassivGraI.h
 usr/X11R6/include/X11/RectObj.h
 usr/X11R6/include/X11/RectObjP.h
+usr/X11R6/include/X11/ResourceI.h
 usr/X11R6/include/X11/SM/SM.h
 usr/X11R6/include/X11/SM/SMlib.h
 usr/X11R6/include/X11/SM/SMproto.h
+usr/X11R6/include/X11/SelectionI.h
 usr/X11R6/include/X11/Shell.h
+usr/X11R6/include/X11/ShellI.h
 usr/X11R6/include/X11/ShellP.h
 usr/X11R6/include/X11/StringDefs.h
 usr/X11R6/include/X11/Sunkeysym.h
+usr/X11R6/include/X11/ThreadsI.h
+usr/X11R6/include/X11/TranslateI.h
+usr/X11R6/include/X11/VarargsI.h
 usr/X11R6/include/X11/Vendor.h
 usr/X11R6/include/X11/VendorP.h
 usr/X11R6/include/X11/X.h
@@ -758,6 +720,7 @@
 usr/X11R6/include/X11/Xfuncproto.h
 usr/X11R6/include/X11/Xfuncs.h
 usr/X11R6/include/X11/Xlib.h
+usr/X11R6/include/X11/XlibConf.h
 usr/X11R6/include/X11/Xlibint.h
 usr/X11R6/include/X11/Xlocale.h
 usr/X11R6/include/X11/Xmd.h
@@ -791,6 +754,7 @@
 usr/X11R6/include/X11/XprintUtil/xprintutil.h
 usr/X11R6/include/X11/Xproto.h
 usr/X11R6/include/X11/Xprotostr.h
+usr/X11R6/include/X11/Xregion.h
 usr/X11R6/include/X11/Xresource.h
 usr/X11R6/include/X11/Xthreads.h
 usr/X11R6/include/X11/Xutil.h
@@ -977,6 +941,7 @@
 usr/X11R6/include/X11/extensions/shmstr.h
 usr/X11R6/include/X11/extensions/sync.h
 usr/X11R6/include/X11/extensions/syncstr.h
+usr/X11R6/include/X11/extensions/vldXvMC.h
 usr/X11R6/include/X11/extensions/xcmiscstr.h
 usr/X11R6/include/X11/extensions/xevieplaceholder.h
 usr/X11R6/include/X11/extensions/xf86bigfont.h
@@ -1005,10 +970,27 @@
 usr/X11R6/include/X11/fonts/FS.h
 usr/X11R6/include/X11/fonts/FSlib.h
 usr/X11R6/include/X11/fonts/FSproto.h
+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
 usr/X11R6/include/X11/fonts/fontenc.h
+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
 usr/X11R6/include/X11/fonts/fsmasks.h
+usr/X11R6/include/X11/fonts/pcf.h
 usr/X11R6/include/X11/keysym.h
 usr/X11R6/include/X11/keysymdef.h
+usr/X11R6/include/X11/misc.h
+usr/X11R6/include/X11/os.h
 usr/X11R6/include/X11/pixmaps/card.xpm
 usr/X11R6/include/X11/pixmaps/computer.xpm
 usr/X11R6/include/X11/pixmaps/keyboard.xpm
@@ -1024,6 +1006,7 @@
 usr/X11R6/lib/X11/Xcms.txt
 usr/X11R6/lib/X11/config/Amoeba.cf
 usr/X11R6/lib/X11/config/DGUX.cf
+usr/X11R6/lib/X11/config/DragonFly.cf
 usr/X11R6/lib/X11/config/FreeBSD.cf
 usr/X11R6/lib/X11/config/Imake.cf
 usr/X11R6/lib/X11/config/Imake.rules
@@ -1083,6 +1066,9 @@
 usr/X11R6/lib/X11/config/lynx.cf
 usr/X11R6/lib/X11/config/macII.cf
 usr/X11R6/lib/X11/config/mach.cf
+usr/X11R6/lib/X11/config/mingw.cf
+usr/X11R6/lib/X11/config/mingw.rules
+usr/X11R6/lib/X11/config/mingw.tmpl
 usr/X11R6/lib/X11/config/minix.cf
 usr/X11R6/lib/X11/config/moto.cf
 usr/X11R6/lib/X11/config/ncr.cf
@@ -1170,8 +1156,6 @@
 usr/X11R6/lib/X11/etc/sun.termcap
 usr/X11R6/lib/X11/etc/sun.terminfo
 usr/X11R6/lib/X11/etc/xmodmap.std
-usr/X11R6/lib/X11/etc/xterm.termcap
-usr/X11R6/lib/X11/etc/xterm.terminfo
 usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
 usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
 usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
@@ -1445,13 +1429,21 @@
 usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
 usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
 usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+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
 usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
 usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
 usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
 usr/X11R6/lib/X11/locale/zh_CN/Compose
 usr/X11R6/lib/X11/locale/zh_CN/XI18N_OBJS
 usr/X11R6/lib/X11/locale/zh_CN/XLC_LOCALE
+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
 usr/X11R6/lib/X11/locale/zh_HK.big5/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_HK.big5hkscs/Compose
 usr/X11R6/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
 usr/X11R6/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
 usr/X11R6/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
@@ -1483,6 +1475,7 @@
 usr/X11R6/lib/X11/xedit/lisp/syntax.lsp
 usr/X11R6/lib/X11/xedit/lisp/xedit.lsp
 usr/X11R6/lib/X11/xman.help
+usr/X11R6/lib/X11/xorg.conf.eg
 usr/X11R6/lib/libFS.a
 usr/X11R6/lib/libFS.so.6.0
 usr/X11R6/lib/libGL.a
@@ -1492,7 +1485,7 @@
 usr/X11R6/lib/libGLw.a
 usr/X11R6/lib/libGLw_pic.a
 usr/X11R6/lib/libICE.a
-usr/X11R6/lib/libICE.so.6.3
+usr/X11R6/lib/libICE.so.6.4
 usr/X11R6/lib/libOSMesa.a
 usr/X11R6/lib/libOSMesa.so.4.0
 usr/X11R6/lib/libSM.a
@@ -1562,117 +1555,118 @@
 usr/X11R6/lib/libXxf86vm.so.1.0
 usr/X11R6/lib/libdmx.a
 usr/X11R6/lib/libdmx.so.1.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
 usr/X11R6/lib/libfntstubs.a
 usr/X11R6/lib/libfontenc.a
 usr/X11R6/lib/libfontenc_pic.a
-usr/X11R6/lib/libpsres.a
-usr/X11R6/lib/libpsres.so.1.0
 usr/X11R6/lib/libxf86config.a
 usr/X11R6/lib/libxf86config_pic.a
 usr/X11R6/lib/libxkbfile.a
 usr/X11R6/lib/libxkbfile.so.1.0
 usr/X11R6/lib/libxkbui.a
 usr/X11R6/lib/libxkbui.so.1.0
-usr/X11R6/lib/modules/drivers/apm_drv.o
-usr/X11R6/lib/modules/drivers/ark_drv.o
-usr/X11R6/lib/modules/drivers/ati_drv.o
-usr/X11R6/lib/modules/drivers/atimisc_drv.o
-usr/X11R6/lib/modules/drivers/chips_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/cyrix_drv.o
-usr/X11R6/lib/modules/drivers/dummy_drv.o
-usr/X11R6/lib/modules/drivers/glint_drv.o
-usr/X11R6/lib/modules/drivers/i128_drv.o
-usr/X11R6/lib/modules/drivers/i740_drv.o
-usr/X11R6/lib/modules/drivers/i810_drv.o
-usr/X11R6/lib/modules/drivers/imstt_drv.o
-usr/X11R6/lib/modules/drivers/mga_drv.o
-usr/X11R6/lib/modules/drivers/neomagic_drv.o
-usr/X11R6/lib/modules/drivers/newport_drv.o
-usr/X11R6/lib/modules/drivers/nsc_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/sis_drv.o
-usr/X11R6/lib/modules/drivers/tdfx_drv.o
-usr/X11R6/lib/modules/drivers/tga_drv.o
-usr/X11R6/lib/modules/drivers/trident_drv.o
-usr/X11R6/lib/modules/drivers/tseng_drv.o
-usr/X11R6/lib/modules/drivers/vesa_drv.o
-usr/X11R6/lib/modules/drivers/vga_drv.o
-usr/X11R6/lib/modules/drivers/via_drv.o
-usr/X11R6/lib/modules/drivers/vmware_drv.o
-usr/X11R6/lib/modules/extensions/libGLcore.a
-usr/X11R6/lib/modules/extensions/libdbe.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/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/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/libafb.a
-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/drivers/apm_drv.so
+usr/X11R6/lib/modules/drivers/ark_drv.so
+usr/X11R6/lib/modules/drivers/ati_drv.so
+usr/X11R6/lib/modules/drivers/atimisc_drv.so
+usr/X11R6/lib/modules/drivers/chips_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/cyrix_drv.so
+usr/X11R6/lib/modules/drivers/dummy_drv.so
+usr/X11R6/lib/modules/drivers/glint_drv.so
+usr/X11R6/lib/modules/drivers/i128_drv.so
+usr/X11R6/lib/modules/drivers/i740_drv.so
+usr/X11R6/lib/modules/drivers/i810_drv.so
+usr/X11R6/lib/modules/drivers/imstt_drv.so
+usr/X11R6/lib/modules/drivers/mga_drv.so
+usr/X11R6/lib/modules/drivers/neomagic_drv.so
+usr/X11R6/lib/modules/drivers/newport_drv.so
+usr/X11R6/lib/modules/drivers/nsc_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/sis_drv.so
+usr/X11R6/lib/modules/drivers/tdfx_drv.so
+usr/X11R6/lib/modules/drivers/tga_drv.so
+usr/X11R6/lib/modules/drivers/trident_drv.so
+usr/X11R6/lib/modules/drivers/tseng_drv.so
+usr/X11R6/lib/modules/drivers/vesa_drv.so
+usr/X11R6/lib/modules/drivers/vga_drv.so
+usr/X11R6/lib/modules/drivers/via_drv.so
+usr/X11R6/lib/modules/drivers/vmware_drv.so
+usr/X11R6/lib/modules/extensions/libGLcore.so
+usr/X11R6/lib/modules/extensions/libdbe.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/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/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/void_drv.so
+usr/X11R6/lib/modules/input/wacom_drv.so
+usr/X11R6/lib/modules/libafb.so
+usr/X11R6/lib/modules/libcfb.so
+usr/X11R6/lib/modules/libcfb16.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/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
 usr/X11R6/lib/pkgconfig/xcomposite.pc
 usr/X11R6/lib/pkgconfig/xdamage.pc
 usr/X11R6/lib/pkgconfig/xevie.pc
@@ -1696,8 +1690,6 @@
 usr/X11R6/man/man1/cxpm.1x
 usr/X11R6/man/man1/dga.1x
 usr/X11R6/man/man1/dmxtodmx.1x
-usr/X11R6/man/man1/dpsexec.1x
-usr/X11R6/man/man1/dpsinfo.1x
 usr/X11R6/man/man1/dumpkeymap.1x
 usr/X11R6/man/man1/editres.1x
 usr/X11R6/man/man1/fslsfonts.1x
@@ -1710,15 +1702,12 @@
 usr/X11R6/man/man1/iceauth.1x
 usr/X11R6/man/man1/ico.1x
 usr/X11R6/man/man1/imake.1x
-usr/X11R6/man/man1/koi8rxterm.1x
 usr/X11R6/man/man1/lbxproxy.1x
 usr/X11R6/man/man1/listres.1x
 usr/X11R6/man/man1/lndir.1x
 usr/X11R6/man/man1/luit.1x
-usr/X11R6/man/man1/lxterm.1x
 usr/X11R6/man/man1/makedepend.1x
 usr/X11R6/man/man1/makeg.1x
-usr/X11R6/man/man1/makepsres.1x
 usr/X11R6/man/man1/makestrs.1x
 usr/X11R6/man/man1/mergelib.1x
 usr/X11R6/man/man1/mkcfm.1x
@@ -1729,8 +1718,6 @@
 usr/X11R6/man/man1/oclock.1x
 usr/X11R6/man/man1/pcitweak.1x
 usr/X11R6/man/man1/proxymngr.1x
-usr/X11R6/man/man1/pswrap.1x
-usr/X11R6/man/man1/resize.1x
 usr/X11R6/man/man1/revpath.1x
 usr/X11R6/man/man1/rstart.1x
 usr/X11R6/man/man1/rstartd.1x
@@ -1742,10 +1729,8 @@
 usr/X11R6/man/man1/smproxy.1x
 usr/X11R6/man/man1/startx.1x
 usr/X11R6/man/man1/sxpm.1x
-usr/X11R6/man/man1/texteroids.1x
 usr/X11R6/man/man1/twm.1x
 usr/X11R6/man/man1/ucs2any.1x
-usr/X11R6/man/man1/uxterm.1x
 usr/X11R6/man/man1/vdltodmx.1x
 usr/X11R6/man/man1/viewres.1x
 usr/X11R6/man/man1/x11perf.1x
@@ -1759,9 +1744,11 @@
 usr/X11R6/man/man1/xconsole.1x
 usr/X11R6/man/man1/xcursorgen.1x
 usr/X11R6/man/man1/xcutsel.1x
+usr/X11R6/man/man1/xdbedizzy.1x
 usr/X11R6/man/man1/xditview.1x
 usr/X11R6/man/man1/xdm.1x
 usr/X11R6/man/man1/xdmxconfig.1x
+usr/X11R6/man/man1/xdpr.1x
 usr/X11R6/man/man1/xdpyinfo.1x
 usr/X11R6/man/man1/xdriinfo.1x
 usr/X11R6/man/man1/xedit.1x
@@ -1797,6 +1784,7 @@
 usr/X11R6/man/man1/xorgconfig.1x
 usr/X11R6/man/man1/xphelloworld.1x
 usr/X11R6/man/man1/xplsprinters.1x
+usr/X11R6/man/man1/xpr.1x
 usr/X11R6/man/man1/xprehashprinterlist.1x
 usr/X11R6/man/man1/xprop.1x
 usr/X11R6/man/man1/xpsimplehelloworld.1x
@@ -1810,7 +1798,6 @@
 usr/X11R6/man/man1/xsetroot.1x
 usr/X11R6/man/man1/xsm.1x
 usr/X11R6/man/man1/xstdcmap.1x
-usr/X11R6/man/man1/xterm.1x
 usr/X11R6/man/man1/xtrap.1x
 usr/X11R6/man/man1/xtrapchar.1x
 usr/X11R6/man/man1/xtrapin.1x
@@ -1853,6 +1840,15 @@
 usr/X11R6/man/man3/DMXRemoveInput.3x
 usr/X11R6/man/man3/DMXRemoveScreen.3x
 usr/X11R6/man/man3/DMXSync.3x
+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
 usr/X11R6/man/man3/DefaultColormap.3x
 usr/X11R6/man/man3/DefaultColormapOfScreen.3x
 usr/X11R6/man/man3/DefaultDepth.3x
@@ -1893,7 +1889,7 @@
 usr/X11R6/man/man3/IsFunctionKey.3x
 usr/X11R6/man/man3/IsKeypadKey.3x
 usr/X11R6/man/man3/IsMiscFunctionKey.3x
-usr/X11R6/man/man3/IsModiferKey.3x
+usr/X11R6/man/man3/IsModifierKey.3x
 usr/X11R6/man/man3/IsPFKey.3x
 usr/X11R6/man/man3/IsPrivateKeypadKey.3x
 usr/X11R6/man/man3/LastKnownRequestProcessed.3x
@@ -2073,6 +2069,15 @@
 usr/X11R6/man/man3/XExtendedMaxRequestSize.3x
 usr/X11R6/man/man3/XExtentsOfFontSet.3x
 usr/X11R6/man/man3/XF86DGA.3x
+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
 usr/X11R6/man/man3/XF86VidMode.3x
 usr/X11R6/man/man3/XF86VidModeDeleteModeLine.3x
 usr/X11R6/man/man3/XF86VidModeGetAllModeLines.3x
@@ -2118,6 +2123,7 @@
 usr/X11R6/man/man3/XFreeColors.3x
 usr/X11R6/man/man3/XFreeCursor.3x
 usr/X11R6/man/man3/XFreeDeviceList.3x
+usr/X11R6/man/man3/XFreeExtensionList.3x
 usr/X11R6/man/man3/XFreeFont.3x
 usr/X11R6/man/man3/XFreeFontInfo.3x
 usr/X11R6/man/man3/XFreeFontNames.3x
@@ -2212,6 +2218,7 @@
 usr/X11R6/man/man3/XKeysymToString.3x
 usr/X11R6/man/man3/XKillClient.3x
 usr/X11R6/man/man3/XListDepths.3x
+usr/X11R6/man/man3/XListExtensions.3x
 usr/X11R6/man/man3/XListFonts.3x
 usr/X11R6/man/man3/XListFontsWithInfo.3x
 usr/X11R6/man/man3/XListHosts.3x
@@ -2273,12 +2280,29 @@
 usr/X11R6/man/man3/XQueryColor.3x
 usr/X11R6/man/man3/XQueryColors.3x
 usr/X11R6/man/man3/XQueryDeviceState.3x
+usr/X11R6/man/man3/XQueryExtension.3x
 usr/X11R6/man/man3/XQueryFont.3x
 usr/X11R6/man/man3/XQueryKeymap.3x
 usr/X11R6/man/man3/XQueryPointer.3x
 usr/X11R6/man/man3/XQueryTextExtents.3x
 usr/X11R6/man/man3/XQueryTextExtents16.3x
 usr/X11R6/man/man3/XQueryTree.3x
+usr/X11R6/man/man3/XRRConfig.3x
+usr/X11R6/man/man3/XRRConfigCurrentConfiguration.3x
+usr/X11R6/man/man3/XRRConfigCurrentRate.3x
+usr/X11R6/man/man3/XRRConfigRates.3x
+usr/X11R6/man/man3/XRRConfigRotations.3x
+usr/X11R6/man/man3/XRRConfigSizes.3x
+usr/X11R6/man/man3/XRRConfigTimes.3x
+usr/X11R6/man/man3/XRRFreeScreenConfigInfo.3x
+usr/X11R6/man/man3/XRRGetScreenInfo.3x
+usr/X11R6/man/man3/XRRQueryExtension.3x
+usr/X11R6/man/man3/XRRQueryVersion.3x
+usr/X11R6/man/man3/XRRRootToScreen.3x
+usr/X11R6/man/man3/XRRScreenConfig.3x
+usr/X11R6/man/man3/XRRSelectInput.3x
+usr/X11R6/man/man3/XRRSetScreenConfig.3x
+usr/X11R6/man/man3/XRRSetScreenConfigAndRate.3x
 usr/X11R6/man/man3/XRaiseWindow.3x
 usr/X11R6/man/man3/XReadBitmapFile.3x
 usr/X11R6/man/man3/XReadBitmapFileData.3x
@@ -2517,6 +2541,9 @@
 usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
 usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
 usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
+usr/X11R6/man/man3/XcupGetReservedColormapEntries.3x
+usr/X11R6/man/man3/XcupQueryVersion.3x
+usr/X11R6/man/man3/XcupStoreColors.3x
 usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
 usr/X11R6/man/man3/XdbeBeginIdiom.3x
 usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
@@ -2530,6 +2557,11 @@
 usr/X11R6/man/man3/XeviQueryExtension.3x
 usr/X11R6/man/man3/XeviQueryVersion.3x
 usr/X11R6/man/man3/Xevie.3x
+usr/X11R6/man/man3/XevieEnd.3x
+usr/X11R6/man/man3/XevieQueryVersion.3x
+usr/X11R6/man/man3/XevieSelectInput.3x
+usr/X11R6/man/man3/XevieSendEvent.3x
+usr/X11R6/man/man3/XevieStart.3x
 usr/X11R6/man/man3/Xfixes.3x
 usr/X11R6/man/man3/Xfontcache.3x
 usr/X11R6/man/man3/XmbDrawImageString.3x
@@ -2631,6 +2663,7 @@
 usr/X11R6/man/man3/XtAddRawEventHandler.3x
 usr/X11R6/man/man3/XtAddTimeOut.3x
 usr/X11R6/man/man3/XtAddTimeout.3x
+usr/X11R6/man/man3/XtAddWorkProc.3x
 usr/X11R6/man/man3/XtAllocateGC.3x
 usr/X11R6/man/man3/XtAppAddActionHook.3x
 usr/X11R6/man/man3/XtAppAddActions.3x

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-09 00:02:43 UTC (rev 1033)
+++ trunk/debian/changelog	2006-01-09 00:22:38 UTC (rev 1034)
@@ -20,8 +20,10 @@
   * Add general/018_mesa_debug_fglrx.diff. The default mesa build was
     generating symbols which were interfering with the use of the fglrx
     drivers for some people. (closes: #274862)
+  * HURD patch and MANIFEST updates. Thanks Samuel Thibault and Michael Banck.
+    (closes: #346500)
 
- -- David Nusinow <dnusinow@debian.org>  Sun,  8 Jan 2006 18:58:46 -0500
+ -- David Nusinow <dnusinow@debian.org>  Sun,  8 Jan 2006 19:17:56 -0500
 
 xorg-x11 (6.9.0.dfsg.1-2) unstable; urgency=low
 

Modified: trunk/debian/patches/hurd/800_gnu_config.diff
===================================================================
--- trunk/debian/patches/hurd/800_gnu_config.diff	2006-01-09 00:02:43 UTC (rev 1033)
+++ trunk/debian/patches/hurd/800_gnu_config.diff	2006-01-09 00:22:38 UTC (rev 1034)
@@ -7,7 +7,7 @@
  
  #ifndef OSName
  #define OSName			DefaultOSName
-@@ -17,57 +17,368 @@
+@@ -17,57 +17,371 @@
  #ifndef OSTeenyVersion
  #define OSTeenyVersion		DefaultOSTeenyVersion
  #endif
@@ -152,8 +152,7 @@
 +#  define BuildTrueTypeFonts		NO
 +#  define BuildBethMarduthoFonts	NO
 +
-+/* Some day, but not yet ... */
-+#  define MakeDllModules		NO
++#  define MakeDllModules		YES
 +
 +/* All the following are fulfilled by Build-Depends. */
 +#  define BuildRman			NO
@@ -350,6 +349,10 @@
 -# define HasShm			YES
 +#define HasShm			YES
  #endif
++
++#ifndef HasSecureRPC
++# define HasSecureRPC		YES
++#endif
 -
 -#define HasBSD44Sockets		YES
  #define HasSockets		YES
@@ -390,7 +393,7 @@
  #define AvoidNullMakeCommand	YES
  #ifndef DebuggableLibraries
  #define DebuggableLibraries	NO
-@@ -87,32 +398,64 @@
+@@ -87,32 +401,64 @@
  #define UseStaticTermcapLib	NO
  #endif
  
@@ -463,7 +466,7 @@
  #define YaccCmd			bison -y
  #define LexCmd			flex -l
  #define HasFlex			YES
-@@ -128,30 +471,68 @@
+@@ -128,30 +474,68 @@
  #define StandardCppDefines	StandardDefines
  
  #define HasVarRun		YES
@@ -538,7 +541,7 @@
  #define HasGnuMake	YES
  
  #define MakeNamedTargetSubdir(dir,flags,subname)\
-@@ -159,12 +540,16 @@
+@@ -159,12 +543,16 @@
  
  #define ArchitectureDefines	-DGNU_ARCHITECTURE
  

Added: trunk/debian/patches/hurd/809_keyboard.diff
===================================================================
--- trunk/debian/patches/hurd/809_keyboard.diff	2006-01-09 00:02:43 UTC (rev 1033)
+++ trunk/debian/patches/hurd/809_keyboard.diff	2006-01-09 00:22:38 UTC (rev 1034)
@@ -0,0 +1,214 @@
+Index: xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile.orig	2006-01-08 19:20:20.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile	2006-01-08 19:20:33.000000000 -0500
+@@ -7,12 +7,12 @@
+ MOUSESRC = hurd_mouse.c
+ MOUSEOBJ = hurd_mouse.o
+ 
+-SRCS = hurd_init.c hurd_video.c hurd_io.c libc_wrapper.c $(BIOS_MOD).c \
+-       VTsw_noop.c posix_tty.c $(MOUSESRC) \
++SRCS = hurd_init.c hurd_video.c hurd_io.c hurd_kbd.c libc_wrapper.c \
++       $(BIOS_MOD).c VTsw_noop.c posix_tty.c $(MOUSESRC) \
+        stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c agp_noop.c
+ 
+-OBJS = hurd_init.o hurd_video.o hurd_io.o libc_wrapper.o $(BIOS_MOD).o \
+-       VTsw_noop.o posix_tty.o $(MOUSEOBJ) \
++OBJS = hurd_init.o hurd_video.o hurd_io.o hurd_kbd.o libc_wrapper.o \
++       $(BIOS_MOD).o VTsw_noop.o posix_tty.o $(MOUSEOBJ) \
+        stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o agp_noop.o
+ 
+ INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
+Index: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c.orig	2006-01-08 19:20:20.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c	2006-01-08 19:20:33.000000000 -0500
+@@ -129,11 +129,3 @@
+     while( read(xf86Info.consoleFd, &ke, sizeof(ke)) == sizeof(ke) )
+ 	xf86PostKbdEvent(ke.value.sc);
+ }
+-
+-#include "xf86OSKbd.h"
+-
+-Bool
+-xf86OSKbdPreInit(InputInfoPtr pInfo)
+-{
+-    return FALSE;
+-}
+Index: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_kbd.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_kbd.c	2006-01-08 19:20:33.000000000 -0500
+@@ -0,0 +1,172 @@
++/*
++ * Copyright 1997,1998 by UCHIYAMA Yasushi
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of UCHIYAMA Yasushi not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  UCHIYAMA Yasushi makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c,v 1.8 2002/10/11 01:40:35 dawes Exp $ */
++
++#include "X.h"
++#include "input.h"
++
++#include "compiler.h"
++
++#include "xf86.h"
++#include "xf86Priv.h"
++#include "xf86_OSlib.h"
++
++#include "xf86Xinput.h"
++#include "xf86OSKbd.h"
++#include "atKeynames.h"
++#include "xf86Keymap.h"
++
++#include <stdio.h>
++#include <errno.h>
++#include <sys/time.h>
++#include <sys/file.h>
++#include <assert.h>
++#include <mach.h>
++#include <sys/ioctl.h>
++
++typedef unsigned short kev_type;		/* kd event type */
++typedef unsigned char Scancode;
++
++struct mouse_motion {		
++    short mm_deltaX;		/* units? */
++    short mm_deltaY;
++};
++
++typedef struct {
++    kev_type type;			/* see below */
++    struct timeval time;		/* timestamp */
++    union {				/* value associated with event */
++	boolean_t up;		/* MOUSE_LEFT .. MOUSE_RIGHT */
++	Scancode sc;		/* KEYBD_EVENT */
++	struct mouse_motion mmotion;	/* MOUSE_MOTION */
++    } value;
++} kd_event;
++
++/* 
++ * kd_event ID's.
++ */
++#define MOUSE_LEFT	1		/* mouse left button up/down */
++#define MOUSE_MIDDLE	2
++#define MOUSE_RIGHT	3
++#define MOUSE_MOTION	4		/* mouse motion */
++#define KEYBD_EVENT	5		/* key up/down */
++
++/***********************************************************************
++ * Keyboard
++ **********************************************************************/
++static void 
++SoundKbdBell(InputInfoPtr pInfo, int loudness,int pitch,int duration)
++{
++    return;
++}
++
++static void 
++SetKbdLeds(InputInfoPtr pInfo, int leds)
++{
++    return;
++}
++
++static int 
++GetKbdLeds(InputInfoPtr pInfo)
++{
++    return 0;
++}
++
++static void 
++SetKbdRepeat(InputInfoPtr pInfo, char rad)
++{
++    return;
++}
++
++static void
++KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
++{
++    pKeySyms->map        = map;
++    pKeySyms->mapWidth   = GLYPHS_PER_KEY;
++    pKeySyms->minKeyCode = MIN_KEYCODE;
++    pKeySyms->maxKeyCode = MAX_KEYCODE;
++    return;
++}
++
++static int
++KbdOn(InputInfoPtr pInfo, int what)
++{
++    int data = 1;
++    if( ioctl( pInfo->fd, _IOW('k', 1, int),&data) < 0)
++	FatalError("Cannot set event mode on keyboard (%s)\n",strerror(errno));
++    return Success;
++}
++static int
++KbdOff(InputInfoPtr pInfo, int what)
++{
++    int data = 2;
++    if( ioctl( pInfo->fd, _IOW('k', 1, int),&data) < 0)
++	FatalError("can't reset keyboard mode (%s)\n",strerror(errno));
++    return Success;
++}
++
++static int
++KbdInit(InputInfoPtr pInfo, int what)
++{
++    return Success;
++}
++
++static void
++ReadInput(InputInfoPtr pInfo)
++{
++    KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
++    kd_event ke;
++    while( read(pInfo->fd, &ke, sizeof(ke)) == sizeof(ke) )
++	pKbd->PostEvent(pInfo, ke.value.sc & 0x7f, ke.value.sc & 0x80 ? FALSE : TRUE);
++}
++
++static Bool
++OpenKeyboard(InputInfoPtr pInfo)
++{
++    pInfo->fd = xf86Info.consoleFd;
++    return TRUE;
++}
++
++Bool
++xf86OSKbdPreInit(InputInfoPtr pInfo)
++{
++    KbdDevPtr pKbd = pInfo->private;
++
++    pKbd->KbdInit       = KbdInit;
++    pKbd->KbdOn         = KbdOn;
++    pKbd->KbdOff        = KbdOff;
++    pKbd->Bell          = SoundKbdBell;
++    pKbd->SetLeds       = SetKbdLeds;
++    pKbd->GetLeds       = GetKbdLeds;
++    pKbd->SetKbdRepeat  = SetKbdRepeat;
++    pKbd->KbdGetMapping = KbdGetMapping;
++    pKbd->SpecialKey    = NULL;
++    pKbd->RemapScanCode = NULL;
++    pKbd->GetSpecialKey = NULL;
++    pKbd->OpenKeyboard  = OpenKeyboard;
++    pKbd->vtSwitchSupported = FALSE;
++    pKbd->CustomKeycodes = FALSE;
++    pKbd->private       = NULL;
++    pInfo->read_input   = ReadInput;
++    return TRUE;
++}

Added: trunk/debian/patches/hurd/810_xdm_utsname.diff
===================================================================
--- trunk/debian/patches/hurd/810_xdm_utsname.diff	2006-01-09 00:02:43 UTC (rev 1033)
+++ trunk/debian/patches/hurd/810_xdm_utsname.diff	2006-01-09 00:22:38 UTC (rev 1034)
@@ -0,0 +1,12 @@
+--- xc/programs/xdm/auth.c.orig	2006-01-07 19:50:11.000000000 +0100
++++ xc/programs/xdm/auth.c	2006-01-07 19:50:13.000000000 +0100
+@@ -60,9 +60,7 @@
+ # include <netdnet/dnetdb.h>
+ #endif
+ 
+-#if defined(hpux)
+ #include <sys/utsname.h>
+-#endif
+ 
+ #if defined(SYSV) && defined(i386)
+ # include <sys/stream.h>

Added: trunk/debian/patches/hurd/811_ioperms.diff
===================================================================
--- trunk/debian/patches/hurd/811_ioperms.diff	2006-01-09 00:02:43 UTC (rev 1033)
+++ trunk/debian/patches/hurd/811_ioperms.diff	2006-01-09 00:22:38 UTC (rev 1034)
@@ -0,0 +1,55 @@
+--- xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_video.c	2005-12-29 03:34:59.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_video.c	2006-01-02 23:58:16.000000000 +0100
+@@ -115,16 +115,50 @@
+ /**************************************************************************
+  * I/O Permissions section                                                 
+  ***************************************************************************/
++mach_port_t io_port;
++
+ Bool
+ xf86EnableIO()
+ {
+-	return TRUE;
++    mach_port_t device;
++    kern_return_t err;
++
++    err = get_privileged_ports(NULL, &device);
++    if( err )
++    {
++	errno = err;
++	FatalError("xf86EnableIO() can't get_privileged_ports. (%s)\n",strerror(errno));
++    }
++    err = device_open(device,D_READ|D_WRITE,"io",&io_port);
++    mach_port_deallocate(mach_task_self(), device);
++    if( err )
++    {
++	errno = err;
++	FatalError("xf86EnableIO() can't device_open. (%s)\n",strerror(errno));
++    }
++
++    err = i386_io_port_add(mach_thread_self (), io_port);
++    if( err )
++    {
++	errno = err;
++	FatalError("xf86EnableIO() can't i386_io_port_add.(io_port) (%s)\n",strerror(errno));
++    }
++    return TRUE;
+ }
+ 	
+ void
+ xf86DisableIO()
+ {
+-	return;
++    kern_return_t err;
++
++    err = i386_io_port_remove(mach_thread_self (), io_port);
++    if( err )
++    {
++	errno = err;
++	FatalError("xf86DisableIO() can't i386_io_port_remove.(io_port) (%s)\n",strerror(errno));
++    }
++    mach_port_deallocate(mach_task_self(), io_port);
++    return;
+ }
+ 
+ void 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-01-09 00:02:43 UTC (rev 1033)
+++ trunk/debian/patches/series	2006-01-09 00:22:38 UTC (rev 1034)
@@ -92,6 +92,9 @@
 hurd/803_gnu_xterm_openpty.diff -p0
 hurd/804_maxhostnamelen.diff -p0
 hurd/806_gnuLib_update.diff -p0
+hurd/809_keyboard.diff -p0
+hurd/810_xdm_utsname.diff -p0
+hurd/811_ioperms.diff -p0
 netbsd/840_netbsd_bsdLib.rules_fix.diff -p0
 netbsd/841_netbsd_imake.c_fixes.diff -p0
 netbsd/842_netbsd_NetBSD.cf_fixes.diff -p0

Modified: trunk/debian/xserver-xorg.install.hurd-i386
===================================================================
--- trunk/debian/xserver-xorg.install.hurd-i386	2006-01-09 00:02:43 UTC (rev 1033)
+++ trunk/debian/xserver-xorg.install.hurd-i386	2006-01-09 00:22:38 UTC (rev 1034)
@@ -75,10 +75,7 @@
 usr/X11R6/lib/modules/libafb.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/libcw.so
-usr/X11R6/lib/modules/libdamage.so
 usr/X11R6/lib/modules/libddc.so
 usr/X11R6/lib/modules/libfb.so
 usr/X11R6/lib/modules/libi2c.so
@@ -95,7 +92,6 @@
 usr/X11R6/lib/modules/libvgahw.so
 usr/X11R6/lib/modules/libxaa.so
 usr/X11R6/lib/modules/libxf1bpp.so
-usr/X11R6/lib/modules/libxf24_32bpp.so
 usr/X11R6/lib/modules/libxf4bpp.so
 usr/X11R6/lib/modules/libxf8_16bpp.so
 usr/X11R6/lib/modules/libxf8_32bpp.so



Reply to: