Author: rmh
Date: 2003-10-22 12:53:46 -0500 (Wed, 22 Oct 2003)
New Revision: 696
Added:
branches/4.3.0/sid/debian/libxaw6-dbg.install.hurd-i386
branches/4.3.0/sid/debian/libxaw7-dbg.install.hurd-i386
branches/4.3.0/sid/debian/patches/001a_move-gnu-common.diff
branches/4.3.0/sid/debian/patches/001b_gnu_common_split.diff
branches/4.3.0/sid/debian/patches/001c_move-gnu-lib.diff
branches/4.3.0/sid/debian/patches/001d_gnu-lib_split.diff
branches/4.3.0/sid/debian/patches/800a_gnu_more_fixes.diff
branches/4.3.0/sid/debian/patches/803_gnu_xdm_chooser.diff
branches/4.3.0/sid/debian/xbase-clients.install.hurd-i386
branches/4.3.0/sid/debian/xfree86-common.docs.hurd-i386
branches/4.3.0/sid/debian/xlibmesa-gl-dbg.install.hurd-i386
branches/4.3.0/sid/debian/xlibmesa-glu-dbg.install.hurd-i386
branches/4.3.0/sid/debian/xlibosmesa4-dbg.install.hurd-i386
branches/4.3.0/sid/debian/xlibs-data.install.hurd-i386
branches/4.3.0/sid/debian/xlibs-dbg.install.hurd-i386
branches/4.3.0/sid/debian/xterm.docs.hurd-i386
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff
branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
branches/4.3.0/sid/debian/patches/800_gnu_config.diff
Log:
* Split gnu.cf into gnu-common.cf (for common GNU/* stuff) and gnu.cf (for
GNU/Hurd stuff). It will be included by non-Linux only for now since
linux.cf has many kernel-specific kludges. [Robert Millan]
- debian/patches/001a_move-gnu-common.diff: Move gnu.cf to gnu-common.cf.
- debian/patches/001c_move-gnu-lib.diff: Ditto for gnuLib.*.
- debian/patches/001b_gnu_common_split.diff: Create a new gnu.cf that
includes gnu-common.cf and move Hurd-specific stuff into it.
- debian/patches/001d_gnu-lib_split.diff: Ditto for gnuLib.*.
- debian/patches/002_xdm_fixes.diff: Re-diff for new gnu.cf.
- debian/patches/003a_damn_cpp_3.3_to_hell.diff: s/gnu.cf/gnu-common.cf/g
- debian/patches/004_imake_manpage_handling_overhaul.diff: Likewise.
- debian/patches/800_gnu_config.diff: Likewise.
* More GNU/Hurd build fixes. [Robert Millan]
- debian/patches/800a_gnu_more_fixes.diff: Add new macros to gnu-common.cf
as pointed out by ISHIKAWA Mutsumi some time ago.
- debian/patches/803_gnu_xdm_chooser.diff: New. GNU/Hurd build fixes.
- debian/*.hurd-i386: Update to sync with MANIFEST.hurd-i386 (the MANIFEST
itself is unchanged).
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-22 05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/changelog 2003-10-22 17:53:46 UTC (rev 696)
@@ -138,6 +138,26 @@
- debian/patches/056_i810_make_i830_usable.diff: only access pI830 when
XF86DRI is defined.
+ * Split gnu.cf into gnu-common.cf (for common GNU/* stuff) and gnu.cf (for
+ GNU/Hurd stuff). It will be included by non-Linux only for now since
+ linux.cf has many kernel-specific kludges. [Robert Millan]
+ - debian/patches/001a_move-gnu-common.diff: Move gnu.cf to gnu-common.cf.
+ - debian/patches/001c_move-gnu-lib.diff: Ditto for gnuLib.*.
+ - debian/patches/001b_gnu_common_split.diff: Create a new gnu.cf that
+ includes gnu-common.cf and move Hurd-specific stuff into it.
+ - debian/patches/001d_gnu-lib_split.diff: Ditto for gnuLib.*.
+ - debian/patches/002_xdm_fixes.diff: Re-diff for new gnu.cf.
+ - debian/patches/003a_damn_cpp_3.3_to_hell.diff: s/gnu.cf/gnu-common.cf/g
+ - debian/patches/004_imake_manpage_handling_overhaul.diff: Likewise.
+ - debian/patches/800_gnu_config.diff: Likewise.
+
+ * More GNU/Hurd build fixes. [Robert Millan]
+ - debian/patches/800a_gnu_more_fixes.diff: Add new macros to gnu-common.cf
+ as pointed out by ISHIKAWA Mutsumi some time ago.
+ - debian/patches/803_gnu_xdm_chooser.diff: New. GNU/Hurd build fixes.
+ - debian/*.hurd-i386: Update to sync with MANIFEST.hurd-i386 (the MANIFEST
+ itself is unchanged).
+
-- Branden Robinson <[EMAIL PROTECTED]> Wed, 22 Oct 2003 00:13:12 -0500
xfree86 (4.3.0-0pre1v3) experimental; urgency=high
Added: branches/4.3.0/sid/debian/libxaw6-dbg.install.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/libxaw6-dbg.install.hurd-i386 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/libxaw6-dbg.install.hurd-i386 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1 @@
+usr/X11R6/lib/libXaw.so.6.1
Added: branches/4.3.0/sid/debian/libxaw7-dbg.install.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/libxaw7-dbg.install.hurd-i386 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/libxaw7-dbg.install.hurd-i386 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1 @@
+usr/X11R6/lib/libXaw.so.7.0
Added: branches/4.3.0/sid/debian/patches/001a_move-gnu-common.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/001a_move-gnu-common.diff 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/001a_move-gnu-common.diff 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,381 @@
+
+ Simply moves gnu.cf to gnu-common.cf, and nothing else.
+
+diff -Nur xc/config/cf.old/gnu-common.cf xc/config/cf/gnu-common.cf
+--- xc/config/cf.old/gnu-common.cf 1970-01-01 01:00:00.000000000 +0100
++++ xc/config/cf/gnu-common.cf 2001-02-28 19:58:49.000000000 +0100
+@@ -0,0 +1,185 @@
++XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49
dawes Exp $
++
++#ifndef OSName
++#define OSName DefaultOSName
++#endif
++
++#ifndef OSVendor
++#define OSVendor /**/
++#endif
++#ifndef OSMajorVersion
++#define OSMajorVersion DefaultOSMajorVersion
++#endif
++#ifndef OSMinorVersion
++#define OSMinorVersion DefaultOSMinorVersion
++#endif
++#ifndef OSTeenyVersion
++#define OSTeenyVersion DefaultOSTeenyVersion
++#endif
++XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
++
++#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
++ -D_POSIX_SOURCE -D_XOPEN_SOURCE \
++ -D_BSD_SOURCE -D_SVID_SOURCE
++
++XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
++
++#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
++
++XCOMM Enable this when we have pthreads.
++XCOMM #define HasPosixThreads YES
++XCOMM #define ThreadedX YES
++XCOMM #define HasThreadSafeAPI YES
++XCOMM #define ThreadsLibraries -lpthread
++XCOMM #define SystemMTDefines -D_REENTRANT
++
++#ifndef HasLibCrypt
++#define HasLibCrypt YES
++#endif
++
++#ifndef BuildXF86RushExt
++# define BuildXF86RushExt YES
++#endif
++
++#define BuildLibPathVar LD_LIBRARY_PATH
++#define GccUsesGas YES
++#define UseGas YES
++#define GnuCpp YES
++#define HasDlopen YES
++#ifndef HasShadowPasswd
++# define HasShadowPasswd YES
++#endif
++#define HasPutenv YES
++
++XCOMM Not implemented and will always fail.
++#define HasShm YES
++
++#define HasBSD44Sockets YES
++#define HasSockets YES
++#define HasSnprintf YES
++#define HasMkstemp YES
++#define HasUsableFileMmap YES
++#ifndef HasNCurses
++#define HasNCurses YES
++#endif
++
++#define AvoidNullMakeCommand YES
++#ifndef DebuggableLibraries
++#define DebuggableLibraries NO
++#endif
++#define CompressAllFonts YES
++#define Malloc0ReturnsNull YES
++#define NeedConstPrototypes YES
++#define NeedFunctionPrototypes YES
++#define NeedNestedPrototypes YES
++#define NeedVarargsPrototypes YES
++#ifndef NeedWidePrototypes
++#define NeedWidePrototypes NO
++#endif
++#define SetTtyGroup YES
++
++#ifndef UseStaticTermcapLib
++#define UseStaticTermcapLib NO
++#endif
++
++#define MkdirHierCmd mkdir -p
++#ifndef CcCmd
++#define CcCmd gcc
++#endif
++#ifndef AsCmd
++#define AsCmd as
++#endif
++#ifndef LdCmd
++#define LdCmd ld
++#endif
++
++#define AsmDefines -D__ELF__
++#define CplusplusCmd c++
++#ifndef TermcapLibrary
++#if UseStaticTermcapLib
++#define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
++#else
++#define TermcapLibrary -lncurses
++#endif
++#endif
++#ifndef DoLoadableServer
++#define DoLoadableServer YES
++#endif
++#ifndef
++#define CppCmd /lib/cpp
++#endif
++#define YaccCmd bison -y
++#define LexCmd flex -l
++#define HasFlex YES
++#define LexLib -lfl
++#define PreProcessCmd CcCmd -E
++#define PostIncDir DefaultGccIncludeDir
++#define LdCombineFlags -r
++#ifndef LdPostLib
++#define LdPostLib /* Never needed */
++#endif
++#define HasWChar32 YES
++#define StandardCppOptions -traditional
++#define StandardCppDefines StandardDefines
++
++#define HasVarRun YES
++#define VarDbDirectory $(VARDIR)/lib
++
++XCOMM i386Architecture
++#define OptimizedCDebugFlags DefaultGcc2i386Opt
++#define GNUMachineDefines -D__i386__
++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-DPART_NET
++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
++#define HasPlugin YES
++#define VendorHasX11R6_3libXext YES
++
++#ifndef StandardDefines
++#define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
++#endif
++
++#define DlLibrary -rdynamic -ldl
++
++#define ServerExtraSysLibs /**/
++
++#define ConnectionFlags -DUNIXCONN -DTCPCONN
++
++/* Some of these man page defaults are overriden in the above OS sections */
++#ifndef ManSuffix
++# define ManSuffix 1x
++#endif
++#ifndef ManDir
++# define ManDir $(MANSOURCEPATH)1
++#endif
++#ifndef LibManSuffix
++# define LibManSuffix 3x
++#endif
++#ifndef LibmanDir
++# define LibmanDir $(MANSOURCEPATH)3
++#endif
++#ifndef FileManSuffix
++# define FileManSuffix 5x
++#endif
++#ifndef FileManDir
++# define FileManDir $(MANSOURCEPATH)5
++#endif
++
++#ifndef StaticLibrary
++#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
++#endif
++
++#define HasGnuMake YES
++
++#define MakeNamedTargetSubdir(dir,flags,subname)\
++ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
++
++#define ArchitectureDefines -DGNU_ARCHITECTURE
++
++#define XserverNeedsSetUID YES
++
++#include <gnuLib.rules>
++
++XCOMM XXX Might need this if they are not careful with slashes.
++XCOMM #define DirFailPrefix -
++
++#include <xfree86.cf>
++
+diff -Nur xc/config/cf.old/gnu.cf xc/config/cf/gnu.cf
+--- xc/config/cf.old/gnu.cf 2001-02-28 19:58:49.000000000 +0100
++++ xc/config/cf/gnu.cf 1970-01-01 01:00:00.000000000 +0100
+@@ -1,185 +0,0 @@
+-XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49
dawes Exp $
+-
+-#ifndef OSName
+-#define OSName DefaultOSName
+-#endif
+-
+-#ifndef OSVendor
+-#define OSVendor /**/
+-#endif
+-#ifndef OSMajorVersion
+-#define OSMajorVersion DefaultOSMajorVersion
+-#endif
+-#ifndef OSMinorVersion
+-#define OSMinorVersion DefaultOSMinorVersion
+-#endif
+-#ifndef OSTeenyVersion
+-#define OSTeenyVersion DefaultOSTeenyVersion
+-#endif
+-XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+-
+-#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
+- -D_POSIX_SOURCE -D_XOPEN_SOURCE \
+- -D_BSD_SOURCE -D_SVID_SOURCE
+-
+-XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
+-
+-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+-
+-XCOMM Enable this when we have pthreads.
+-XCOMM #define HasPosixThreads YES
+-XCOMM #define ThreadedX YES
+-XCOMM #define HasThreadSafeAPI YES
+-XCOMM #define ThreadsLibraries -lpthread
+-XCOMM #define SystemMTDefines -D_REENTRANT
+-
+-#ifndef HasLibCrypt
+-#define HasLibCrypt YES
+-#endif
+-
+-#ifndef BuildXF86RushExt
+-# define BuildXF86RushExt YES
+-#endif
+-
+-#define BuildLibPathVar LD_LIBRARY_PATH
+-#define GccUsesGas YES
+-#define UseGas YES
+-#define GnuCpp YES
+-#define HasDlopen YES
+-#ifndef HasShadowPasswd
+-# define HasShadowPasswd YES
+-#endif
+-#define HasPutenv YES
+-
+-XCOMM Not implemented and will always fail.
+-#define HasShm YES
+-
+-#define HasBSD44Sockets YES
+-#define HasSockets YES
+-#define HasSnprintf YES
+-#define HasMkstemp YES
+-#define HasUsableFileMmap YES
+-#ifndef HasNCurses
+-#define HasNCurses YES
+-#endif
+-
+-#define AvoidNullMakeCommand YES
+-#ifndef DebuggableLibraries
+-#define DebuggableLibraries NO
+-#endif
+-#define CompressAllFonts YES
+-#define Malloc0ReturnsNull YES
+-#define NeedConstPrototypes YES
+-#define NeedFunctionPrototypes YES
+-#define NeedNestedPrototypes YES
+-#define NeedVarargsPrototypes YES
+-#ifndef NeedWidePrototypes
+-#define NeedWidePrototypes NO
+-#endif
+-#define SetTtyGroup YES
+-
+-#ifndef UseStaticTermcapLib
+-#define UseStaticTermcapLib NO
+-#endif
+-
+-#define MkdirHierCmd mkdir -p
+-#ifndef CcCmd
+-#define CcCmd gcc
+-#endif
+-#ifndef AsCmd
+-#define AsCmd as
+-#endif
+-#ifndef LdCmd
+-#define LdCmd ld
+-#endif
+-
+-#define AsmDefines -D__ELF__
+-#define CplusplusCmd c++
+-#ifndef TermcapLibrary
+-#if UseStaticTermcapLib
+-#define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
+-#else
+-#define TermcapLibrary -lncurses
+-#endif
+-#endif
+-#ifndef DoLoadableServer
+-#define DoLoadableServer YES
+-#endif
+-#ifndef
+-#define CppCmd /lib/cpp
+-#endif
+-#define YaccCmd bison -y
+-#define LexCmd flex -l
+-#define HasFlex YES
+-#define LexLib -lfl
+-#define PreProcessCmd CcCmd -E
+-#define PostIncDir DefaultGccIncludeDir
+-#define LdCombineFlags -r
+-#ifndef LdPostLib
+-#define LdPostLib /* Never needed */
+-#endif
+-#define HasWChar32 YES
+-#define StandardCppOptions -traditional
+-#define StandardCppDefines StandardDefines
+-
+-#define HasVarRun YES
+-#define VarDbDirectory $(VARDIR)/lib
+-
+-XCOMM i386Architecture
+-#define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#define GNUMachineDefines -D__i386__
+-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-DPART_NET
+-#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+-#define HasPlugin YES
+-#define VendorHasX11R6_3libXext YES
+-
+-#ifndef StandardDefines
+-#define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
+-#endif
+-
+-#define DlLibrary -rdynamic -ldl
+-
+-#define ServerExtraSysLibs /**/
+-
+-#define ConnectionFlags -DUNIXCONN -DTCPCONN
+-
+-/* Some of these man page defaults are overriden in the above OS sections */
+-#ifndef ManSuffix
+-# define ManSuffix 1x
+-#endif
+-#ifndef ManDir
+-# define ManDir $(MANSOURCEPATH)1
+-#endif
+-#ifndef LibManSuffix
+-# define LibManSuffix 3x
+-#endif
+-#ifndef LibmanDir
+-# define LibmanDir $(MANSOURCEPATH)3
+-#endif
+-#ifndef FileManSuffix
+-# define FileManSuffix 5x
+-#endif
+-#ifndef FileManDir
+-# define FileManDir $(MANSOURCEPATH)5
+-#endif
+-
+-#ifndef StaticLibrary
+-#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
+-#endif
+-
+-#define HasGnuMake YES
+-
+-#define MakeNamedTargetSubdir(dir,flags,subname)\
+- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
+-
+-#define ArchitectureDefines -DGNU_ARCHITECTURE
+-
+-#define XserverNeedsSetUID YES
+-
+-#include <gnuLib.rules>
+-
+-XCOMM XXX Might need this if they are not careful with slashes.
+-XCOMM #define DirFailPrefix -
+-
+-#include <xfree86.cf>
+-
Added: branches/4.3.0/sid/debian/patches/001b_gnu_common_split.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/001b_gnu_common_split.diff
2003-10-22 05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/001b_gnu_common_split.diff
2003-10-22 17:53:46 UTC (rev 696)
@@ -0,0 +1,68 @@
+
+ - Fixes gnu-common.cf to provide only the rules common to all GNU variants
+ (I.e, GNU userland and Glibc on non-gnu kernel)
+ - Adds gnu.cf which includes gnu-common.cf and adds rules specific to the
+ GNU system (I.e: GNU userland, Glibc and the Hurd).
+
+ -- Robert Millan <[EMAIL PROTECTED]>
+
+diff -Nur xc/config/cf.old/gnu-common.cf xc/config/cf/gnu-common.cf
+--- xc/config/cf.old/gnu-common.cf 2003-10-15 01:47:38.000000000 +0200
++++ xc/config/cf/gnu-common.cf 2003-10-15 01:57:49.000000000 +0200
+@@ -26,13 +26,6 @@
+
+ #define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+
+-XCOMM Enable this when we have pthreads.
+-XCOMM #define HasPosixThreads YES
+-XCOMM #define ThreadedX YES
+-XCOMM #define HasThreadSafeAPI YES
+-XCOMM #define ThreadsLibraries -lpthread
+-XCOMM #define SystemMTDefines -D_REENTRANT
+-
+ #ifndef HasLibCrypt
+ #define HasLibCrypt YES
+ #endif
+@@ -54,7 +47,7 @@
+ XCOMM Not implemented and will always fail.
+ #define HasShm YES
+
+-#define HasBSD44Sockets YES
++XCOMM #define HasBSD44Sockets YES
+ #define HasSockets YES
+ #define HasSnprintf YES
+ #define HasMkstemp YES
+@@ -133,8 +126,9 @@
+ #define HasPlugin YES
+ #define VendorHasX11R6_3libXext YES
+
++XCOMM see gnu.cf for the missing -D__GNU__
+ #ifndef StandardDefines
+-#define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
++#define StandardDefines GNUMachineDefines GNUSourceDefines
+ #endif
+
+ #define DlLibrary -rdynamic -ldl
+diff -Nur xc/config/cf.old/gnu.cf xc/config/cf/gnu.cf
+--- xc/config/cf.old/gnu.cf 1970-01-01 01:00:00.000000000 +0100
++++ xc/config/cf/gnu.cf 2003-10-15 01:55:59.000000000 +0200
+@@ -0,0 +1,19 @@
++
++XCOMM Include rules common to all GNU variants
++#include <gnu-common.cf>
++
++XCOMM Below, rules specific to the GNU system (with the Hurd)
++
++XCOMM Enable this when we have pthreads.
++XCOMM #define HasPosixThreads YES
++XCOMM #define ThreadedX YES
++XCOMM #define HasThreadSafeAPI YES
++XCOMM #define ThreadsLibraries -lpthread
++XCOMM #define SystemMTDefines -D_REENTRANT
++
++#define HasBSD44Sockets YES
++
++XCOMM we don't need -D__GNU__, so this define stays in gnu-common.cf
++XCOMM #ifndef StandardDefines
++XCOMM #define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
++XCOMM #endif
Added: branches/4.3.0/sid/debian/patches/001c_move-gnu-lib.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/001c_move-gnu-lib.diff 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/001c_move-gnu-lib.diff 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,441 @@
+
+ Simply moves gnuLib.* to gnu-commonLib.*, and nothing else.
+
+diff -Nur xc/config/cf.old/gnu-commonLib.rules xc/config/cf/gnu-commonLib.rules
+--- xc/config/cf.old/gnu-commonLib.rules 1970-01-01 01:00:00.000000000
+0100
++++ xc/config/cf/gnu-commonLib.rules 2002-01-16 01:39:59.000000000 +0100
+@@ -0,0 +1,181 @@
++/*
++ * GNU/Hurd shared library rules
++ *
++ * $XFree86: xc/config/cf/gnuLib.rules,v 1.5 2002/01/16 00:39:59 keithp Exp $
++ */
++
++/*
++ * GNU/Hurd shared library rules
++ * Cloned from Linux (ELF) shared library rules
++ *
++ */
++
++#ifndef HasSharedLibraries
++#define HasSharedLibraries YES
++#endif
++#ifndef ForceNormalLib
++#define ForceNormalLib NO
++#endif
++
++#ifndef SharedOldX
++#define SharedOldX NO
++#endif
++
++#undef SpecialMalloc
++#define SpecialMalloc NO
++
++#define BaseShLibReqs -lc
++
++#ifndef SharedDataSeparation
++#define SharedDataSeparation NO
++#endif
++#ifndef SharedCodeDef
++#define SharedCodeDef /**/
++#endif
++#ifndef SharedLibraryDef
++#define SharedLibraryDef /**/
++#endif
++#ifndef ShLibIncludeFile
++#define ShLibIncludeFile <gnuLib.tmpl>
++#endif
++#ifndef SharedLibraryLoadFlags
++XCOMM XXX To rpath or not to rpath...
++XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
++#define SharedLibraryLoadFlags -shared
++#endif
++#ifndef PositionIndependentCFlags
++#define PositionIndependentCFlags -fPIC
++#endif
++#ifndef PositionIndependentCplusplusFlags
++#define PositionIndependentCplusplusFlags -fPIC
++#endif
++#ifndef ExtraLoadFlags
++#ifdef UseInstalled
++XCOMM XXX Maybe superfluous.
++#define ExtraLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
++#else
++#define ExtraLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
++#endif
++#endif
++
++/*
++ * InstallSharedLibrary - generate rules to install the shared library.
++ * NOTE: file must be executable, hence "INSTBINFLAGS"
++ */
++#ifndef InstallSharedLibrary
++#define InstallSharedLibrary(libname,rev,dest)
@@\
++install:: Concat(lib,libname.so.rev) @@\
++ MakeDir($(DESTDIR)dest) @@\
++ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev)
$(DESTDIR)dest @@\
++ @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed
's/\.[^\.]*$$//'`;\
++ set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
++ @if $(SOSYMLINK); then (set -x; \
++ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
++ $(LN) Concat(lib,libname.so.rev)
Concat($(DESTDIR)dest/lib,libname.so)); fi
++#endif /* InstallSharedLibrary */
++
++/*
++ * InstallSharedLibraryData - generate rules to install the shared library
data
++ */
++#ifndef InstallSharedLibraryData
++#define InstallSharedLibraryData(libname,rev,dest)
++#endif /* InstallSharedLibraryData */
++
++
++/*
++ * SharedLibraryTarget - generate rules to create a shared library;
++ * build it into a different name so that we do not hose people by having
++ * the library gone for long periods.
++ */
++#ifndef SharedLibraryTarget
++#ifdef UseInstalled
++#define LinkBuildSonameLibrary(lib) true
++#else
++#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
++ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
++#endif
++
++#define SharedLibraryTarget(libname,rev,solist,down,up)
@@\
++AllTarget(Concat(lib,libname.so.rev)) @@\
++ @@\
++Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS)
@@\
++ $(RM) [EMAIL PROTECTED]
@@\
++ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
++ (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
++ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
++ LinkBuildSonameLibrary($$SONAME) @@\
++ $(RM) $@ @@\
++ $(MV) [EMAIL PROTECTED] $@
@@\
++ @if $(SOSYMLINK); then (set -x; \ @@\
++ $(RM) Concat(lib,libname.so); \ @@\
++ $(LN) $@ Concat(lib,libname.so)); fi @@\
++ LinkBuildLibrary($@) @@\
++ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
++ @@\
++clean::
@@\
++ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
++ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
++ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
++#endif /* SharedLibraryTarget */
++
++/*
++ * SharedDepLibraryTarget - generate rules to create a shared library.
++ */
++#ifndef SharedDepLibraryTarget
++#ifdef UseInstalled
++#ifndef LinkBuildSonameLibrary
++#define LinkBuildSonameLibrary(lib) true
++#endif
++#else
++#ifndef LinkBuildSonameLibrary
++#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
++ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
++#endif
++#endif
++
++#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
++AllTarget(Concat(lib,libname.so.rev)) @@\
++ @@\
++Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
++ $(RM) [EMAIL PROTECTED]
@@\
++ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
++ (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
++ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
++ LinkBuildSonameLibrary($$SONAME) @@\
++ $(RM) $@ @@\
++ $(MV) [EMAIL PROTECTED] $@
@@\
++ @if $(SOSYMLINK); then (set -x; \ @@\
++ $(RM) Concat(lib,libname.so); \ @@\
++ $(LN) $@ Concat(lib,libname.so)); fi @@\
++ LinkBuildLibrary($@) @@\
++ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
++ @@\
++clean::
@@\
++ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
++ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
++ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
++#endif /* SharedDepLibraryTarget */
++
++#ifndef SharedDepModuleTarget
++#define SharedDepModuleTarget(name,deps,solist)
@@\
++AllTarget(name)
@@\
++ @@\
++name: deps @@\
++ $(RM) [EMAIL PROTECTED]
@@\
++ $(CC) -o [EMAIL PROTECTED] $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)
BaseShLibReqs @@\
++ $(RM) $@ @@\
++ $(MV) [EMAIL PROTECTED] $@
@@\
++ @@\
++clean::
@@\
++ $(RM) name
++
++#endif /* SharedDepModuleTarget */
++
++/*
++ * SharedLibraryDataTarget - generate rules to create shlib data file;
++ */
++#ifndef SharedLibraryDataTarget
++#define SharedLibraryDataTarget(libname,rev,salist)
++#endif /* SharedLibraryTarget */
+diff -Nur xc/config/cf.old/gnu-commonLib.tmpl xc/config/cf/gnu-commonLib.tmpl
+--- xc/config/cf.old/gnu-commonLib.tmpl 1970-01-01 01:00:00.000000000
+0100
++++ xc/config/cf/gnu-commonLib.tmpl 2000-11-14 19:20:31.000000000 +0100
+@@ -0,0 +1,30 @@
++/*
++ * GNU Hurd shared library template
++ *
++ * $XFree86: xc/config/cf/gnuLib.tmpl,v 1.3 2000/11/14 18:20:31 dawes Exp $
++ */
++
++#ifndef FixupLibReferences
++#define FixupLibReferences() @@\
++XMULIBONLY = -lXmu @@\
++XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
++#endif
++
++#ifndef XawClientLibs
++#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
++#endif
++
++#define CplusplusLibC
++
++#define SharedX11Reqs
++#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
++#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
++#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
++#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
++#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
++#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
++#define SharedXiReqs $(LDPRELIB) $(XLIB)
++#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
++#define SharedXtstReqs $(LDPRELIB) $(XLIB)
++#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
++#define SharedSMReqs $(LDPRELIB) $(ICELIB)
+diff -Nur xc/config/cf.old/gnuLib.rules xc/config/cf/gnuLib.rules
+--- xc/config/cf.old/gnuLib.rules 2002-01-16 01:39:59.000000000 +0100
++++ xc/config/cf/gnuLib.rules 1970-01-01 01:00:00.000000000 +0100
+@@ -1,181 +0,0 @@
+-/*
+- * GNU/Hurd shared library rules
+- *
+- * $XFree86: xc/config/cf/gnuLib.rules,v 1.5 2002/01/16 00:39:59 keithp Exp $
+- */
+-
+-/*
+- * GNU/Hurd shared library rules
+- * Cloned from Linux (ELF) shared library rules
+- *
+- */
+-
+-#ifndef HasSharedLibraries
+-#define HasSharedLibraries YES
+-#endif
+-#ifndef ForceNormalLib
+-#define ForceNormalLib NO
+-#endif
+-
+-#ifndef SharedOldX
+-#define SharedOldX NO
+-#endif
+-
+-#undef SpecialMalloc
+-#define SpecialMalloc NO
+-
+-#define BaseShLibReqs -lc
+-
+-#ifndef SharedDataSeparation
+-#define SharedDataSeparation NO
+-#endif
+-#ifndef SharedCodeDef
+-#define SharedCodeDef /**/
+-#endif
+-#ifndef SharedLibraryDef
+-#define SharedLibraryDef /**/
+-#endif
+-#ifndef ShLibIncludeFile
+-#define ShLibIncludeFile <gnuLib.tmpl>
+-#endif
+-#ifndef SharedLibraryLoadFlags
+-XCOMM XXX To rpath or not to rpath...
+-XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
+-#define SharedLibraryLoadFlags -shared
+-#endif
+-#ifndef PositionIndependentCFlags
+-#define PositionIndependentCFlags -fPIC
+-#endif
+-#ifndef PositionIndependentCplusplusFlags
+-#define PositionIndependentCplusplusFlags -fPIC
+-#endif
+-#ifndef ExtraLoadFlags
+-#ifdef UseInstalled
+-XCOMM XXX Maybe superfluous.
+-#define ExtraLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
+-#else
+-#define ExtraLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
+-#endif
+-#endif
+-
+-/*
+- * InstallSharedLibrary - generate rules to install the shared library.
+- * NOTE: file must be executable, hence "INSTBINFLAGS"
+- */
+-#ifndef InstallSharedLibrary
+-#define InstallSharedLibrary(libname,rev,dest)
@@\
+-install:: Concat(lib,libname.so.rev) @@\
+- MakeDir($(DESTDIR)dest) @@\
+- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev)
$(DESTDIR)dest @@\
+- @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed
's/\.[^\.]*$$//'`;\
+- set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
+- @if $(SOSYMLINK); then (set -x; \
+- $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
+- $(LN) Concat(lib,libname.so.rev)
Concat($(DESTDIR)dest/lib,libname.so)); fi
+-#endif /* InstallSharedLibrary */
+-
+-/*
+- * InstallSharedLibraryData - generate rules to install the shared library
data
+- */
+-#ifndef InstallSharedLibraryData
+-#define InstallSharedLibraryData(libname,rev,dest)
+-#endif /* InstallSharedLibraryData */
+-
+-
+-/*
+- * SharedLibraryTarget - generate rules to create a shared library;
+- * build it into a different name so that we do not hose people by having
+- * the library gone for long periods.
+- */
+-#ifndef SharedLibraryTarget
+-#ifdef UseInstalled
+-#define LinkBuildSonameLibrary(lib) true
+-#else
+-#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+-#endif
+-
+-#define SharedLibraryTarget(libname,rev,solist,down,up)
@@\
+-AllTarget(Concat(lib,libname.so.rev)) @@\
+- @@\
+-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS)
@@\
+- $(RM) [EMAIL PROTECTED]
@@\
+- @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
+- (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
+- LinkBuildSonameLibrary($$SONAME) @@\
+- $(RM) $@ @@\
+- $(MV) [EMAIL PROTECTED] $@
@@\
+- @if $(SOSYMLINK); then (set -x; \ @@\
+- $(RM) Concat(lib,libname.so); \ @@\
+- $(LN) $@ Concat(lib,libname.so)); fi @@\
+- LinkBuildLibrary($@) @@\
+- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
+- @@\
+-clean::
@@\
+- @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
+- set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
+- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+-
+-#endif /* SharedLibraryTarget */
+-
+-/*
+- * SharedDepLibraryTarget - generate rules to create a shared library.
+- */
+-#ifndef SharedDepLibraryTarget
+-#ifdef UseInstalled
+-#ifndef LinkBuildSonameLibrary
+-#define LinkBuildSonameLibrary(lib) true
+-#endif
+-#else
+-#ifndef LinkBuildSonameLibrary
+-#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+-#endif
+-#endif
+-
+-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
+-AllTarget(Concat(lib,libname.so.rev)) @@\
+- @@\
+-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
+- $(RM) [EMAIL PROTECTED]
@@\
+- @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
+- (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
+- LinkBuildSonameLibrary($$SONAME) @@\
+- $(RM) $@ @@\
+- $(MV) [EMAIL PROTECTED] $@
@@\
+- @if $(SOSYMLINK); then (set -x; \ @@\
+- $(RM) Concat(lib,libname.so); \ @@\
+- $(LN) $@ Concat(lib,libname.so)); fi @@\
+- LinkBuildLibrary($@) @@\
+- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
+- @@\
+-clean::
@@\
+- @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
+- set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
+- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+-
+-#endif /* SharedDepLibraryTarget */
+-
+-#ifndef SharedDepModuleTarget
+-#define SharedDepModuleTarget(name,deps,solist)
@@\
+-AllTarget(name)
@@\
+- @@\
+-name: deps @@\
+- $(RM) [EMAIL PROTECTED]
@@\
+- $(CC) -o [EMAIL PROTECTED] $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)
BaseShLibReqs @@\
+- $(RM) $@ @@\
+- $(MV) [EMAIL PROTECTED] $@
@@\
+- @@\
+-clean::
@@\
+- $(RM) name
+-
+-#endif /* SharedDepModuleTarget */
+-
+-/*
+- * SharedLibraryDataTarget - generate rules to create shlib data file;
+- */
+-#ifndef SharedLibraryDataTarget
+-#define SharedLibraryDataTarget(libname,rev,salist)
+-#endif /* SharedLibraryTarget */
+diff -Nur xc/config/cf.old/gnuLib.tmpl xc/config/cf/gnuLib.tmpl
+--- xc/config/cf.old/gnuLib.tmpl 2000-11-14 19:20:31.000000000 +0100
++++ xc/config/cf/gnuLib.tmpl 1970-01-01 01:00:00.000000000 +0100
+@@ -1,30 +0,0 @@
+-/*
+- * GNU Hurd shared library template
+- *
+- * $XFree86: xc/config/cf/gnuLib.tmpl,v 1.3 2000/11/14 18:20:31 dawes Exp $
+- */
+-
+-#ifndef FixupLibReferences
+-#define FixupLibReferences() @@\
+-XMULIBONLY = -lXmu @@\
+-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+-#endif
+-
+-#ifndef XawClientLibs
+-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+-#endif
+-
+-#define CplusplusLibC
+-
+-#define SharedX11Reqs
+-#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
+-#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
+-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
+-#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
+-#define SharedXiReqs $(LDPRELIB) $(XLIB)
+-#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
+-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
+-#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
+-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
Added: branches/4.3.0/sid/debian/patches/001d_gnu-lib_split.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/001d_gnu-lib_split.diff 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/001d_gnu-lib_split.diff 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,22 @@
+diff -Nur xc/config/cf.old/gnuLib.rules xc/config/cf/gnuLib.rules
+--- xc/config/cf.old/gnuLib.rules 1970-01-01 01:00:00.000000000 +0100
++++ xc/config/cf/gnuLib.rules 2003-10-15 20:08:04.000000000 +0200
+@@ -0,0 +1,7 @@
++
++XCOMM Include rules common to all GNU variants
++#include <gnu-commonLib.rules>
++
++XCOMM Below, rules specific to the GNU system (with the Hurd)
++
++XCOMM (nothing yet)
+diff -Nur xc/config/cf.old/gnuLib.tmpl xc/config/cf/gnuLib.tmpl
+--- xc/config/cf.old/gnuLib.tmpl 1970-01-01 01:00:00.000000000 +0100
++++ xc/config/cf/gnuLib.tmpl 2003-10-15 20:08:23.000000000 +0200
+@@ -0,0 +1,7 @@
++
++XCOMM Include rules common to all GNU variants
++#include <gnu-commonLib.tmpl>
++
++XCOMM Below, rules specific to the GNU system (with the Hurd)
++
++XCOMM (nothing yet)
Modified: branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff 2003-10-22
17:53:46 UTC (rev 696)
@@ -133,18 +133,15 @@
- (cosmetic) Don't capitalize or put periods at the ends of log
messages, since they aren't sentences.
---- xc/config/cf/gnu.cf~ 2003-09-21 15:53:53.000000000 -0500
-+++ xc/config/cf/gnu.cf 2003-09-21 15:53:35.000000000 -0500
-@@ -33,6 +33,9 @@
- XCOMM #define ThreadsLibraries -lpthread
- XCOMM #define SystemMTDefines -D_REENTRANT
-
+--- xc/config/cf/gnu.cf.orig 2003-10-15 02:07:11.000000000 +0200
++++ xc/config/cf/gnu.cf 2003-10-15 02:08:15.000000000 +0200
+@@ -17,3 +17,6 @@
+ XCOMM #ifndef StandardDefines
+ XCOMM #define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
+ XCOMM #endif
++
+#define HasDevRandom YES
+#define PollDevRandom YES
-+
- #ifndef HasLibCrypt
- #define HasLibCrypt YES
- #endif
--- xc/config/cf/linux.cf~ 2003-09-21 15:40:11.000000000 -0500
+++ xc/config/cf/linux.cf 2003-09-21 15:41:15.000000000 -0500
@@ -86,6 +86,12 @@
Modified: branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
2003-10-22 05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
2003-10-22 17:53:46 UTC (rev 696)
@@ -7,8 +7,8 @@
stuff using cpp in the tree probably needs to be "ported" to work when
-traditional is not set, if possible.
---- xc/config/cf/gnu.cf~ 2003-05-26 23:27:33.000000000 -0500
-+++ xc/config/cf/gnu.cf 2003-05-26 23:29:16.000000000 -0500
+--- xc/config/cf/gnu-common.cf~ 2003-05-26 23:27:33.000000000 -0500
++++ xc/config/cf/gnu-common.cf 2003-05-26 23:29:16.000000000 -0500
@@ -108,9 +108,7 @@
#ifndef DoLoadableServer
#define DoLoadableServer YES
Modified:
branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
2003-10-22 05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
2003-10-22 17:53:46 UTC (rev 696)
@@ -269,8 +269,8 @@
#endif
INSTBINFLAGS = InstBinFlags /* install flags for programs */
INSTUIDFLAGS = InstUidFlags /* install flags for setuid programs */
---- xc/config/cf/gnu.cf.orig Mon Jan 13 17:22:45 2003
-+++ xc/config/cf/gnu.cf Mon Jan 13 17:22:51 2003
+--- xc/config/cf/gnu-common.cf.orig Mon Jan 13 17:22:45 2003
++++ xc/config/cf/gnu-common.cf Mon Jan 13 17:22:51 2003
@@ -144,26 +144,6 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
Modified: branches/4.3.0/sid/debian/patches/800_gnu_config.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/800_gnu_config.diff 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/800_gnu_config.diff 2003-10-22
17:53:46 UTC (rev 696)
@@ -2,14 +2,14 @@
This patch by Marcus Brinkmann <[EMAIL PROTECTED]>.
-Adds Debian specific configuration to gnu.cf (mostly from linux.cf).
+Adds Debian specific configuration to gnu-common.cf (mostly from linux.cf).
Original patch by Marcus Brinkmann <[EMAIL PROTECTED]>, updated by
-Robert Millan <[EMAIL PROTECTED]> and
+Robert Millan <[EMAIL PROTECTED]> and
Daniel Stone <[EMAIL PROTECTED]>.
---- xc/config/cf/gnu.cf.orig Fri Aug 24 04:16:54 2001
-+++ xc/config/cf/gnu.cf Sun Apr 13 11:19:47 2003
+--- xc/config/cf/gnu-common.cf.orig Fri Aug 24 04:16:54 2001
++++ xc/config/cf/gnu-common.cf Sun Apr 13 11:19:47 2003
@@ -18,6 +18,76 @@
#endif
XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
Added: branches/4.3.0/sid/debian/patches/800a_gnu_more_fixes.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/800a_gnu_more_fixes.diff 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/800a_gnu_more_fixes.diff 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,31 @@
+
+ More fixes for gnu-common.cf as pointed out by Ishikawa some time ago.
+ -- Robert Millan <[EMAIL PROTECTED]>
+
+--- xc/config/cf.old/gnu-common.cf 2003-10-15 20:01:04.000000000 +0200
++++ xc/config/cf/gnu-common.cf 2003-10-15 20:42:40.000000000 +0200
+@@ -88,6 +88,24 @@
+ # define BuildTrueTypeFonts NO
+ # define BuildBethMarduthoFonts NO
+
++# define HasXftLibrary YES
++
++# define BuildXcursorLibrary NO
++# define HasXcursorLibrary YES
++# define BuildRenderLibrary NO
++# define HasRenderLibrary YES
++
++# ifdef UseInstalled
++# define RenderLibraryDir /usr/X11R6
++# define XftLibraryDir /usr/X11R6
++# define XcursorLibraryDir /usr
++# else
++/* for Debian xfree86 build hack */
++# define RenderLibraryDir $(TOP)/../../debian/local/exports
++# define XftLibraryDir $(TOP)/../../debian/local/exports
++# define XcursorLibraryDir $(TOP)/../../debian/local/exports
++# endif
++
+ #define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
+ -D_POSIX_SOURCE -D_XOPEN_SOURCE \
+ -D_BSD_SOURCE -D_SVID_SOURCE
Added: branches/4.3.0/sid/debian/patches/803_gnu_xdm_chooser.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/803_gnu_xdm_chooser.diff 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/patches/803_gnu_xdm_chooser.diff 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,85 @@
+
+ Weird.. code for "__GNU__" does actualy fail on GNU/Hurd, whereas code for
+ "! __GNU__" does at least _compile_ on that platform.
+
+ I see no reason not to use the same code for all Glibc-based systems, so
+ we'll just stick with the code that works on GNU/Linux. I'll have to check
+ with upstream to see what they intended to do when adding this kludge.
+ -- Robert Millan <[EMAIL PROTECTED]>
+
+--- xc/programs/xdm/chooser.c.orig 2003-10-17 01:22:35.000000000 +0200
++++ xc/programs/xdm/chooser.c 2003-10-17 01:28:55.000000000 +0200
+@@ -130,9 +130,7 @@
+ # include <sync/queue.h>
+ # include <sync/sema.h>
+ #endif
+-#ifndef __GNU__
+-# include <net/if.h>
+-#endif /* __GNU__ */
++#include <net/if.h>
+ #endif /* hpux */
+
+ #include <netdb.h>
+@@ -550,8 +548,6 @@
+ * addresses on the local host.
+ */
+
+-#if !defined(__GNU__)
+-
+ /* Handle variable length ifreq in BNR2 and later */
+ #ifdef VARIABLE_IFREQ
+ #define ifr_size(p) (sizeof (struct ifreq) + \
+@@ -712,53 +708,6 @@
+ QUERY);
+ }
+ }
+-#else /* __GNU__ */
+-static void
+-RegisterHostname (char *name)
+-{
+- struct hostent *hostent;
+- struct sockaddr_in in_addr;
+-
+- if (!strcmp (name, BROADCAST_HOSTNAME))
+- {
+- in_addr.sin_addr.s_addr= htonl(0xFFFFFFFF);
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- BROADCAST_QUERY);
+- }
+- else
+- {
+-
+- /* address as hex string, e.g., "12180022" (deprecated) */
+- if (strlen(name) == 8 &&
+- FromHex(name, (char *)&in_addr.sin_addr, strlen(name)) == 0)
+- {
+- in_addr.sin_family = AF_INET;
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- QUERY);
+- } else {
+- /* Per RFC 1123, check first for IP address in dotted-decimal form */
+- else if ((in_addr.sin_addr.s_addr = inet_addr(name)) != -1)
+- in_addr.sin_family = AF_INET;
+- else
+- {
+- hostent = gethostbyname (name);
+- if (!hostent)
+- return;
+- if (hostent->h_addrtype != AF_INET || hostent->h_length != 4)
+- return;
+- in_addr.sin_family = hostent->h_addrtype;
+- memmove( &in_addr.sin_addr, hostent->h_addr, 4);
+- }
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- QUERY);
+- }
+-
+- }
+-}
+-#endif /* __GNU__ */
+
+ static ARRAYofARRAY8 AuthenticationNames;
+
Added: branches/4.3.0/sid/debian/xbase-clients.install.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/xbase-clients.install.hurd-i386 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/xbase-clients.install.hurd-i386 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,222 @@
+etc/X11/app-defaults/Beforelight
+etc/X11/app-defaults/Bitmap
+etc/X11/app-defaults/Bitmap-color
+etc/X11/app-defaults/Clock-color
+etc/X11/app-defaults/Editres
+etc/X11/app-defaults/Editres-color
+etc/X11/app-defaults/Viewres
+etc/X11/app-defaults/XCalc
+etc/X11/app-defaults/XCalc-color
+etc/X11/app-defaults/XClipboard
+etc/X11/app-defaults/XClock
+etc/X11/app-defaults/XConsole
+etc/X11/app-defaults/XFontSel
+etc/X11/app-defaults/XLoad
+etc/X11/app-defaults/XLogo
+etc/X11/app-defaults/XLogo-color
+etc/X11/app-defaults/XSm
+etc/X11/app-defaults/Xditview
+etc/X11/app-defaults/Xditview-chrtr
+etc/X11/app-defaults/Xedit
+etc/X11/app-defaults/Xedit-color
+etc/X11/app-defaults/Xfd
+etc/X11/app-defaults/Xgc
+etc/X11/app-defaults/Xmag
+etc/X11/app-defaults/Xman
+etc/X11/app-defaults/Xmessage
+etc/X11/app-defaults/Xmessage-color
+etc/X11/app-defaults/Xvidtune
+etc/X11/xinit/xinitrc
+etc/X11/xinit/xserverrc
+etc/X11/xsm/system.xsm
+usr/X11R6/bin/Xmark
+usr/X11R6/bin/appres
+usr/X11R6/bin/beforelight
+usr/X11R6/bin/bitmap
+usr/X11R6/bin/bmtoa
+usr/X11R6/bin/cxpm
+usr/X11R6/bin/dga
+usr/X11R6/bin/dpsexec
+usr/X11R6/bin/dpsinfo
+usr/X11R6/bin/editres
+usr/X11R6/bin/fstobdf
+usr/X11R6/bin/glxgears
+usr/X11R6/bin/glxinfo
+usr/X11R6/bin/iceauth
+usr/X11R6/bin/ico
+usr/X11R6/bin/listres
+usr/X11R6/bin/mkfontscale
+usr/X11R6/bin/oclock
+usr/X11R6/bin/setxkbmap
+usr/X11R6/bin/smproxy
+usr/X11R6/bin/startx
+usr/X11R6/bin/sxpm
+usr/X11R6/bin/texteroids
+usr/X11R6/bin/viewres
+usr/X11R6/bin/x11perf
+usr/X11R6/bin/x11perfcomp
+usr/X11R6/bin/xauth
+usr/X11R6/bin/xbiff
+usr/X11R6/bin/xcalc
+usr/X11R6/bin/xclipboard
+usr/X11R6/bin/xclock
+usr/X11R6/bin/xcmsdb
+usr/X11R6/bin/xconsole
+usr/X11R6/bin/xcutsel
+usr/X11R6/bin/xditview
+usr/X11R6/bin/xdpyinfo
+usr/X11R6/bin/xedit
+usr/X11R6/bin/xev
+usr/X11R6/bin/xeyes
+usr/X11R6/bin/xf86cfg
+usr/X11R6/bin/xf86config
+usr/X11R6/bin/xfd
+usr/X11R6/bin/xfindproxy
+usr/X11R6/bin/xfontsel
+usr/X11R6/bin/xgamma
+usr/X11R6/bin/xgc
+usr/X11R6/bin/xhost
+usr/X11R6/bin/xinit
+usr/X11R6/bin/xkbbell
+usr/X11R6/bin/xkbcomp
+usr/X11R6/bin/xkbevd
+usr/X11R6/bin/xkbprint
+usr/X11R6/bin/xkbvleds
+usr/X11R6/bin/xkbwatch
+usr/X11R6/bin/xkill
+usr/X11R6/bin/xload
+usr/X11R6/bin/xlogo
+usr/X11R6/bin/xlsatoms
+usr/X11R6/bin/xlsclients
+usr/X11R6/bin/xlsfonts
+usr/X11R6/bin/xmag
+usr/X11R6/bin/xman
+usr/X11R6/bin/xmessage
+usr/X11R6/bin/xmodmap
+usr/X11R6/bin/xprop
+usr/X11R6/bin/xrandr
+usr/X11R6/bin/xrdb
+usr/X11R6/bin/xrefresh
+usr/X11R6/bin/xset
+usr/X11R6/bin/xsetmode
+usr/X11R6/bin/xsetpointer
+usr/X11R6/bin/xsetroot
+usr/X11R6/bin/xsm
+usr/X11R6/bin/xstdcmap
+usr/X11R6/bin/xtrapchar
+usr/X11R6/bin/xtrapin
+usr/X11R6/bin/xtrapinfo
+usr/X11R6/bin/xtrapout
+usr/X11R6/bin/xtrapproto
+usr/X11R6/bin/xtrapreset
+usr/X11R6/bin/xtrapstats
+usr/X11R6/bin/xvidtune
+usr/X11R6/bin/xvinfo
+usr/X11R6/bin/xwd
+usr/X11R6/bin/xwininfo
+usr/X11R6/bin/xwud
+usr/X11R6/lib/X11/etc/xmodmap.std
+usr/X11R6/lib/X11/x11perfcomp/fillblnk
+usr/X11R6/lib/X11/x11perfcomp/perfboth
+usr/X11R6/lib/X11/x11perfcomp/perfratio
+usr/X11R6/lib/X11/xedit/lisp/indent.lsp
+usr/X11R6/lib/X11/xedit/lisp/lisp.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/html.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/imake.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/lisp.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/make.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/man.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/rpm.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/sgml.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/sh.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/xconf.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/xlog.lsp
+usr/X11R6/lib/X11/xedit/lisp/progmodes/xrdb.lsp
+usr/X11R6/lib/X11/xedit/lisp/syntax.lsp
+usr/X11R6/lib/X11/xedit/lisp/xedit.lsp
+usr/X11R6/lib/X11/xman.help
+usr/X11R6/man/man1/Xmark.1x
+usr/X11R6/man/man1/appres.1x
+usr/X11R6/man/man1/beforelight.1x
+usr/X11R6/man/man1/bitmap.1x
+usr/X11R6/man/man1/bmtoa.1x
+usr/X11R6/man/man1/cxpm.1x
+usr/X11R6/man/man1/dga.1x
+usr/X11R6/man/man1/dpsexec.1x
+usr/X11R6/man/man1/dpsinfo.1x
+usr/X11R6/man/man1/editres.1x
+usr/X11R6/man/man1/fstobdf.1x
+usr/X11R6/man/man1/glxgears.1x
+usr/X11R6/man/man1/glxinfo.1x
+usr/X11R6/man/man1/iceauth.1x
+usr/X11R6/man/man1/ico.1x
+usr/X11R6/man/man1/listres.1x
+usr/X11R6/man/man1/mkfontscale.1x
+usr/X11R6/man/man1/oclock.1x
+usr/X11R6/man/man1/setxkbmap.1x
+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/viewres.1x
+usr/X11R6/man/man1/x11perf.1x
+usr/X11R6/man/man1/x11perfcomp.1x
+usr/X11R6/man/man1/xauth.1x
+usr/X11R6/man/man1/xbiff.1x
+usr/X11R6/man/man1/xcalc.1x
+usr/X11R6/man/man1/xclipboard.1x
+usr/X11R6/man/man1/xclock.1x
+usr/X11R6/man/man1/xcmsdb.1x
+usr/X11R6/man/man1/xconsole.1x
+usr/X11R6/man/man1/xcutsel.1x
+usr/X11R6/man/man1/xditview.1x
+usr/X11R6/man/man1/xdpyinfo.1x
+usr/X11R6/man/man1/xedit.1x
+usr/X11R6/man/man1/xev.1x
+usr/X11R6/man/man1/xeyes.1x
+usr/X11R6/man/man1/xf86cfg.1x
+usr/X11R6/man/man1/xf86config.1x
+usr/X11R6/man/man1/xfd.1x
+usr/X11R6/man/man1/xfindproxy.1x
+usr/X11R6/man/man1/xfontsel.1x
+usr/X11R6/man/man1/xgamma.1x
+usr/X11R6/man/man1/xgc.1x
+usr/X11R6/man/man1/xhost.1x
+usr/X11R6/man/man1/xinit.1x
+usr/X11R6/man/man1/xkbcomp.1x
+usr/X11R6/man/man1/xkbevd.1x
+usr/X11R6/man/man1/xkbprint.1x
+usr/X11R6/man/man1/xkill.1x
+usr/X11R6/man/man1/xload.1x
+usr/X11R6/man/man1/xlogo.1x
+usr/X11R6/man/man1/xlsatoms.1x
+usr/X11R6/man/man1/xlsclients.1x
+usr/X11R6/man/man1/xlsfonts.1x
+usr/X11R6/man/man1/xmag.1x
+usr/X11R6/man/man1/xman.1x
+usr/X11R6/man/man1/xmessage.1x
+usr/X11R6/man/man1/xmodmap.1x
+usr/X11R6/man/man1/xprop.1x
+usr/X11R6/man/man1/xrandr.1x
+usr/X11R6/man/man1/xrdb.1x
+usr/X11R6/man/man1/xrefresh.1x
+usr/X11R6/man/man1/xset.1x
+usr/X11R6/man/man1/xsetmode.1x
+usr/X11R6/man/man1/xsetpointer.1x
+usr/X11R6/man/man1/xsetroot.1x
+usr/X11R6/man/man1/xsm.1x
+usr/X11R6/man/man1/xstdcmap.1x
+usr/X11R6/man/man1/xtrap.1x
+usr/X11R6/man/man1/xtrapchar.1x
+usr/X11R6/man/man1/xtrapin.1x
+usr/X11R6/man/man1/xtrapinfo.1x
+usr/X11R6/man/man1/xtrapout.1x
+usr/X11R6/man/man1/xtrapproto.1x
+usr/X11R6/man/man1/xtrapreset.1x
+usr/X11R6/man/man1/xtrapstats.1x
+usr/X11R6/man/man1/xvidtune.1x
+usr/X11R6/man/man1/xvinfo.1x
+usr/X11R6/man/man1/xwd.1x
+usr/X11R6/man/man1/xwininfo.1x
+usr/X11R6/man/man1/xwud.1x
Added: branches/4.3.0/sid/debian/xfree86-common.docs.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/xfree86-common.docs.hurd-i386 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/xfree86-common.docs.hurd-i386 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,5 @@
+debian/tmp/usr/X11R6/lib/X11/doc/README
+debian/tmp/usr/X11R6/lib/X11/doc/README.dps
+debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
+debian/tmp/usr/X11R6/lib/X11/doc/RELNOTES
+debian/tmp/usr/X11R6/lib/X11/doc/Versions
Added: branches/4.3.0/sid/debian/xlibmesa-gl-dbg.install.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/xlibmesa-gl-dbg.install.hurd-i386 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/xlibmesa-gl-dbg.install.hurd-i386 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1 @@
+usr/X11R6/lib/libGL.so.1.2
Added: branches/4.3.0/sid/debian/xlibmesa-glu-dbg.install.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/xlibmesa-glu-dbg.install.hurd-i386
2003-10-22 05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/xlibmesa-glu-dbg.install.hurd-i386
2003-10-22 17:53:46 UTC (rev 696)
@@ -0,0 +1 @@
+usr/X11R6/lib/libGLU.so.1.3
Added: branches/4.3.0/sid/debian/xlibosmesa4-dbg.install.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/xlibosmesa4-dbg.install.hurd-i386 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/xlibosmesa4-dbg.install.hurd-i386 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1 @@
+usr/X11R6/lib/libOSMesa.so.4.0
Added: branches/4.3.0/sid/debian/xlibs-data.install.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/xlibs-data.install.hurd-i386 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/xlibs-data.install.hurd-i386 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,584 @@
+etc/X11/cursors/core.theme
+etc/X11/cursors/handhelds.theme
+etc/X11/cursors/redglass.theme
+etc/X11/cursors/whiteglass.theme
+etc/X11/xkb/README
+etc/X11/xkb/README.config
+etc/X11/xkb/README.enhancing
+etc/X11/xkb/compat.dir
+etc/X11/xkb/compat/README
+etc/X11/xkb/compat/accessx
+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/misc
+etc/X11/xkb/compat/mousekeys
+etc/X11/xkb/compat/norepeat
+etc/X11/xkb/compat/pc
+etc/X11/xkb/compat/pc98
+etc/X11/xkb/compat/xfree86
+etc/X11/xkb/compat/xtest
+etc/X11/xkb/geometry.dir
+etc/X11/xkb/geometry/README
+etc/X11/xkb/geometry/amiga
+etc/X11/xkb/geometry/ataritt
+etc/X11/xkb/geometry/dell
+etc/X11/xkb/geometry/digital/lk
+etc/X11/xkb/geometry/digital/pc
+etc/X11/xkb/geometry/digital/unix
+etc/X11/xkb/geometry/everex
+etc/X11/xkb/geometry/fujitsu
+etc/X11/xkb/geometry/hp
+etc/X11/xkb/geometry/keytronic
+etc/X11/xkb/geometry/kinesis
+etc/X11/xkb/geometry/macintosh
+etc/X11/xkb/geometry/microsoft
+etc/X11/xkb/geometry/nec
+etc/X11/xkb/geometry/northgate
+etc/X11/xkb/geometry/pc
+etc/X11/xkb/geometry/sgi/O2
+etc/X11/xkb/geometry/sgi/indigo
+etc/X11/xkb/geometry/sgi/indy
+etc/X11/xkb/geometry/sony
+etc/X11/xkb/geometry/sun
+etc/X11/xkb/geometry/winbook
+etc/X11/xkb/keycodes.dir
+etc/X11/xkb/keycodes/README
+etc/X11/xkb/keycodes/aliases
+etc/X11/xkb/keycodes/amiga
+etc/X11/xkb/keycodes/ataritt
+etc/X11/xkb/keycodes/digital/lk
+etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/fujitsu
+etc/X11/xkb/keycodes/hp
+etc/X11/xkb/keycodes/ibm
+etc/X11/xkb/keycodes/macintosh
+etc/X11/xkb/keycodes/powerpcps2
+etc/X11/xkb/keycodes/riscpc
+etc/X11/xkb/keycodes/sgi/indigo
+etc/X11/xkb/keycodes/sgi/indy
+etc/X11/xkb/keycodes/sgi/iris
+etc/X11/xkb/keycodes/sony
+etc/X11/xkb/keycodes/sun
+etc/X11/xkb/keycodes/xfree86
+etc/X11/xkb/keycodes/xfree98
+etc/X11/xkb/keymap.dir
+etc/X11/xkb/keymap/README
+etc/X11/xkb/keymap/amiga
+etc/X11/xkb/keymap/ataritt
+etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/macintosh
+etc/X11/xkb/keymap/sgi/be
+etc/X11/xkb/keymap/sgi/bg
+etc/X11/xkb/keymap/sgi/ca
+etc/X11/xkb/keymap/sgi/cz
+etc/X11/xkb/keymap/sgi/cz_qwerty
+etc/X11/xkb/keymap/sgi/de
+etc/X11/xkb/keymap/sgi/de_CH
+etc/X11/xkb/keymap/sgi/dk
+etc/X11/xkb/keymap/sgi/dvorak
+etc/X11/xkb/keymap/sgi/en_US
+etc/X11/xkb/keymap/sgi/es
+etc/X11/xkb/keymap/sgi/fi
+etc/X11/xkb/keymap/sgi/fr
+etc/X11/xkb/keymap/sgi/fr_CH
+etc/X11/xkb/keymap/sgi/gb
+etc/X11/xkb/keymap/sgi/hu
+etc/X11/xkb/keymap/sgi/it
+etc/X11/xkb/keymap/sgi/jp
+etc/X11/xkb/keymap/sgi/no
+etc/X11/xkb/keymap/sgi/pl
+etc/X11/xkb/keymap/sgi/pt
+etc/X11/xkb/keymap/sgi/ru
+etc/X11/xkb/keymap/sgi/se
+etc/X11/xkb/keymap/sgi/sk
+etc/X11/xkb/keymap/sgi/sk_qwerty
+etc/X11/xkb/keymap/sgi/th
+etc/X11/xkb/keymap/sgi/us
+etc/X11/xkb/keymap/sony
+etc/X11/xkb/keymap/sun/de
+etc/X11/xkb/keymap/sun/es
+etc/X11/xkb/keymap/sun/fi
+etc/X11/xkb/keymap/sun/fr
+etc/X11/xkb/keymap/sun/no
+etc/X11/xkb/keymap/sun/pl
+etc/X11/xkb/keymap/sun/ru
+etc/X11/xkb/keymap/sun/se
+etc/X11/xkb/keymap/sun/uk
+etc/X11/xkb/keymap/sun/us
+etc/X11/xkb/keymap/xfree86
+etc/X11/xkb/keymap/xfree98
+etc/X11/xkb/rules/README
+etc/X11/xkb/rules/sgi
+etc/X11/xkb/rules/sgi.lst
+etc/X11/xkb/rules/sun
+etc/X11/xkb/rules/sun.lst
+etc/X11/xkb/rules/xfree86
+etc/X11/xkb/rules/xfree86-it.lst
+etc/X11/xkb/rules/xfree86.lst
+etc/X11/xkb/rules/xfree86.xml
+etc/X11/xkb/semantics/basic
+etc/X11/xkb/semantics/complete
+etc/X11/xkb/semantics/default
+etc/X11/xkb/semantics/xtest
+etc/X11/xkb/symbols.dir
+etc/X11/xkb/symbols/README
+etc/X11/xkb/symbols/al
+etc/X11/xkb/symbols/altwin
+etc/X11/xkb/symbols/am
+etc/X11/xkb/symbols/ar
+etc/X11/xkb/symbols/az
+etc/X11/xkb/symbols/be
+etc/X11/xkb/symbols/ben
+etc/X11/xkb/symbols/bg
+etc/X11/xkb/symbols/br
+etc/X11/xkb/symbols/bs
+etc/X11/xkb/symbols/by
+etc/X11/xkb/symbols/ca
+etc/X11/xkb/symbols/ca_enhanced
+etc/X11/xkb/symbols/compose
+etc/X11/xkb/symbols/ctrl
+etc/X11/xkb/symbols/cz
+etc/X11/xkb/symbols/cz_qwerty
+etc/X11/xkb/symbols/czsk
+etc/X11/xkb/symbols/de
+etc/X11/xkb/symbols/de_CH
+etc/X11/xkb/symbols/dev
+etc/X11/xkb/symbols/digital/lk
+etc/X11/xkb/symbols/digital/pc
+etc/X11/xkb/symbols/digital/us
+etc/X11/xkb/symbols/digital/vt
+etc/X11/xkb/symbols/dk
+etc/X11/xkb/symbols/dvorak
+etc/X11/xkb/symbols/ee
+etc/X11/xkb/symbols/el
+etc/X11/xkb/symbols/en_US
+etc/X11/xkb/symbols/es
+etc/X11/xkb/symbols/fi
+etc/X11/xkb/symbols/fr
+etc/X11/xkb/symbols/fr_CH
+etc/X11/xkb/symbols/fujitsu/jp
+etc/X11/xkb/symbols/fujitsu/us
+etc/X11/xkb/symbols/gb
+etc/X11/xkb/symbols/ge_la
+etc/X11/xkb/symbols/ge_ru
+etc/X11/xkb/symbols/group
+etc/X11/xkb/symbols/guj
+etc/X11/xkb/symbols/gur
+etc/X11/xkb/symbols/hp/us
+etc/X11/xkb/symbols/hr
+etc/X11/xkb/symbols/hu
+etc/X11/xkb/symbols/hu_US
+etc/X11/xkb/symbols/hu_qwerty
+etc/X11/xkb/symbols/ie
+etc/X11/xkb/symbols/il
+etc/X11/xkb/symbols/il_phonetic
+etc/X11/xkb/symbols/inet
+etc/X11/xkb/symbols/ir
+etc/X11/xkb/symbols/is
+etc/X11/xkb/symbols/iso9995-3
+etc/X11/xkb/symbols/it
+etc/X11/xkb/symbols/iu
+etc/X11/xkb/symbols/jp
+etc/X11/xkb/symbols/kan
+etc/X11/xkb/symbols/keypad
+etc/X11/xkb/symbols/la
+etc/X11/xkb/symbols/level3
+etc/X11/xkb/symbols/lo
+etc/X11/xkb/symbols/lock
+etc/X11/xkb/symbols/lt
+etc/X11/xkb/symbols/lt_std
+etc/X11/xkb/symbols/lv
+etc/X11/xkb/symbols/macintosh/de
+etc/X11/xkb/symbols/macintosh/de_CH
+etc/X11/xkb/symbols/macintosh/dk
+etc/X11/xkb/symbols/macintosh/es
+etc/X11/xkb/symbols/macintosh/fi
+etc/X11/xkb/symbols/macintosh/fr
+etc/X11/xkb/symbols/macintosh/fr_CH
+etc/X11/xkb/symbols/macintosh/gb
+etc/X11/xkb/symbols/macintosh/it
+etc/X11/xkb/symbols/macintosh/nl
+etc/X11/xkb/symbols/macintosh/no
+etc/X11/xkb/symbols/macintosh/pt
+etc/X11/xkb/symbols/macintosh/se
+etc/X11/xkb/symbols/macintosh/us
+etc/X11/xkb/symbols/mk
+etc/X11/xkb/symbols/ml
+etc/X11/xkb/symbols/mm
+etc/X11/xkb/symbols/mt
+etc/X11/xkb/symbols/mt_us
+etc/X11/xkb/symbols/nec/jp
+etc/X11/xkb/symbols/nl
+etc/X11/xkb/symbols/no
+etc/X11/xkb/symbols/ogham
+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/be
+etc/X11/xkb/symbols/pc/ben
+etc/X11/xkb/symbols/pc/bg
+etc/X11/xkb/symbols/pc/br
+etc/X11/xkb/symbols/pc/by
+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/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/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/hr
+etc/X11/xkb/symbols/pc/ie
+etc/X11/xkb/symbols/pc/il
+etc/X11/xkb/symbols/pc/il_phonetic
+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/kan
+etc/X11/xkb/symbols/pc/la
+etc/X11/xkb/symbols/pc/latin
+etc/X11/xkb/symbols/pc/lo
+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/mm
+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/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/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/th
+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/yu
+etc/X11/xkb/symbols/pc104
+etc/X11/xkb/symbols/pl
+etc/X11/xkb/symbols/pl2
+etc/X11/xkb/symbols/pt
+etc/X11/xkb/symbols/ralt
+etc/X11/xkb/symbols/ro
+etc/X11/xkb/symbols/ru
+etc/X11/xkb/symbols/ru_yawerty
+etc/X11/xkb/symbols/sapmi
+etc/X11/xkb/symbols/se
+etc/X11/xkb/symbols/se_FI
+etc/X11/xkb/symbols/se_NO
+etc/X11/xkb/symbols/se_SE
+etc/X11/xkb/symbols/sgi/jp
+etc/X11/xkb/symbols/si
+etc/X11/xkb/symbols/sk
+etc/X11/xkb/symbols/sk_qwerty
+etc/X11/xkb/symbols/sony/us
+etc/X11/xkb/symbols/sr
+etc/X11/xkb/symbols/srvr_ctrl
+etc/X11/xkb/symbols/sun/se
+etc/X11/xkb/symbols/sun/us
+etc/X11/xkb/symbols/syr
+etc/X11/xkb/symbols/syr_phonetic
+etc/X11/xkb/symbols/tel
+etc/X11/xkb/symbols/th
+etc/X11/xkb/symbols/tj
+etc/X11/xkb/symbols/tml
+etc/X11/xkb/symbols/tr
+etc/X11/xkb/symbols/tr_f
+etc/X11/xkb/symbols/ua
+etc/X11/xkb/symbols/us
+etc/X11/xkb/symbols/us_group2
+etc/X11/xkb/symbols/us_group3
+etc/X11/xkb/symbols/us_intl
+etc/X11/xkb/symbols/vn
+etc/X11/xkb/symbols/xfree68/amiga
+etc/X11/xkb/symbols/xfree68/ataritt
+etc/X11/xkb/symbols/yu
+etc/X11/xkb/types.dir
+etc/X11/xkb/types/README
+etc/X11/xkb/types/basic
+etc/X11/xkb/types/caps
+etc/X11/xkb/types/complete
+etc/X11/xkb/types/default
+etc/X11/xkb/types/extra
+etc/X11/xkb/types/iso9995
+etc/X11/xkb/types/mousekeys
+etc/X11/xkb/types/pc
+usr/X11R6/include/X11/bitmaps/1x1
+usr/X11R6/include/X11/bitmaps/2x2
+usr/X11R6/include/X11/bitmaps/Dashes
+usr/X11R6/include/X11/bitmaps/Down
+usr/X11R6/include/X11/bitmaps/Excl
+usr/X11R6/include/X11/bitmaps/FlipHoriz
+usr/X11R6/include/X11/bitmaps/FlipVert
+usr/X11R6/include/X11/bitmaps/Fold
+usr/X11R6/include/X11/bitmaps/Left
+usr/X11R6/include/X11/bitmaps/Right
+usr/X11R6/include/X11/bitmaps/RotateLeft
+usr/X11R6/include/X11/bitmaps/RotateRight
+usr/X11R6/include/X11/bitmaps/Stipple
+usr/X11R6/include/X11/bitmaps/Term
+usr/X11R6/include/X11/bitmaps/Up
+usr/X11R6/include/X11/bitmaps/black
+usr/X11R6/include/X11/bitmaps/black6
+usr/X11R6/include/X11/bitmaps/box6
+usr/X11R6/include/X11/bitmaps/boxes
+usr/X11R6/include/X11/bitmaps/calculator
+usr/X11R6/include/X11/bitmaps/card.xbm
+usr/X11R6/include/X11/bitmaps/cntr_ptr
+usr/X11R6/include/X11/bitmaps/cntr_ptrmsk
+usr/X11R6/include/X11/bitmaps/cross_weave
+usr/X11R6/include/X11/bitmaps/dimple1
+usr/X11R6/include/X11/bitmaps/dimple3
+usr/X11R6/include/X11/bitmaps/dot
+usr/X11R6/include/X11/bitmaps/down.xbm
+usr/X11R6/include/X11/bitmaps/dropbar7
+usr/X11R6/include/X11/bitmaps/dropbar8
+usr/X11R6/include/X11/bitmaps/escherknot
+usr/X11R6/include/X11/bitmaps/flagdown
+usr/X11R6/include/X11/bitmaps/flagup
+usr/X11R6/include/X11/bitmaps/flipped_gray
+usr/X11R6/include/X11/bitmaps/gray
+usr/X11R6/include/X11/bitmaps/gray1
+usr/X11R6/include/X11/bitmaps/gray3
+usr/X11R6/include/X11/bitmaps/grid16
+usr/X11R6/include/X11/bitmaps/grid2
+usr/X11R6/include/X11/bitmaps/grid4
+usr/X11R6/include/X11/bitmaps/grid8
+usr/X11R6/include/X11/bitmaps/hlines2
+usr/X11R6/include/X11/bitmaps/hlines3
+usr/X11R6/include/X11/bitmaps/icon
+usr/X11R6/include/X11/bitmaps/keyboard.xbm
+usr/X11R6/include/X11/bitmaps/keyboard16
+usr/X11R6/include/X11/bitmaps/ldblarrow
+usr/X11R6/include/X11/bitmaps/left.xbm
+usr/X11R6/include/X11/bitmaps/left_ptr
+usr/X11R6/include/X11/bitmaps/left_ptrmsk
+usr/X11R6/include/X11/bitmaps/letters
+usr/X11R6/include/X11/bitmaps/light_gray
+usr/X11R6/include/X11/bitmaps/mailempty
+usr/X11R6/include/X11/bitmaps/mailemptymsk
+usr/X11R6/include/X11/bitmaps/mailfull
+usr/X11R6/include/X11/bitmaps/mailfullmsk
+usr/X11R6/include/X11/bitmaps/mensetmanus
+usr/X11R6/include/X11/bitmaps/menu10
+usr/X11R6/include/X11/bitmaps/menu12
+usr/X11R6/include/X11/bitmaps/menu16
+usr/X11R6/include/X11/bitmaps/menu6
+usr/X11R6/include/X11/bitmaps/menu8
+usr/X11R6/include/X11/bitmaps/monitor.xbm
+usr/X11R6/include/X11/bitmaps/mouse.xbm
+usr/X11R6/include/X11/bitmaps/narrower.xbm
+usr/X11R6/include/X11/bitmaps/noletters
+usr/X11R6/include/X11/bitmaps/opendot
+usr/X11R6/include/X11/bitmaps/opendotMask
+usr/X11R6/include/X11/bitmaps/plaid
+usr/X11R6/include/X11/bitmaps/rdblarrow
+usr/X11R6/include/X11/bitmaps/right.xbm
+usr/X11R6/include/X11/bitmaps/right_ptr
+usr/X11R6/include/X11/bitmaps/right_ptrmsk
+usr/X11R6/include/X11/bitmaps/root_weave
+usr/X11R6/include/X11/bitmaps/scales
+usr/X11R6/include/X11/bitmaps/shorter.xbm
+usr/X11R6/include/X11/bitmaps/sipb
+usr/X11R6/include/X11/bitmaps/star
+usr/X11R6/include/X11/bitmaps/starMask
+usr/X11R6/include/X11/bitmaps/stipple
+usr/X11R6/include/X11/bitmaps/taller.xbm
+usr/X11R6/include/X11/bitmaps/target
+usr/X11R6/include/X11/bitmaps/terminal
+usr/X11R6/include/X11/bitmaps/tie_fighter
+usr/X11R6/include/X11/bitmaps/up.xbm
+usr/X11R6/include/X11/bitmaps/vlines2
+usr/X11R6/include/X11/bitmaps/vlines3
+usr/X11R6/include/X11/bitmaps/weird_size
+usr/X11R6/include/X11/bitmaps/wide_weave
+usr/X11R6/include/X11/bitmaps/wider.xbm
+usr/X11R6/include/X11/bitmaps/wingdogs
+usr/X11R6/include/X11/bitmaps/woman
+usr/X11R6/include/X11/bitmaps/xfd_icon
+usr/X11R6/include/X11/bitmaps/xlogo11
+usr/X11R6/include/X11/bitmaps/xlogo16
+usr/X11R6/include/X11/bitmaps/xlogo32
+usr/X11R6/include/X11/bitmaps/xlogo64
+usr/X11R6/include/X11/bitmaps/xsnow
+usr/X11R6/include/X11/pixmaps/card.xpm
+usr/X11R6/include/X11/pixmaps/computer.xpm
+usr/X11R6/include/X11/pixmaps/keyboard.xpm
+usr/X11R6/include/X11/pixmaps/monitor.xpm
+usr/X11R6/include/X11/pixmaps/mouse.xpm
+usr/X11R6/lib/X11/XErrorDB
+usr/X11R6/lib/X11/XKeysymDB
+usr/X11R6/lib/X11/locale/C/XI18N_OBJS
+usr/X11R6/lib/X11/locale/C/XLC_LOCALE
+usr/X11R6/lib/X11/locale/armscii-8/Compose
+usr/X11R6/lib/X11/locale/armscii-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/armscii-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/compose.dir
+usr/X11R6/lib/X11/locale/el_GR.UTF-8/Compose
+usr/X11R6/lib/X11/locale/en_US.UTF-8/Compose
+usr/X11R6/lib/X11/locale/en_US.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/en_US.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/georgian-academy/Compose
+usr/X11R6/lib/X11/locale/georgian-academy/XI18N_OBJS
+usr/X11R6/lib/X11/locale/georgian-academy/XLC_LOCALE
+usr/X11R6/lib/X11/locale/georgian-ps/Compose
+usr/X11R6/lib/X11/locale/georgian-ps/XI18N_OBJS
+usr/X11R6/lib/X11/locale/georgian-ps/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ibm-cp1133/Compose
+usr/X11R6/lib/X11/locale/ibm-cp1133/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ibm-cp1133/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iscii-dev/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iscii-dev/XLC_LOCALE
+usr/X11R6/lib/X11/locale/isiri-3342/XI18N_OBJS
+usr/X11R6/lib/X11/locale/isiri-3342/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-1/Compose
+usr/X11R6/lib/X11/locale/iso8859-1/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-1/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-10/Compose
+usr/X11R6/lib/X11/locale/iso8859-10/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-10/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-11/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-11/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-13/Compose
+usr/X11R6/lib/X11/locale/iso8859-13/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-13/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-14/Compose
+usr/X11R6/lib/X11/locale/iso8859-14/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-14/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-15/Compose
+usr/X11R6/lib/X11/locale/iso8859-15/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-15/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-2/Compose
+usr/X11R6/lib/X11/locale/iso8859-2/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-2/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-3/Compose
+usr/X11R6/lib/X11/locale/iso8859-3/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-3/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-4/Compose
+usr/X11R6/lib/X11/locale/iso8859-4/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-4/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-5/Compose
+usr/X11R6/lib/X11/locale/iso8859-5/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-5/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-6/Compose
+usr/X11R6/lib/X11/locale/iso8859-6/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-6/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-7/Compose
+usr/X11R6/lib/X11/locale/iso8859-7/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-7/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-8/Compose
+usr/X11R6/lib/X11/locale/iso8859-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-9/Compose
+usr/X11R6/lib/X11/locale/iso8859-9/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-9/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-9e/Compose
+usr/X11R6/lib/X11/locale/iso8859-9e/XI18N_OBJS
+usr/X11R6/lib/X11/locale/iso8859-9e/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ja.JIS/Compose
+usr/X11R6/lib/X11/locale/ja.JIS/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ja.JIS/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ja.SJIS/Compose
+usr/X11R6/lib/X11/locale/ja.SJIS/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ja.SJIS/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ja/Compose
+usr/X11R6/lib/X11/locale/ja/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ja/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ko/Compose
+usr/X11R6/lib/X11/locale/ko/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ko/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/koi8-c/Compose
+usr/X11R6/lib/X11/locale/koi8-c/XI18N_OBJS
+usr/X11R6/lib/X11/locale/koi8-c/XLC_LOCALE
+usr/X11R6/lib/X11/locale/koi8-r/Compose
+usr/X11R6/lib/X11/locale/koi8-r/XI18N_OBJS
+usr/X11R6/lib/X11/locale/koi8-r/XLC_LOCALE
+usr/X11R6/lib/X11/locale/koi8-u/Compose
+usr/X11R6/lib/X11/locale/koi8-u/XI18N_OBJS
+usr/X11R6/lib/X11/locale/koi8-u/XLC_LOCALE
+usr/X11R6/lib/X11/locale/locale.alias
+usr/X11R6/lib/X11/locale/locale.dir
+usr/X11R6/lib/X11/locale/microsoft-cp1251/XI18N_OBJS
+usr/X11R6/lib/X11/locale/microsoft-cp1251/XLC_LOCALE
+usr/X11R6/lib/X11/locale/microsoft-cp1255/XI18N_OBJS
+usr/X11R6/lib/X11/locale/microsoft-cp1255/XLC_LOCALE
+usr/X11R6/lib/X11/locale/microsoft-cp1256/XI18N_OBJS
+usr/X11R6/lib/X11/locale/microsoft-cp1256/XLC_LOCALE
+usr/X11R6/lib/X11/locale/mulelao-1/Compose
+usr/X11R6/lib/X11/locale/mulelao-1/XI18N_OBJS
+usr/X11R6/lib/X11/locale/mulelao-1/XLC_LOCALE
+usr/X11R6/lib/X11/locale/nokhchi-1/XI18N_OBJS
+usr/X11R6/lib/X11/locale/nokhchi-1/XLC_LOCALE
+usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
+usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
+usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
+usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/th_TH/XI18N_OBJS
+usr/X11R6/lib/X11/locale/th_TH/XLC_LOCALE
+usr/X11R6/lib/X11/locale/tscii-0/XI18N_OBJS
+usr/X11R6/lib/X11/locale/tscii-0/XLC_LOCALE
+usr/X11R6/lib/X11/locale/vi_VN.tcvn/Compose
+usr/X11R6/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
+usr/X11R6/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
+usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
+usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
+usr/X11R6/lib/X11/locale/vi_VN.viscii/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.big5/XLC_LOCALE
+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
+usr/X11R6/lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_TW.big5/Compose
+usr/X11R6/lib/X11/locale/zh_TW.big5/XI18N_OBJS
+usr/X11R6/lib/X11/locale/zh_TW.big5/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_TW/Compose
+usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS
+usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE
Added: branches/4.3.0/sid/debian/xlibs-dbg.install.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/xlibs-dbg.install.hurd-i386 2003-10-22
05:16:55 UTC (rev 695)
+++ branches/4.3.0/sid/debian/xlibs-dbg.install.hurd-i386 2003-10-22
17:53:46 UTC (rev 696)
@@ -0,0 +1,21 @@
+usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2
+usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2
+usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2
+usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2
+usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2
+usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2
+usr/X11R6/lib/libICE.so.6.3
+usr/X11R6/lib/libSM.so.6.0
+usr/X11R6/lib/libX11.so.6.2
+usr/X11R6/lib/libXTrap.so.6.4
+usr/X11R6/lib/libXext.so.6.4
+usr/X11R6/lib/libXft.so.1.1
+usr/X11R6/lib/libXi.so.6.0
+usr/X11R6/lib/libXmu.so.6.2
+usr/X11R6/lib/libXmuu.so.1.0
+usr/X11R6/lib/libXp.so.6.2
+usr/X11R6/lib/libXpm.so.4.11
+usr/X11R6/lib/libXrandr.so.2.0
+usr/X11R6/lib/libXt.so.6.0
+usr/X11R6/lib/libXtst.so.6.1
+usr/X11R6/lib/libxrx.so.6.3
Added: branches/4.3.0/sid/debian/xterm.docs.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/xterm.docs.hurd-i386 2003-10-22 05:16:55 UTC
(rev 695)
+++ branches/4.3.0/sid/debian/xterm.docs.hurd-i386 2003-10-22 17:53:46 UTC
(rev 696)
@@ -0,0 +1,4 @@
+debian/tmp/usr/X11R6/lib/X11/doc/PostScript/ctlseqs.ps
+debian/tmp/usr/X11R6/lib/X11/doc/ctlseqs.txt
+debian/tmp/usr/X11R6/lib/X11/etc/xterm.termcap
+debian/tmp/usr/X11R6/lib/X11/etc/xterm.terminfo
