debian/*: Adopt from official Debian package where appropriate.

22 files changed, 1921 insertions, 4030 deletions

diff --git a/debian/control b/debian/control
index e8b9fd906..0ab6dffe3 100644
--- a/debian/control
+++ b/debian/control
@@ -69,10 +69,10 @@ Package: libnx-x11-6
 Architecture: any
 Multi-Arch: same
 Depends:
+ libx11-data,
  libxcomp3 (= ${binary:Version}),
  nx-x11-common (<< ${source:Version}.1),
  nx-x11-common (>= ${source:Version}),
- libx11-data,
  ${misc:Depends},
  ${shlibs:Depends}
 Breaks:
diff --git a/debian/copyright b/debian/copyright
index f6206283f..a8a0acdbb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -399,304 +399,304 @@ Comment:
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  DAMAGE.
 
-Files: nx-X11/extras/Mesa_6.4.2/include/GL/gl.h
- nx-X11/extras/Mesa_6.4.2/include/GL/osmesa.h
- nx-X11/extras/Mesa_6.4.2/include/GL/xmesa.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_context.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_context.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_import.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/acache.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/common/driverfuncs.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/common/driverfuncs.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/glxheader.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_api.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_buffer.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_dd.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_line.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_span.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_tri.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xmesaP.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapi.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapi.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glthread.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glthread.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/accum.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/accum.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_arrayelt.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_arrayelt.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_eval.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_loopback.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_loopback.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_noop.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_noop.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_validate.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_validate.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/attrib.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/attrib.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/blend.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/blend.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/bufferobj.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/bufferobj.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/buffers.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/buffers.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/clip.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/clip.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/colormac.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/colortab.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/colortab.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/config.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/context.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/context.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/convolve.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/convolve.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/dd.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/debug.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/debug.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/depth.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/depth.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/dispatch.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/dlist.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/dlist.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/drawpix.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/drawpix.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/enable.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/enable.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/enums.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/enums.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/eval.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/eval.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/execmem.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/extensions.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/extensions.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/fbobject.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/fbobject.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/feedback.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/feedback.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/fog.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/fog.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/framebuffer.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/framebuffer.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/get.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/getstring.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/hash.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/hash.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/hint.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/hint.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/histogram.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/histogram.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/image.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/image.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/light.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/light.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/lines.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/lines.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/macros.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/matrix.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/matrix.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/mtypes.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/occlude.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/occlude.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/pixel.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/pixel.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/points.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/points.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/polygon.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/polygon.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/rastpos.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/rastpos.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/renderbuffer.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/renderbuffer.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/state.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/state.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/stencil.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/stencil.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress_fxt1.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress_s3tc.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texenvprogram.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat_tmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/teximage.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/teximage.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texobj.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texobj.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstate.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstate.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstore.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstore.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/varray.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/varray.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/version.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt_tmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_clip_tmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_copy_tmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_clip.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_norm.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_util.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_xform.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_dotprod_tmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_eval.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_eval.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_matrix.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_matrix.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_norm_tmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_trans_tmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_translate.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_translate.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_vector.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_vector.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform_tmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/math/mathmod.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbfragparse.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbfragparse.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogparse.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogparse.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbvertparse.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbvertparse.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_mesa.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_mesa.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragparse.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragparse.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragprog.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvprogram.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvprogram.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertexec.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertexec.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertparse.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertparse.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertprog.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/program.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/program.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects_3dlabs.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects_3dlabs.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_assignment.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_assignment.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_conditional.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_conditional.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_constructor.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_constructor.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_typeinfo.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_typeinfo.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_compile.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_compile.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_execute.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_execute.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_preprocess.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_preprocess.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_storage.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_storage.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_utility.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_utility.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/traverse_wrap.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aaline.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aaline.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aalinetemp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatriangle.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatriangle.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatritemp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_accum.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_accum.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_alpha.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_alpha.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_bitmap.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_blend.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_blend.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_buffers.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_context.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_context.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_copypix.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_depth.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_depth.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_drawpix.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_drawpix.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_feedback.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_feedback.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_fog.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_fog.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_imaging.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_lines.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_lines.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_linetemp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_logic.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_logic.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_masking.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_masking.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_nvfragprog.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_nvfragprog.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pixeltex.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pixeltex.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_points.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_points.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pointtemp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_readpix.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_span.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_span.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_spantemp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_stencil.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_stencil.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texstore.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texture.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texture.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_triangle.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_triangle.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_trispan.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_tritemp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_zoom.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_zoom.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/swrast.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_context.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_context.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_triangle.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_triangle.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_tritmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/swrast_setup.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_api.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_api.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_import.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_import.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_context.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_context.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_pipeline.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_pipeline.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_loopback.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_playback.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram_sse.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_cliptmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_cull.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_fog.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_light.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_lighttmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_normals.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_points.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_program.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_render.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_rendertmp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_texgen.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_texmat.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_vertex.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_eval.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_exec.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/tnl.h
+Files: nx-X11/extras/Mesa/include/GL/gl.h
+ nx-X11/extras/Mesa/include/GL/osmesa.h
+ nx-X11/extras/Mesa/include/GL/xmesa.h
+ nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c
+ nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h
+ nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c
+ nx-X11/extras/Mesa/src/mesa/array_cache/acache.h
+ nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c
+ nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h
+ nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h
+ nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c
+ nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c
+ nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c
+ nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c
+ nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c
+ nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c
+ nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glapi.c
+ nx-X11/extras/Mesa/src/mesa/glapi/glapi.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glthread.c
+ nx-X11/extras/Mesa/src/mesa/glapi/glthread.h
+ nx-X11/extras/Mesa/src/mesa/main/accum.c
+ nx-X11/extras/Mesa/src/mesa/main/accum.h
+ nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c
+ nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h
+ nx-X11/extras/Mesa/src/mesa/main/api_eval.h
+ nx-X11/extras/Mesa/src/mesa/main/api_loopback.c
+ nx-X11/extras/Mesa/src/mesa/main/api_loopback.h
+ nx-X11/extras/Mesa/src/mesa/main/api_noop.c
+ nx-X11/extras/Mesa/src/mesa/main/api_noop.h
+ nx-X11/extras/Mesa/src/mesa/main/api_validate.c
+ nx-X11/extras/Mesa/src/mesa/main/api_validate.h
+ nx-X11/extras/Mesa/src/mesa/main/attrib.c
+ nx-X11/extras/Mesa/src/mesa/main/attrib.h
+ nx-X11/extras/Mesa/src/mesa/main/blend.c
+ nx-X11/extras/Mesa/src/mesa/main/blend.h
+ nx-X11/extras/Mesa/src/mesa/main/bufferobj.c
+ nx-X11/extras/Mesa/src/mesa/main/bufferobj.h
+ nx-X11/extras/Mesa/src/mesa/main/buffers.c
+ nx-X11/extras/Mesa/src/mesa/main/buffers.h
+ nx-X11/extras/Mesa/src/mesa/main/clip.c
+ nx-X11/extras/Mesa/src/mesa/main/clip.h
+ nx-X11/extras/Mesa/src/mesa/main/colormac.h
+ nx-X11/extras/Mesa/src/mesa/main/colortab.c
+ nx-X11/extras/Mesa/src/mesa/main/colortab.h
+ nx-X11/extras/Mesa/src/mesa/main/config.h
+ nx-X11/extras/Mesa/src/mesa/main/context.c
+ nx-X11/extras/Mesa/src/mesa/main/context.h
+ nx-X11/extras/Mesa/src/mesa/main/convolve.c
+ nx-X11/extras/Mesa/src/mesa/main/convolve.h
+ nx-X11/extras/Mesa/src/mesa/main/dd.h
+ nx-X11/extras/Mesa/src/mesa/main/debug.c
+ nx-X11/extras/Mesa/src/mesa/main/debug.h
+ nx-X11/extras/Mesa/src/mesa/main/depth.c
+ nx-X11/extras/Mesa/src/mesa/main/depth.h
+ nx-X11/extras/Mesa/src/mesa/main/dispatch.c
+ nx-X11/extras/Mesa/src/mesa/main/dlist.c
+ nx-X11/extras/Mesa/src/mesa/main/dlist.h
+ nx-X11/extras/Mesa/src/mesa/main/drawpix.c
+ nx-X11/extras/Mesa/src/mesa/main/drawpix.h
+ nx-X11/extras/Mesa/src/mesa/main/enable.c
+ nx-X11/extras/Mesa/src/mesa/main/enable.h
+ nx-X11/extras/Mesa/src/mesa/main/enums.c
+ nx-X11/extras/Mesa/src/mesa/main/enums.h
+ nx-X11/extras/Mesa/src/mesa/main/eval.c
+ nx-X11/extras/Mesa/src/mesa/main/eval.h
+ nx-X11/extras/Mesa/src/mesa/main/execmem.c
+ nx-X11/extras/Mesa/src/mesa/main/extensions.c
+ nx-X11/extras/Mesa/src/mesa/main/extensions.h
+ nx-X11/extras/Mesa/src/mesa/main/fbobject.c
+ nx-X11/extras/Mesa/src/mesa/main/fbobject.h
+ nx-X11/extras/Mesa/src/mesa/main/feedback.c
+ nx-X11/extras/Mesa/src/mesa/main/feedback.h
+ nx-X11/extras/Mesa/src/mesa/main/fog.c
+ nx-X11/extras/Mesa/src/mesa/main/fog.h
+ nx-X11/extras/Mesa/src/mesa/main/framebuffer.c
+ nx-X11/extras/Mesa/src/mesa/main/framebuffer.h
+ nx-X11/extras/Mesa/src/mesa/main/get.h
+ nx-X11/extras/Mesa/src/mesa/main/getstring.c
+ nx-X11/extras/Mesa/src/mesa/main/glheader.h
+ nx-X11/extras/Mesa/src/mesa/main/hash.c
+ nx-X11/extras/Mesa/src/mesa/main/hash.h
+ nx-X11/extras/Mesa/src/mesa/main/hint.c
+ nx-X11/extras/Mesa/src/mesa/main/hint.h
+ nx-X11/extras/Mesa/src/mesa/main/histogram.c
+ nx-X11/extras/Mesa/src/mesa/main/histogram.h
+ nx-X11/extras/Mesa/src/mesa/main/image.c
+ nx-X11/extras/Mesa/src/mesa/main/image.h
+ nx-X11/extras/Mesa/src/mesa/main/imports.c
+ nx-X11/extras/Mesa/src/mesa/main/imports.h
+ nx-X11/extras/Mesa/src/mesa/main/light.c
+ nx-X11/extras/Mesa/src/mesa/main/light.h
+ nx-X11/extras/Mesa/src/mesa/main/lines.c
+ nx-X11/extras/Mesa/src/mesa/main/lines.h
+ nx-X11/extras/Mesa/src/mesa/main/macros.h
+ nx-X11/extras/Mesa/src/mesa/main/matrix.c
+ nx-X11/extras/Mesa/src/mesa/main/matrix.h
+ nx-X11/extras/Mesa/src/mesa/main/mtypes.h
+ nx-X11/extras/Mesa/src/mesa/main/occlude.c
+ nx-X11/extras/Mesa/src/mesa/main/occlude.h
+ nx-X11/extras/Mesa/src/mesa/main/pixel.c
+ nx-X11/extras/Mesa/src/mesa/main/pixel.h
+ nx-X11/extras/Mesa/src/mesa/main/points.c
+ nx-X11/extras/Mesa/src/mesa/main/points.h
+ nx-X11/extras/Mesa/src/mesa/main/polygon.c
+ nx-X11/extras/Mesa/src/mesa/main/polygon.h
+ nx-X11/extras/Mesa/src/mesa/main/rastpos.c
+ nx-X11/extras/Mesa/src/mesa/main/rastpos.h
+ nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c
+ nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h
+ nx-X11/extras/Mesa/src/mesa/main/state.c
+ nx-X11/extras/Mesa/src/mesa/main/state.h
+ nx-X11/extras/Mesa/src/mesa/main/stencil.c
+ nx-X11/extras/Mesa/src/mesa/main/stencil.h
+ nx-X11/extras/Mesa/src/mesa/main/texcompress.c
+ nx-X11/extras/Mesa/src/mesa/main/texcompress.h
+ nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c
+ nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c
+ nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h
+ nx-X11/extras/Mesa/src/mesa/main/texformat.c
+ nx-X11/extras/Mesa/src/mesa/main/texformat.h
+ nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h
+ nx-X11/extras/Mesa/src/mesa/main/teximage.c
+ nx-X11/extras/Mesa/src/mesa/main/teximage.h
+ nx-X11/extras/Mesa/src/mesa/main/texobj.c
+ nx-X11/extras/Mesa/src/mesa/main/texobj.h
+ nx-X11/extras/Mesa/src/mesa/main/texstate.c
+ nx-X11/extras/Mesa/src/mesa/main/texstate.h
+ nx-X11/extras/Mesa/src/mesa/main/texstore.c
+ nx-X11/extras/Mesa/src/mesa/main/texstore.h
+ nx-X11/extras/Mesa/src/mesa/main/varray.c
+ nx-X11/extras/Mesa/src/mesa/main/varray.h
+ nx-X11/extras/Mesa/src/mesa/main/version.h
+ nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c
+ nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h
+ nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h
+ nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h
+ nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h
+ nx-X11/extras/Mesa/src/mesa/math/m_debug.h
+ nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c
+ nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c
+ nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h
+ nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c
+ nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h
+ nx-X11/extras/Mesa/src/mesa/math/m_eval.c
+ nx-X11/extras/Mesa/src/mesa/math/m_eval.h
+ nx-X11/extras/Mesa/src/mesa/math/m_matrix.c
+ nx-X11/extras/Mesa/src/mesa/math/m_matrix.h
+ nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h
+ nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h
+ nx-X11/extras/Mesa/src/mesa/math/m_translate.c
+ nx-X11/extras/Mesa/src/mesa/math/m_translate.h
+ nx-X11/extras/Mesa/src/mesa/math/m_vector.c
+ nx-X11/extras/Mesa/src/mesa/math/m_vector.h
+ nx-X11/extras/Mesa/src/mesa/math/m_xform.c
+ nx-X11/extras/Mesa/src/mesa/math/m_xform.h
+ nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h
+ nx-X11/extras/Mesa/src/mesa/math/mathmod.h
+ nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c
+ nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h
+ nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
+ nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h
+ nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c
+ nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h
+ nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c
+ nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h
+ nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c
+ nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h
+ nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c
+ nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h
+ nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c
+ nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h
+ nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h
+ nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c
+ nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h
+ nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c
+ nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h
+ nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c
+ nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h
+ nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h
+ nx-X11/extras/Mesa/src/mesa/shader/program.c
+ nx-X11/extras/Mesa/src/mesa/shader/program.h
+ nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c
+ nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h
+ nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c
+ nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c
+ nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_context.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_context.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_points.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_points.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_span.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_span.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h
+ nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h
+ nx-X11/extras/Mesa/src/mesa/swrast/swrast.h
+ nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c
+ nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h
+ nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c
+ nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h
+ nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h
+ nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_context.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_context.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c
+ nx-X11/extras/Mesa/src/mesa/tnl/tnl.h
 Copyright: 1999-2001, Brian Paul
   1999-2002, Brian Paul
   1999-2003, Brian Paul
@@ -1040,8 +1040,7 @@ Copyright: 2012, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
   2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-2+
 
-Files: nx-X11/extras/README.Mesa.patches
- nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
+Files: nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
  nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
  nx-X11/lib/nx-x11.pc.in
 Copyright:
@@ -1056,22 +1055,23 @@ Files: replace.sh
 Copyright: 2013, Jan Engelhardt <jengelh@inai.de>
 License: GPL-2+
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/get.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texrender.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/main/texrender.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram_syn.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_syn.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_common_builtin_gc.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_core_gc.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_core_gc_bin.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_shader_syn.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_version_syn.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_x86_gcc.S
+Files: nx-X11/extras/Mesa/src/mesa/main/get.c
+ nx-X11/extras/Mesa/src/mesa/main/texrender.c
+ nx-X11/extras/Mesa/src/mesa/main/texrender.h
+ nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h
+ nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
+ nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S
+ nx-X11/extras/Mesa/src/mesa/main/KNOWN_BUGS
 Copyright: *No copyright*
 License: Expat
 Comment:
@@ -1617,10 +1617,10 @@ Files: nx-X11/lib/src/xcms/HVC.c
 Copyright: 1990, 1991, Tektronix, Inc
 License: MIT~Tektronix~3-clause
 
-Files: nx-X11/extras/Mesa_6.4.2/include/GL/glext.h
- nx-X11/extras/Mesa_6.4.2/include/GL/glxext.h
- nx-X11/extras/Mesa_6.4.2/include/GL/internal/glcore.h
- nx-X11/extras/Mesa_6.4.2/src/glx/x11/compsize.c
+Files: nx-X11/extras/Mesa/include/GL/glext.h
+ nx-X11/extras/Mesa/include/GL/glxext.h
+ nx-X11/extras/Mesa/include/GL/internal/glcore.h
+ nx-X11/extras/Mesa/src/glx/x11/compsize.c
  nx-X11/include/GL/glx.h
  nx-X11/include/GL/glxmd.h
  nx-X11/include/GL/glxproto.h
@@ -2064,7 +2064,7 @@ Files: nx-X11/include/extensions/Xdbeproto.h
 Copyright: 1994-1995, Hewlett-Packard Company
 License: Expat~NoAdvert
 
-Files: nx-X11/extras/Mesa_6.4.2/include/GL/xmesa_xf86.h
+Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h
  nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c
  nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
  nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h
@@ -2072,12 +2072,12 @@ Files: nx-X11/extras/Mesa_6.4.2/include/GL/xmesa_xf86.h
 Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas
 License: Expat
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_api.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_api.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_api.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_api.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_generic.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_x86.c
+Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c
 Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas
   2004, Tungsten Graphics Inc., Cedar Park, Texas
 License: Expat
@@ -2126,10 +2126,10 @@ Copyright: 1991-1994, FUJITSU LIMITED
   1993, Digital Equipment Corporation
 License: MIT~X11
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex_generic.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex_sse.c
+Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c
 Copyright: 2003, Tungsten Graphics, inc
 License: Expat
 
@@ -2147,17 +2147,17 @@ Files: nx-X11/programs/Xserver/miext/cw/cw.c
 Copyright: 2004, Eric Anholt
 License: MIT~X11
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapitable.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapitemp.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glprocs.h
+Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h
 Copyright: 1999-2001, Brian Paul
   1999-2003, Brian Paul
   IBM Corporation 2004
 License: Expat
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/shader/atifragshader.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_atifragshader.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_atifragshader.h
+Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h
 Copyright: 1999-2003, David Airlie
   2004, David Airlie
 License: Expat
@@ -2270,10 +2270,10 @@ Comment:
  as Expat. Later contributions by FUJITSU LIMITED and Sony Corporation
  have been licensed under MIT~X11.
 
-Files: nx-X11/extras/Mesa_6.4.2/src/glx/x11/indirect_size.c
- nx-X11/extras/Mesa_6.4.2/src/glx/x11/indirect_size.h
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/dri/common/glcontextmodes.h
+Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c
+ nx-X11/extras/Mesa/src/glx/x11/indirect_size.h
+ nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+ nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h
 Copyright: 2003, IBM Corporation
   IBM Corporation 2004
 License: Expat
@@ -2294,8 +2294,8 @@ Copyright: 2000, The XFree86 Project, Inc.
   2001, The XFree86 Project, Inc.
 License: Expat~NoAdvert
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vp_build.c
- nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vp_build.h
+Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h
 Copyright: 2005, Tungsten Graphics
 License: Expat
 
@@ -2447,12 +2447,12 @@ Files: nx-X11/programs/Xserver/os/xprintf.c
 Copyright: 2004, Alexander Gottwald
 License: Expat
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapioffsets.h
+Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h
 Copyright: 1999-2001, Brian Paul
   IBM Corporation 2004,
 License: Expat
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/simple_list.h
+Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h
 Copyright: 1997, Keith Whitwell
   1999-2001, Brian Paul
 License: Expat
@@ -2492,7 +2492,7 @@ Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h
 Copyright: 1989-1995, GROUPE BULL
 License: Expat~NoAdvert
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/dispatch.h
+Files: nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h
 Copyright: 2005, IBM Corporation
 License: Expat
 
@@ -2507,7 +2507,7 @@ Comment:
  Later contributions by Oracle and/or its affiliates and Red Hat, Inc.
  have been licensed under Expat.
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/mm.h
+Files: nx-X11/extras/Mesa/src/mesa/main/mm.h
 Copyright: 1999, Keith Whitwell
 License: Expat
 
@@ -2552,11 +2552,11 @@ Files: nx-X11/programs/Xserver/composite/compositeext.h
 Copyright: 2009, NVIDIA Corporation
 License: Expat
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/texenvprogram.c
+Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c
 Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas
 License: Expat
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/mm.c
+Files: nx-X11/extras/Mesa/src/mesa/main/mm.c
 Copyright: 1999, Wittawat Yamwong
 License: Expat
 
@@ -2639,7 +2639,7 @@ Comment:
  Contributions by  Data General Corporation and OMRON Corporation have been
  licnsed under MIT~X11.
 
-Files: nx-X11/extras/Mesa_6.4.2/src/mesa/shader/atifragshader.h
+Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h
 Copyright: 2004, David Airlie
 License: Expat
 Comment:
@@ -2885,18 +2885,26 @@ Copyright: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3+
 
 Files: m4/nx-macros.m4
+ nx-X11/lib/m4/nx-macros.m4
+ nxcomp/m4/nx-macros.m4
+ nxcompshad/m4/nx-macros.m4
+ nxproxy/m4/nx-macros.m4
 Copyright: 2005, 2006, Oracle and/or its affiliates
   2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: Expat
 
 Files: m4/nx-xtrans.m4
+ nx-X11/lib/m4/nx-xtrans.m4
 Copyright: 2005, 2006, Oracle and/or its affiliates
 License: Expat
 
 Files: ChangeLog
  Makefile
- README.md
+ doc/README.NX-development
  VERSION
+ nxcomp/VERSION
+ nxcompshad/VERSION
+ nxproxy/VERSION
  doc/libNX_X11/symbols/libNX_X11::symbol-usage_internally.txt
  doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxagent.txt
  doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxcompext.txt
@@ -2957,7 +2965,7 @@ Comment:
  .
  Contributions by Daniel Stone have been licensed under MIT~X11.
 
-Files: nx-X11/extras/Mesa.patches_6.4.2/*
+Files: nx-X11/extras/Mesa.patches/*
 Copyright: 2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
   2017, Mihai Moldovan <ionic@ionic.de>
   2017, Ulrich Sibiller <uli42@gmx.de>
@@ -3003,11 +3011,6 @@ Copyright: 2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
   2015-2016, Mihai Moldovan <ionic@ionic.de>
 License: GPL-2 or GPL-2+ or GPL-3+ or Expat or Expat~NoAdvert or MIT~OpenGroup or MIT~X11 or MIT~Tektronix or MIT~Tektronix~3-clause or MIT~OldStyle or MIT~Adobe or MIT~VeryOldStyle~UniOfCalifornia or MIT~VeryOldStyle~NCD or MIT~ISC or SGI-1.1 or GLX-1.0 or Zlib or XFree86 or BSD-1-clause
 
-Files: nx-libs.spec
-Copyright: 2011-2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-  2015-2017, Mihai Moldovan <ionic@ionic.de>
-License: GPL-2 or GPL-2+ or GPL-3+ or Expat or Expat~NoAdvert or MIT~OpenGroup or MIT~X11 or MIT~Tektronix or MIT~Tektronix~3-clause or MIT~OldStyle or MIT~Adobe or MIT~VeryOldStyle~UniOfCalifornia or MIT~VeryOldStyle~NCD or MIT~ISC or SGI-1.1 or GLX-1.0 or Zlib or XFree86 or BSD-1-clause
-
 License: GPL-2
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the Free
diff --git a/debian/copyright.in b/debian/copyright.in
index 98dfbdc9b..e4237628d 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -4,13 +4,506 @@ Upstream-Contact: FIXME
 Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
+Files: nx-X11/include/DECkeysym.h
+ nx-X11/include/HPkeysym.h
+ nx-X11/include/X.h
+ nx-X11/include/XWDFile.h
+ nx-X11/include/Xalloca.h
+ nx-X11/include/Xauth.h
+ nx-X11/include/Xfuncproto.h
+ nx-X11/include/Xfuncs.h
+ nx-X11/include/Xmd.h
+ nx-X11/include/Xos.h
+ nx-X11/include/Xos_r.h
+ nx-X11/include/Xosdefs.h
+ nx-X11/include/Xproto.h
+ nx-X11/include/Xprotostr.h
+ nx-X11/include/Xthreads.h
+ nx-X11/include/Xwindows.h
+ nx-X11/include/Xwinsock.h
+ nx-X11/include/extensions/XI.h
+ nx-X11/include/extensions/XIproto.h
+ nx-X11/include/extensions/bigreqstr.h
+ nx-X11/include/extensions/security.h
+ nx-X11/include/extensions/securstr.h
+ nx-X11/include/extensions/sync.h
+ nx-X11/include/extensions/syncstr.h
+ nx-X11/include/extensions/xcmiscstr.h
+ nx-X11/include/extensions/xtestconst.h
+ nx-X11/include/extensions/xteststr.h
+ nx-X11/include/keysym.h
+ nx-X11/include/keysymdef.h
+ nx-X11/lib/include/X11/Xlib.h
+ nx-X11/lib/include/X11/Xlocale.h
+ nx-X11/lib/include/X11/Xregion.h
+ nx-X11/lib/include/X11/Xresource.h
+ nx-X11/lib/include/X11/Xutil.h
+ nx-X11/lib/include/X11/cursorfont.h
+ nx-X11/lib/modules/im/ximcp/imThaiFlt.c
+ nx-X11/lib/src/AllCells.c
+ nx-X11/lib/src/AllPlanes.c
+ nx-X11/lib/src/AllowEv.c
+ nx-X11/lib/src/AuDispose.c
+ nx-X11/lib/src/AuFileName.c
+ nx-X11/lib/src/AuGetBest.c
+ nx-X11/lib/src/AuRead.c
+ nx-X11/lib/src/AutoRep.c
+ nx-X11/lib/src/Backgnd.c
+ nx-X11/lib/src/BdrWidth.c
+ nx-X11/lib/src/Bell.c
+ nx-X11/lib/src/Border.c
+ nx-X11/lib/src/ChAccCon.c
+ nx-X11/lib/src/ChActPGb.c
+ nx-X11/lib/src/ChClMode.c
+ nx-X11/lib/src/ChCmap.c
+ nx-X11/lib/src/ChGC.c
+ nx-X11/lib/src/ChKeyCon.c
+ nx-X11/lib/src/ChPntCon.c
+ nx-X11/lib/src/ChProp.c
+ nx-X11/lib/src/ChSaveSet.c
+ nx-X11/lib/src/ChWAttrs.c
+ nx-X11/lib/src/ChWindow.c
+ nx-X11/lib/src/ChkIfEv.c
+ nx-X11/lib/src/ChkMaskEv.c
+ nx-X11/lib/src/ChkTypEv.c
+ nx-X11/lib/src/ChkTypWEv.c
+ nx-X11/lib/src/ChkWinEv.c
+ nx-X11/lib/src/CirWin.c
+ nx-X11/lib/src/CirWinDn.c
+ nx-X11/lib/src/CirWinUp.c
+ nx-X11/lib/src/ClDisplay.c
+ nx-X11/lib/src/Clear.c
+ nx-X11/lib/src/ClearArea.c
+ nx-X11/lib/src/ConfWind.c
+ nx-X11/lib/src/ConvSel.c
+ nx-X11/lib/src/CopyArea.c
+ nx-X11/lib/src/CopyCmap.c
+ nx-X11/lib/src/CopyGC.c
+ nx-X11/lib/src/CopyPlane.c
+ nx-X11/lib/src/CrBFData.c
+ nx-X11/lib/src/CrCmap.c
+ nx-X11/lib/src/CrCursor.c
+ nx-X11/lib/src/CrGC.c
+ nx-X11/lib/src/CrGlCur.c
+ nx-X11/lib/src/CrPFBData.c
+ nx-X11/lib/src/CrPixmap.c
+ nx-X11/lib/src/CrWindow.c
+ nx-X11/lib/src/Cursor.c
+ nx-X11/lib/src/DefCursor.c
+ nx-X11/lib/src/DelProp.c
+ nx-X11/lib/src/Depths.c
+ nx-X11/lib/src/DestSubs.c
+ nx-X11/lib/src/DestWind.c
+ nx-X11/lib/src/DisName.c
+ nx-X11/lib/src/DrArc.c
+ nx-X11/lib/src/DrArcs.c
+ nx-X11/lib/src/DrLine.c
+ nx-X11/lib/src/DrLines.c
+ nx-X11/lib/src/DrPoint.c
+ nx-X11/lib/src/DrPoints.c
+ nx-X11/lib/src/DrRect.c
+ nx-X11/lib/src/DrRects.c
+ nx-X11/lib/src/DrSegs.c
+ nx-X11/lib/src/ErrDes.c
+ nx-X11/lib/src/ErrHndlr.c
+ nx-X11/lib/src/EvToWire.c
+ nx-X11/lib/src/FSSaver.c
+ nx-X11/lib/src/FetchName.c
+ nx-X11/lib/src/FillArc.c
+ nx-X11/lib/src/FillArcs.c
+ nx-X11/lib/src/FillPoly.c
+ nx-X11/lib/src/FillRct.c
+ nx-X11/lib/src/FillRcts.c
+ nx-X11/lib/src/Flush.c
+ nx-X11/lib/src/FontInfo.c
+ nx-X11/lib/src/FontNames.c
+ nx-X11/lib/src/FreeCmap.c
+ nx-X11/lib/src/FreeCols.c
+ nx-X11/lib/src/FreeCurs.c
+ nx-X11/lib/src/FreeEData.c
+ nx-X11/lib/src/FreeGC.c
+ nx-X11/lib/src/FreePix.c
+ nx-X11/lib/src/GCMisc.c
+ nx-X11/lib/src/Geom.c
+ nx-X11/lib/src/GetAtomNm.c
+ nx-X11/lib/src/GetColor.c
+ nx-X11/lib/src/GetDflt.c
+ nx-X11/lib/src/GetFPath.c
+ nx-X11/lib/src/GetFProp.c
+ nx-X11/lib/src/GetGCVals.c
+ nx-X11/lib/src/GetGeom.c
+ nx-X11/lib/src/GetHColor.c
+ nx-X11/lib/src/GetHints.c
+ nx-X11/lib/src/GetIFocus.c
+ nx-X11/lib/src/GetImage.c
+ nx-X11/lib/src/GetKCnt.c
+ nx-X11/lib/src/GetMoEv.c
+ nx-X11/lib/src/GetPCnt.c
+ nx-X11/lib/src/GetPntMap.c
+ nx-X11/lib/src/GetProp.c
+ nx-X11/lib/src/GetRGBCMap.c
+ nx-X11/lib/src/GetSOwner.c
+ nx-X11/lib/src/GetSSaver.c
+ nx-X11/lib/src/GetStCmap.c
+ nx-X11/lib/src/GetWAttrs.c
+ nx-X11/lib/src/GetWMCMapW.c
+ nx-X11/lib/src/GetWMProto.c
+ nx-X11/lib/src/GrButton.c
+ nx-X11/lib/src/GrKey.c
+ nx-X11/lib/src/GrKeybd.c
+ nx-X11/lib/src/GrPointer.c
+ nx-X11/lib/src/GrServer.c
+ nx-X11/lib/src/IfEvent.c
+ nx-X11/lib/src/ImText.c
+ nx-X11/lib/src/ImText16.c
+ nx-X11/lib/src/ImUtil.c
+ nx-X11/lib/src/InitExt.c
+ nx-X11/lib/src/InsCmap.c
+ nx-X11/lib/src/IntAtom.c
+ nx-X11/lib/src/KeyBind.c
+ nx-X11/lib/src/KeysymStr.c
+ nx-X11/lib/src/KillCl.c
+ nx-X11/lib/src/LiICmaps.c
+ nx-X11/lib/src/LiProps.c
+ nx-X11/lib/src/ListExt.c
+ nx-X11/lib/src/LoadFont.c
+ nx-X11/lib/src/LockDis.c
+ nx-X11/lib/src/LookupCol.c
+ nx-X11/lib/src/LowerWin.c
+ nx-X11/lib/src/Macros.c
+ nx-X11/lib/src/MapRaised.c
+ nx-X11/lib/src/MapSubs.c
+ nx-X11/lib/src/MapWindow.c
+ nx-X11/lib/src/MaskEvent.c
+ nx-X11/lib/src/Misc.c
+ nx-X11/lib/src/ModMap.c
+ nx-X11/lib/src/MoveWin.c
+ nx-X11/lib/src/NextEvent.c
+ nx-X11/lib/src/ParseCmd.c
+ nx-X11/lib/src/ParseCol.c
+ nx-X11/lib/src/ParseGeom.c
+ nx-X11/lib/src/PeekEvent.c
+ nx-X11/lib/src/PeekIfEv.c
+ nx-X11/lib/src/Pending.c
+ nx-X11/lib/src/PixFormats.c
+ nx-X11/lib/src/PmapBgnd.c
+ nx-X11/lib/src/PmapBord.c
+ nx-X11/lib/src/PolyReg.c
+ nx-X11/lib/src/PolyTxt.c
+ nx-X11/lib/src/PolyTxt16.c
+ nx-X11/lib/src/PropAlloc.c
+ nx-X11/lib/src/PutBEvent.c
+ nx-X11/lib/src/PutImage.c
+ nx-X11/lib/src/QuBest.c
+ nx-X11/lib/src/QuColor.c
+ nx-X11/lib/src/QuColors.c
+ nx-X11/lib/src/QuCurShp.c
+ nx-X11/lib/src/QuExt.c
+ nx-X11/lib/src/QuKeybd.c
+ nx-X11/lib/src/QuPntr.c
+ nx-X11/lib/src/QuStipShp.c
+ nx-X11/lib/src/QuTextE16.c
+ nx-X11/lib/src/QuTextExt.c
+ nx-X11/lib/src/QuTileShp.c
+ nx-X11/lib/src/QuTree.c
+ nx-X11/lib/src/RaiseWin.c
+ nx-X11/lib/src/RdBitF.c
+ nx-X11/lib/src/RecolorC.c
+ nx-X11/lib/src/ReconfWM.c
+ nx-X11/lib/src/ReconfWin.c
+ nx-X11/lib/src/Region.c
+ nx-X11/lib/src/RepWindow.c
+ nx-X11/lib/src/RestackWs.c
+ nx-X11/lib/src/RotProp.c
+ nx-X11/lib/src/ScrResStr.c
+ nx-X11/lib/src/SelInput.c
+ nx-X11/lib/src/SendEvent.c
+ nx-X11/lib/src/SetBack.c
+ nx-X11/lib/src/SetCRects.c
+ nx-X11/lib/src/SetClMask.c
+ nx-X11/lib/src/SetClOrig.c
+ nx-X11/lib/src/SetDashes.c
+ nx-X11/lib/src/SetFPath.c
+ nx-X11/lib/src/SetFont.c
+ nx-X11/lib/src/SetFore.c
+ nx-X11/lib/src/SetFunc.c
+ nx-X11/lib/src/SetHints.c
+ nx-X11/lib/src/SetIFocus.c
+ nx-X11/lib/src/SetLStyle.c
+ nx-X11/lib/src/SetPMask.c
+ nx-X11/lib/src/SetPntMap.c
+ nx-X11/lib/src/SetRGBCMap.c
+ nx-X11/lib/src/SetSOwner.c
+ nx-X11/lib/src/SetSSaver.c
+ nx-X11/lib/src/SetStCmap.c
+ nx-X11/lib/src/SetState.c
+ nx-X11/lib/src/SetStip.c
+ nx-X11/lib/src/SetTSOrig.c
+ nx-X11/lib/src/SetTile.c
+ nx-X11/lib/src/SetWMCMapW.c
+ nx-X11/lib/src/SetWMProto.c
+ nx-X11/lib/src/StBytes.c
+ nx-X11/lib/src/StColor.c
+ nx-X11/lib/src/StColors.c
+ nx-X11/lib/src/StNColor.c
+ nx-X11/lib/src/StName.c
+ nx-X11/lib/src/StrKeysym.c
+ nx-X11/lib/src/StrToText.c
+ nx-X11/lib/src/Sync.c
+ nx-X11/lib/src/Synchro.c
+ nx-X11/lib/src/Text.c
+ nx-X11/lib/src/Text16.c
+ nx-X11/lib/src/TextExt.c
+ nx-X11/lib/src/TextExt16.c
+ nx-X11/lib/src/TextToStr.c
+ nx-X11/lib/src/TrCoords.c
+ nx-X11/lib/src/UndefCurs.c
+ nx-X11/lib/src/UngrabBut.c
+ nx-X11/lib/src/UngrabKbd.c
+ nx-X11/lib/src/UngrabKey.c
+ nx-X11/lib/src/UngrabPtr.c
+ nx-X11/lib/src/UngrabSvr.c
+ nx-X11/lib/src/UninsCmap.c
+ nx-X11/lib/src/UnldFont.c
+ nx-X11/lib/src/UnmapSubs.c
+ nx-X11/lib/src/UnmapWin.c
+ nx-X11/lib/src/VisUtil.c
+ nx-X11/lib/src/WMGeom.c
+ nx-X11/lib/src/WMProps.c
+ nx-X11/lib/src/WarpPtr.c
+ nx-X11/lib/src/WinEvent.c
+ nx-X11/lib/src/Window.c
+ nx-X11/lib/src/WrBitF.c
+ nx-X11/lib/src/XErrorDB
+ nx-X11/lib/src/Xatomtype.h
+ nx-X11/lib/src/evtomask.c
+ nx-X11/lib/src/globals.c
+ nx-X11/lib/src/locking.c
+ nx-X11/lib/src/locking.h
+ nx-X11/lib/src/pathmax.h
+ nx-X11/lib/src/poly.h
+ nx-X11/lib/src/util/makekeys.c
+ nx-X11/lib/src/xcms/cmsMath.c
+ nx-X11/lib/src/xkb/XKBBind.c
+ nx-X11/lib/src/xkb/XKBCvt.c
+ nx-X11/lib/src/xlibi18n/XimThai.h
+ nx-X11/lib/src/xlibi18n/mbWMProps.c
+ nx-X11/programs/Xserver/Xext/bigreq.c
+ nx-X11/programs/Xserver/Xext/shape.c
+ nx-X11/programs/Xserver/Xext/shm.c
+ nx-X11/programs/Xserver/Xext/sleepuntil.c
+ nx-X11/programs/Xserver/Xext/xcmisc.c
+ nx-X11/programs/Xserver/Xext/xtest.c
+ nx-X11/programs/Xserver/Xi/allowev.c
+ nx-X11/programs/Xserver/Xi/chgdctl.c
+ nx-X11/programs/Xserver/Xi/chgfctl.c
+ nx-X11/programs/Xserver/Xi/chgkbd.c
+ nx-X11/programs/Xserver/Xi/chgkmap.c
+ nx-X11/programs/Xserver/Xi/chgprop.c
+ nx-X11/programs/Xserver/Xi/chgptr.c
+ nx-X11/programs/Xserver/Xi/closedev.c
+ nx-X11/programs/Xserver/Xi/devbell.c
+ nx-X11/programs/Xserver/Xi/exevents.c
+ nx-X11/programs/Xserver/Xi/extinit.c
+ nx-X11/programs/Xserver/Xi/getbmap.c
+ nx-X11/programs/Xserver/Xi/getdctl.c
+ nx-X11/programs/Xserver/Xi/getfctl.c
+ nx-X11/programs/Xserver/Xi/getfocus.c
+ nx-X11/programs/Xserver/Xi/getkmap.c
+ nx-X11/programs/Xserver/Xi/getmmap.c
+ nx-X11/programs/Xserver/Xi/getprop.c
+ nx-X11/programs/Xserver/Xi/getselev.c
+ nx-X11/programs/Xserver/Xi/getvers.c
+ nx-X11/programs/Xserver/Xi/grabdev.c
+ nx-X11/programs/Xserver/Xi/grabdevb.c
+ nx-X11/programs/Xserver/Xi/grabdevk.c
+ nx-X11/programs/Xserver/Xi/gtmotion.c
+ nx-X11/programs/Xserver/Xi/listdev.c
+ nx-X11/programs/Xserver/Xi/opendev.c
+ nx-X11/programs/Xserver/Xi/queryst.c
+ nx-X11/programs/Xserver/Xi/selectev.c
+ nx-X11/programs/Xserver/Xi/sendexev.c
+ nx-X11/programs/Xserver/Xi/setbmap.c
+ nx-X11/programs/Xserver/Xi/setdval.c
+ nx-X11/programs/Xserver/Xi/setfocus.c
+ nx-X11/programs/Xserver/Xi/setmmap.c
+ nx-X11/programs/Xserver/Xi/setmode.c
+ nx-X11/programs/Xserver/Xi/stubs.c
+ nx-X11/programs/Xserver/Xi/ungrdev.c
+ nx-X11/programs/Xserver/Xi/ungrdevb.c
+ nx-X11/programs/Xserver/Xi/ungrdevk.c
+ nx-X11/programs/Xserver/dix/atom.c
+ nx-X11/programs/Xserver/dix/colormap.c
+ nx-X11/programs/Xserver/dix/cursor.c
+ nx-X11/programs/Xserver/dix/devices.c
+ nx-X11/programs/Xserver/dix/dispatch.c
+ nx-X11/programs/Xserver/dix/dixutils.c
+ nx-X11/programs/Xserver/dix/events.c
+ nx-X11/programs/Xserver/dix/extension.c
+ nx-X11/programs/Xserver/dix/ffs.c
+ nx-X11/programs/Xserver/dix/gc.c
+ nx-X11/programs/Xserver/dix/globals.c
+ nx-X11/programs/Xserver/dix/glyphcurs.c
+ nx-X11/programs/Xserver/dix/grabs.c
+ nx-X11/programs/Xserver/dix/main.c
+ nx-X11/programs/Xserver/dix/pixmap.c
+ nx-X11/programs/Xserver/dix/privates.c
+ nx-X11/programs/Xserver/dix/property.c
+ nx-X11/programs/Xserver/dix/region.c
+ nx-X11/programs/Xserver/dix/resource.c
+ nx-X11/programs/Xserver/dix/swaprep.c
+ nx-X11/programs/Xserver/dix/swapreq.c
+ nx-X11/programs/Xserver/dix/tables.c
+ nx-X11/programs/Xserver/dix/window.c
+ nx-X11/programs/Xserver/dix/xpstubs.c
+ nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c
+ nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h
+ nx-X11/programs/Xserver/include/closestr.h
+ nx-X11/programs/Xserver/include/closure.h
+ nx-X11/programs/Xserver/include/colormap.h
+ nx-X11/programs/Xserver/include/colormapst.h
+ nx-X11/programs/Xserver/include/cursor.h
+ nx-X11/programs/Xserver/include/cursorstr.h
+ nx-X11/programs/Xserver/include/dix.h
+ nx-X11/programs/Xserver/include/extension.h
+ nx-X11/programs/Xserver/include/extnsionst.h
+ nx-X11/programs/Xserver/include/gc.h
+ nx-X11/programs/Xserver/include/gcstruct.h
+ nx-X11/programs/Xserver/include/input.h
+ nx-X11/programs/Xserver/include/inputstr.h
+ nx-X11/programs/Xserver/include/miscstruct.h
+ nx-X11/programs/Xserver/include/opaque.h
+ nx-X11/programs/Xserver/include/os.h
+ nx-X11/programs/Xserver/include/pixmap.h
+ nx-X11/programs/Xserver/include/pixmapstr.h
+ nx-X11/programs/Xserver/include/property.h
+ nx-X11/programs/Xserver/include/propertyst.h
+ nx-X11/programs/Xserver/include/region.h
+ nx-X11/programs/Xserver/include/regionstr.h
+ nx-X11/programs/Xserver/include/resource.h
+ nx-X11/programs/Xserver/include/rgb.h
+ nx-X11/programs/Xserver/include/screenint.h
+ nx-X11/programs/Xserver/include/scrnintstr.h
+ nx-X11/programs/Xserver/include/selection.h
+ nx-X11/programs/Xserver/include/servermd.h
+ nx-X11/programs/Xserver/include/site.h
+ nx-X11/programs/Xserver/include/validate.h
+ nx-X11/programs/Xserver/include/window.h
+ nx-X11/programs/Xserver/include/windowstr.h
+ nx-X11/programs/Xserver/mi/cbrt.c
+ nx-X11/programs/Xserver/mi/mi.h
+ nx-X11/programs/Xserver/mi/miarc.c
+ nx-X11/programs/Xserver/mi/mibitblt.c
+ nx-X11/programs/Xserver/mi/mibstorest.h
+ nx-X11/programs/Xserver/mi/miclipn.c
+ nx-X11/programs/Xserver/mi/micursor.c
+ nx-X11/programs/Xserver/mi/midash.c
+ nx-X11/programs/Xserver/mi/midispcur.c
+ nx-X11/programs/Xserver/mi/mieq.c
+ nx-X11/programs/Xserver/mi/miexpose.c
+ nx-X11/programs/Xserver/mi/mifillarc.c
+ nx-X11/programs/Xserver/mi/mifillarc.h
+ nx-X11/programs/Xserver/mi/mifillrct.c
+ nx-X11/programs/Xserver/mi/mifpoly.h
+ nx-X11/programs/Xserver/mi/mifpolycon.c
+ nx-X11/programs/Xserver/mi/migc.c
+ nx-X11/programs/Xserver/mi/migc.h
+ nx-X11/programs/Xserver/mi/miglblt.c
+ nx-X11/programs/Xserver/mi/miinitext.c
+ nx-X11/programs/Xserver/mi/miline.h
+ nx-X11/programs/Xserver/mi/mipointer.c
+ nx-X11/programs/Xserver/mi/mipointer.h
+ nx-X11/programs/Xserver/mi/mipointrst.h
+ nx-X11/programs/Xserver/mi/mipoly.c
+ nx-X11/programs/Xserver/mi/mipoly.h
+ nx-X11/programs/Xserver/mi/mipolycon.c
+ nx-X11/programs/Xserver/mi/mipolygen.c
+ nx-X11/programs/Xserver/mi/mipolypnt.c
+ nx-X11/programs/Xserver/mi/mipolyrect.c
+ nx-X11/programs/Xserver/mi/mipolyseg.c
+ nx-X11/programs/Xserver/mi/mipolytext.c
+ nx-X11/programs/Xserver/mi/mipolyutil.c
+ nx-X11/programs/Xserver/mi/mipushpxl.c
+ nx-X11/programs/Xserver/mi/miscanfill.h
+ nx-X11/programs/Xserver/mi/miscrinit.c
+ nx-X11/programs/Xserver/mi/mispans.c
+ nx-X11/programs/Xserver/mi/mispans.h
+ nx-X11/programs/Xserver/mi/misprite.c
+ nx-X11/programs/Xserver/mi/misprite.h
+ nx-X11/programs/Xserver/mi/mispritest.h
+ nx-X11/programs/Xserver/mi/mistruct.h
+ nx-X11/programs/Xserver/mi/mivalidate.h
+ nx-X11/programs/Xserver/mi/mivaltree.c
+ nx-X11/programs/Xserver/mi/miwideline.c
+ nx-X11/programs/Xserver/mi/miwideline.h
+ nx-X11/programs/Xserver/mi/miwindow.c
+ nx-X11/programs/Xserver/mi/mizerarc.c
+ nx-X11/programs/Xserver/mi/mizerarc.h
+ nx-X11/programs/Xserver/mi/mizerclip.c
+ nx-X11/programs/Xserver/mi/mizerline.c
+ nx-X11/programs/Xserver/os/connection.c
+ nx-X11/programs/Xserver/os/io.c
+ nx-X11/programs/Xserver/os/mitauth.c
+ nx-X11/programs/Xserver/os/oscolor.c
+ nx-X11/programs/Xserver/os/osdep.h
+ nx-X11/programs/Xserver/os/osinit.c
+ nx-X11/programs/Xserver/os/rpcauth.c
+ nx-X11/programs/Xserver/os/secauth.c
+ nx-X11/programs/Xserver/os/xdmauth.c
+ nx-X11/programs/Xserver/record/record.c
+ nx-X11/programs/Xserver/record/set.c
+ nx-X11/programs/Xserver/record/set.h
+ nxcompshad/src/X11/include/XTest_nxcompshad.h
+Copyright: 1985, 1987, 1990, 1998, The Open Group
+  1985, 1987, 1994, 1998, The Open Group
+  1985, 1987, 1998, The Open Group
+  1985, 1990, 1998, The Open Group
+  1985, 1998, The Open Group
+  1985-1986, 1998, The Open Group
+  1985-1987, 1991, 1998, The Open Group
+  1985-1987, 1998, The Open Group
+  1986, 1990, 1998, The Open Group
+  1986, 1998, The Open Group
+  1986-1987, 1998, The Open Group
+  1987, 1989, 1998, The Open Group
+  1987, 1994, 1998, The Open Group
+  1987, 1998, The Open Group
+  1987-1988, 1993, 1998, The Open Group
+  1987-1988, 1998, The Open Group
+  1987-1989, 1998, The Open Group
+  1988, 1998, The Open Group
+  1988-1989, 1998, The Open Group
+  1989, 1991, 1998, The Open Group
+  1989, 1998, The Open Group
+  1990, 1994, 1998, The Open Group
+  1990, 1998, The Open Group
+  1991, 1993-1994, 1998, The Open Group
+  1991, 1998, The Open Group
+  1992, 1998, The Open Group
+  1993, 1995, 1998, The Open Group
+  1993, 1998, The Open Group
+  1993-1994, 1998, The Open Group
+  1994, 1998, The Open Group
+  1995, 1998, The Open Group
+  1996, 1998, The Open Group
+  1998, The Open Group
+  2003, The Open Group
+License: UNKNOWN
+ FIXME
+
 Files: nx-X11/Imakefile
  nx-X11/config/cf/host.def
- nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
- nx-X11/lib/X11/Imakefile
+ nx-X11/lib/include/X11/Xlibint.h
+ nx-X11/lib/include/xtrans/Xtranssock.c
+ nx-X11/lib/src/ConnDis.c
+ nx-X11/lib/src/OpenDis.c
+ nx-X11/lib/src/XlibAsync.c
+ nx-X11/lib/src/XlibInt.c
  nx-X11/programs/Imakefile
+ nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h
  nx-X11/programs/Xserver/Imakefile
  nx-X11/programs/Xserver/Xext/Imakefile
+ nx-X11/programs/Xserver/Xext/security.c
  nx-X11/programs/Xserver/hw/nxagent/Atoms.c
  nx-X11/programs/Xserver/hw/nxagent/Atoms.h
  nx-X11/programs/Xserver/hw/nxagent/Binder.c
@@ -43,6 +536,18 @@ Files: nx-X11/Imakefile
  nx-X11/programs/Xserver/hw/nxagent/Literals.h
  nx-X11/programs/Xserver/hw/nxagent/Millis.c
  nx-X11/programs/Xserver/hw/nxagent/Millis.h
+ nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+ nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
+ nx-X11/programs/Xserver/hw/nxagent/NXevents.c
+ nx-X11/programs/Xserver/hw/nxagent/NXextension.c
+ nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
+ nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
+ nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
+ nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
+ nx-X11/programs/Xserver/hw/nxagent/NXresource.c
+ nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+ nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+ nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
  nx-X11/programs/Xserver/hw/nxagent/Options.c
  nx-X11/programs/Xserver/hw/nxagent/Options.h
  nx-X11/programs/Xserver/hw/nxagent/Pixels.c
@@ -54,7 +559,6 @@ Files: nx-X11/Imakefile
  nx-X11/programs/Xserver/hw/nxagent/Render.c
  nx-X11/programs/Xserver/hw/nxagent/Render.h
  nx-X11/programs/Xserver/hw/nxagent/Rootless.c
- nx-X11/programs/Xserver/hw/nxagent/Rootless.h
  nx-X11/programs/Xserver/hw/nxagent/Splash.c
  nx-X11/programs/Xserver/hw/nxagent/Splash.h
  nx-X11/programs/Xserver/hw/nxagent/Split.c
@@ -90,266 +594,263 @@ Files: nx-X11/Imakefile
  nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm
  nx-X11/programs/Xserver/hw/nxagent/screensaver
  nx-X11/programs/Xserver/mi/Imakefile
- nx-X11/programs/Xserver/os/Imakefile
+ nx-X11/programs/Xserver/os/WaitFor.c
+ nx-X11/programs/Xserver/os/auth.c
+ nx-X11/programs/Xserver/os/log.c
+ nx-X11/programs/Xserver/os/utils.c
  nx-X11/programs/Xserver/randr/Imakefile
- nxcomp/ActionCache.cpp
- nxcomp/ActionCache.h
- nxcomp/Agent.cpp
- nxcomp/Agent.h
- nxcomp/Alpha.cpp
- nxcomp/Alpha.h
- nxcomp/Auth.cpp
- nxcomp/Auth.h
- nxcomp/Bitmap.cpp
- nxcomp/Bitmap.h
- nxcomp/BlockCache.cpp
- nxcomp/BlockCache.h
- nxcomp/BlockCacheSet.cpp
- nxcomp/BlockCacheSet.h
- nxcomp/ChangeGC.cpp
- nxcomp/ChangeGC.h
- nxcomp/ChangeProperty.cpp
- nxcomp/ChangeProperty.h
- nxcomp/Channel.cpp
- nxcomp/Channel.h
- nxcomp/ChannelCache.cpp
- nxcomp/ChannelCache.h
- nxcomp/ChannelEndPoint.cpp
- nxcomp/ChannelEndPoint.h
- nxcomp/ChannelStore.h
- nxcomp/CharCache.cpp
- nxcomp/CharCache.h
- nxcomp/Children.cpp
- nxcomp/ClearArea.cpp
- nxcomp/ClearArea.h
- nxcomp/ClientCache.cpp
- nxcomp/ClientCache.h
- nxcomp/ClientChannel.cpp
- nxcomp/ClientChannel.h
- nxcomp/ClientProxy.cpp
- nxcomp/ClientProxy.h
- nxcomp/ClientReadBuffer.cpp
- nxcomp/ClientReadBuffer.h
- nxcomp/ClientStore.cpp
- nxcomp/ClientStore.h
- nxcomp/Colormap.cpp
- nxcomp/Colormap.h
- nxcomp/ConfigureWindow.cpp
- nxcomp/ConfigureWindow.h
- nxcomp/Control.cpp
- nxcomp/Control.h
- nxcomp/CopyArea.cpp
- nxcomp/CopyArea.h
- nxcomp/CreateGC.cpp
- nxcomp/CreateGC.h
- nxcomp/CreatePixmap.cpp
- nxcomp/CreatePixmap.h
- nxcomp/DecodeBuffer.cpp
- nxcomp/DecodeBuffer.h
- nxcomp/EncodeBuffer.cpp
- nxcomp/EncodeBuffer.h
- nxcomp/FillPoly.cpp
- nxcomp/FillPoly.h
- nxcomp/Fork.cpp
- nxcomp/Fork.h
- nxcomp/FreeCache.h
- nxcomp/GenericChannel.cpp
- nxcomp/GenericChannel.h
- nxcomp/GenericReadBuffer.cpp
- nxcomp/GenericReadBuffer.h
- nxcomp/GenericReply.cpp
- nxcomp/GenericReply.h
- nxcomp/GenericRequest.cpp
- nxcomp/GenericRequest.h
- nxcomp/GetImage.cpp
- nxcomp/GetImage.h
- nxcomp/GetImageReply.cpp
- nxcomp/GetImageReply.h
- nxcomp/GetProperty.cpp
- nxcomp/GetProperty.h
- nxcomp/GetPropertyReply.cpp
- nxcomp/GetPropertyReply.h
- nxcomp/ImageText16.cpp
- nxcomp/ImageText16.h
- nxcomp/ImageText8.cpp
- nxcomp/ImageText8.h
- nxcomp/IntCache.cpp
- nxcomp/IntCache.h
- nxcomp/InternAtom.cpp
- nxcomp/InternAtom.h
- nxcomp/Jpeg.cpp
- nxcomp/Jpeg.h
- nxcomp/Keeper.cpp
- nxcomp/Keeper.h
- nxcomp/List.cpp
- nxcomp/List.h
- nxcomp/ListFontsReply.cpp
- nxcomp/ListFontsReply.h
- nxcomp/Loop.cpp
- nxcomp/Makefile.in
- nxcomp/Message.cpp
- nxcomp/Message.h
- nxcomp/Misc.cpp
- nxcomp/Misc.h
- nxcomp/NX.h
- nxcomp/NXalert.h
- nxcomp/NXmitshm.h
- nxcomp/NXpack.h
- nxcomp/NXproto.h
- nxcomp/NXrender.h
- nxcomp/NXvars.h
- nxcomp/OpcodeCache.h
- nxcomp/OpcodeStore.cpp
- nxcomp/OpcodeStore.h
- nxcomp/Pack.c
- nxcomp/Pgn.cpp
- nxcomp/Pgn.h
- nxcomp/Pipe.cpp
- nxcomp/Pipe.h
- nxcomp/PolyArc.cpp
- nxcomp/PolyArc.h
- nxcomp/PolyFillArc.cpp
- nxcomp/PolyFillArc.h
- nxcomp/PolyFillRectangle.cpp
- nxcomp/PolyFillRectangle.h
- nxcomp/PolyLine.cpp
- nxcomp/PolyLine.h
- nxcomp/PolyPoint.cpp
- nxcomp/PolyPoint.h
- nxcomp/PolySegment.cpp
- nxcomp/PolySegment.h
- nxcomp/PolyText16.cpp
- nxcomp/PolyText16.h
- nxcomp/PolyText8.cpp
- nxcomp/PolyText8.h
- nxcomp/Proxy.cpp
- nxcomp/Proxy.h
- nxcomp/ProxyReadBuffer.cpp
- nxcomp/ProxyReadBuffer.h
- nxcomp/PutImage.cpp
- nxcomp/PutImage.h
- nxcomp/PutPackedImage.cpp
- nxcomp/PutPackedImage.h
- nxcomp/QueryFontReply.cpp
- nxcomp/QueryFontReply.h
- nxcomp/ReadBuffer.cpp
- nxcomp/ReadBuffer.h
- nxcomp/RenderAddGlyphs.cpp
- nxcomp/RenderAddGlyphs.h
- nxcomp/RenderChangePicture.cpp
- nxcomp/RenderChangePicture.h
- nxcomp/RenderComposite.cpp
- nxcomp/RenderComposite.h
- nxcomp/RenderCompositeGlyphs.cpp
- nxcomp/RenderCompositeGlyphs.h
- nxcomp/RenderCreateGlyphSet.cpp
- nxcomp/RenderCreateGlyphSet.h
- nxcomp/RenderCreatePicture.cpp
- nxcomp/RenderCreatePicture.h
- nxcomp/RenderExtension.cpp
- nxcomp/RenderExtension.h
- nxcomp/RenderFillRectangles.cpp
- nxcomp/RenderFillRectangles.h
- nxcomp/RenderFreeGlyphSet.cpp
- nxcomp/RenderFreeGlyphSet.h
- nxcomp/RenderFreePicture.cpp
- nxcomp/RenderFreePicture.h
- nxcomp/RenderGenericRequest.cpp
- nxcomp/RenderGenericRequest.h
- nxcomp/RenderMinorExtensionHeaders.h
- nxcomp/RenderMinorExtensionMethods.h
- nxcomp/RenderMinorExtensionTags.h
- nxcomp/RenderPictureClip.cpp
- nxcomp/RenderPictureClip.h
- nxcomp/RenderPictureFilter.cpp
- nxcomp/RenderPictureFilter.h
- nxcomp/RenderPictureTransform.cpp
- nxcomp/RenderPictureTransform.h
- nxcomp/RenderTrapezoids.cpp
- nxcomp/RenderTrapezoids.h
- nxcomp/RenderTriangles.cpp
- nxcomp/RenderTriangles.h
- nxcomp/Rgb.cpp
- nxcomp/Rgb.h
- nxcomp/Rle.cpp
- nxcomp/Rle.h
- nxcomp/SendEvent.cpp
- nxcomp/SendEvent.h
- nxcomp/SequenceQueue.cpp
- nxcomp/SequenceQueue.h
- nxcomp/ServerCache.cpp
- nxcomp/ServerCache.h
- nxcomp/ServerChannel.cpp
- nxcomp/ServerChannel.h
- nxcomp/ServerProxy.cpp
- nxcomp/ServerProxy.h
- nxcomp/ServerReadBuffer.cpp
- nxcomp/ServerReadBuffer.h
- nxcomp/ServerStore.cpp
- nxcomp/ServerStore.h
- nxcomp/SetClipRectangles.cpp
- nxcomp/SetClipRectangles.h
- nxcomp/SetUnpackAlpha.cpp
- nxcomp/SetUnpackAlpha.h
- nxcomp/SetUnpackColormap.cpp
- nxcomp/SetUnpackColormap.h
- nxcomp/SetUnpackGeometry.cpp
- nxcomp/SetUnpackGeometry.h
- nxcomp/ShapeExtension.cpp
- nxcomp/ShapeExtension.h
- nxcomp/Socket.cpp
- nxcomp/Socket.h
- nxcomp/Split.cpp
- nxcomp/Split.h
- nxcomp/StaticCompressor.cpp
- nxcomp/StaticCompressor.h
- nxcomp/Statistics.cpp
- nxcomp/Statistics.h
- nxcomp/Timestamp.cpp
- nxcomp/Timestamp.h
- nxcomp/TranslateCoords.cpp
- nxcomp/TranslateCoords.h
- nxcomp/Transport.cpp
- nxcomp/Transport.h
- nxcomp/Types.h
- nxcomp/Unpack.cpp
- nxcomp/Unpack.h
- nxcomp/Vars.c
- nxcomp/WriteBuffer.cpp
- nxcomp/WriteBuffer.h
- nxcomp/XidCache.cpp
- nxcomp/XidCache.h
- nxcomp/Z.cpp
- nxcomp/Z.h
- nxcomp/configure.in
- nxcompshad/Core.cpp
- nxcompshad/Core.h
- nxcompshad/Input.cpp
- nxcompshad/Input.h
- nxcompshad/Logger.cpp
- nxcompshad/Logger.h
- nxcompshad/Makefile.in
- nxcompshad/Manager.cpp
- nxcompshad/Manager.h
- nxcompshad/Misc.h
- nxcompshad/Poller.h
- nxcompshad/Regions.h
- nxcompshad/Shadow.cpp
- nxcompshad/Shadow.h
- nxcompshad/Updater.cpp
- nxcompshad/Updater.h
- nxcompshad/Win.cpp
- nxcompshad/Win.h
- nxcompshad/X11.cpp
- nxcompshad/X11.h
- nxcompshad/configure.in
-Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
+ nxcomp/include/NX.h
+ nxcomp/include/NXalert.h
+ nxcomp/include/NXpack.h
+ nxcomp/include/NXproto.h
+ nxcomp/include/NXvars.h
+ nxcomp/src/ActionCache.cpp
+ nxcomp/src/ActionCache.h
+ nxcomp/src/Agent.cpp
+ nxcomp/src/Agent.h
+ nxcomp/src/Alpha.cpp
+ nxcomp/src/Alpha.h
+ nxcomp/src/Auth.cpp
+ nxcomp/src/Auth.h
+ nxcomp/src/Bitmap.cpp
+ nxcomp/src/Bitmap.h
+ nxcomp/src/BlockCache.cpp
+ nxcomp/src/BlockCache.h
+ nxcomp/src/BlockCacheSet.cpp
+ nxcomp/src/BlockCacheSet.h
+ nxcomp/src/ChangeGC.cpp
+ nxcomp/src/ChangeGC.h
+ nxcomp/src/ChangeProperty.cpp
+ nxcomp/src/ChangeProperty.h
+ nxcomp/src/Channel.cpp
+ nxcomp/src/Channel.h
+ nxcomp/src/ChannelCache.cpp
+ nxcomp/src/ChannelCache.h
+ nxcomp/src/ChannelEndPoint.cpp
+ nxcomp/src/ChannelEndPoint.h
+ nxcomp/src/ChannelStore.h
+ nxcomp/src/CharCache.cpp
+ nxcomp/src/CharCache.h
+ nxcomp/src/Children.cpp
+ nxcomp/src/ClearArea.cpp
+ nxcomp/src/ClearArea.h
+ nxcomp/src/ClientCache.cpp
+ nxcomp/src/ClientCache.h
+ nxcomp/src/ClientChannel.cpp
+ nxcomp/src/ClientChannel.h
+ nxcomp/src/ClientProxy.cpp
+ nxcomp/src/ClientProxy.h
+ nxcomp/src/ClientReadBuffer.cpp
+ nxcomp/src/ClientReadBuffer.h
+ nxcomp/src/ClientStore.cpp
+ nxcomp/src/ClientStore.h
+ nxcomp/src/Colormap.cpp
+ nxcomp/src/Colormap.h
+ nxcomp/src/ConfigureWindow.cpp
+ nxcomp/src/ConfigureWindow.h
+ nxcomp/src/Control.cpp
+ nxcomp/src/Control.h
+ nxcomp/src/CopyArea.cpp
+ nxcomp/src/CopyArea.h
+ nxcomp/src/CreateGC.cpp
+ nxcomp/src/CreateGC.h
+ nxcomp/src/CreatePixmap.cpp
+ nxcomp/src/CreatePixmap.h
+ nxcomp/src/DecodeBuffer.cpp
+ nxcomp/src/DecodeBuffer.h
+ nxcomp/src/EncodeBuffer.cpp
+ nxcomp/src/EncodeBuffer.h
+ nxcomp/src/FillPoly.cpp
+ nxcomp/src/FillPoly.h
+ nxcomp/src/Fork.cpp
+ nxcomp/src/Fork.h
+ nxcomp/src/FreeCache.h
+ nxcomp/src/GenericChannel.cpp
+ nxcomp/src/GenericChannel.h
+ nxcomp/src/GenericReadBuffer.cpp
+ nxcomp/src/GenericReadBuffer.h
+ nxcomp/src/GenericReply.cpp
+ nxcomp/src/GenericReply.h
+ nxcomp/src/GenericRequest.cpp
+ nxcomp/src/GenericRequest.h
+ nxcomp/src/GetImage.cpp
+ nxcomp/src/GetImage.h
+ nxcomp/src/GetImageReply.cpp
+ nxcomp/src/GetImageReply.h
+ nxcomp/src/GetProperty.cpp
+ nxcomp/src/GetProperty.h
+ nxcomp/src/GetPropertyReply.cpp
+ nxcomp/src/GetPropertyReply.h
+ nxcomp/src/ImageText16.cpp
+ nxcomp/src/ImageText16.h
+ nxcomp/src/ImageText8.cpp
+ nxcomp/src/ImageText8.h
+ nxcomp/src/IntCache.cpp
+ nxcomp/src/IntCache.h
+ nxcomp/src/InternAtom.cpp
+ nxcomp/src/InternAtom.h
+ nxcomp/src/Jpeg.cpp
+ nxcomp/src/Jpeg.h
+ nxcomp/src/Keeper.cpp
+ nxcomp/src/Keeper.h
+ nxcomp/src/List.cpp
+ nxcomp/src/List.h
+ nxcomp/src/ListFontsReply.cpp
+ nxcomp/src/ListFontsReply.h
+ nxcomp/src/Loop.cpp
+ nxcomp/src/Message.cpp
+ nxcomp/src/Message.h
+ nxcomp/src/Misc.cpp
+ nxcomp/src/Misc.h
+ nxcomp/src/NXmitshm.h
+ nxcomp/src/NXrender.h
+ nxcomp/src/OpcodeCache.h
+ nxcomp/src/OpcodeStore.cpp
+ nxcomp/src/OpcodeStore.h
+ nxcomp/src/Pack.c
+ nxcomp/src/Pgn.cpp
+ nxcomp/src/Pgn.h
+ nxcomp/src/Pipe.cpp
+ nxcomp/src/Pipe.h
+ nxcomp/src/PolyArc.cpp
+ nxcomp/src/PolyArc.h
+ nxcomp/src/PolyFillArc.cpp
+ nxcomp/src/PolyFillArc.h
+ nxcomp/src/PolyFillRectangle.cpp
+ nxcomp/src/PolyFillRectangle.h
+ nxcomp/src/PolyLine.cpp
+ nxcomp/src/PolyLine.h
+ nxcomp/src/PolyPoint.cpp
+ nxcomp/src/PolyPoint.h
+ nxcomp/src/PolySegment.cpp
+ nxcomp/src/PolySegment.h
+ nxcomp/src/PolyText16.cpp
+ nxcomp/src/PolyText16.h
+ nxcomp/src/PolyText8.cpp
+ nxcomp/src/PolyText8.h
+ nxcomp/src/Proxy.cpp
+ nxcomp/src/Proxy.h
+ nxcomp/src/ProxyReadBuffer.cpp
+ nxcomp/src/ProxyReadBuffer.h
+ nxcomp/src/PutImage.cpp
+ nxcomp/src/PutImage.h
+ nxcomp/src/PutPackedImage.cpp
+ nxcomp/src/PutPackedImage.h
+ nxcomp/src/QueryFontReply.cpp
+ nxcomp/src/QueryFontReply.h
+ nxcomp/src/ReadBuffer.cpp
+ nxcomp/src/ReadBuffer.h
+ nxcomp/src/RenderAddGlyphs.cpp
+ nxcomp/src/RenderAddGlyphs.h
+ nxcomp/src/RenderChangePicture.cpp
+ nxcomp/src/RenderChangePicture.h
+ nxcomp/src/RenderComposite.cpp
+ nxcomp/src/RenderComposite.h
+ nxcomp/src/RenderCompositeGlyphs.cpp
+ nxcomp/src/RenderCompositeGlyphs.h
+ nxcomp/src/RenderCreateGlyphSet.cpp
+ nxcomp/src/RenderCreateGlyphSet.h
+ nxcomp/src/RenderCreatePicture.cpp
+ nxcomp/src/RenderCreatePicture.h
+ nxcomp/src/RenderExtension.cpp
+ nxcomp/src/RenderExtension.h
+ nxcomp/src/RenderFillRectangles.cpp
+ nxcomp/src/RenderFillRectangles.h
+ nxcomp/src/RenderFreeGlyphSet.cpp
+ nxcomp/src/RenderFreeGlyphSet.h
+ nxcomp/src/RenderFreePicture.cpp
+ nxcomp/src/RenderFreePicture.h
+ nxcomp/src/RenderGenericRequest.cpp
+ nxcomp/src/RenderGenericRequest.h
+ nxcomp/src/RenderMinorExtensionHeaders.h
+ nxcomp/src/RenderMinorExtensionMethods.h
+ nxcomp/src/RenderMinorExtensionTags.h
+ nxcomp/src/RenderPictureClip.cpp
+ nxcomp/src/RenderPictureClip.h
+ nxcomp/src/RenderPictureFilter.cpp
+ nxcomp/src/RenderPictureFilter.h
+ nxcomp/src/RenderPictureTransform.cpp
+ nxcomp/src/RenderPictureTransform.h
+ nxcomp/src/RenderTrapezoids.cpp
+ nxcomp/src/RenderTrapezoids.h
+ nxcomp/src/RenderTriangles.cpp
+ nxcomp/src/RenderTriangles.h
+ nxcomp/src/Rgb.cpp
+ nxcomp/src/Rgb.h
+ nxcomp/src/Rle.cpp
+ nxcomp/src/Rle.h
+ nxcomp/src/SendEvent.cpp
+ nxcomp/src/SendEvent.h
+ nxcomp/src/SequenceQueue.cpp
+ nxcomp/src/SequenceQueue.h
+ nxcomp/src/ServerCache.cpp
+ nxcomp/src/ServerCache.h
+ nxcomp/src/ServerChannel.cpp
+ nxcomp/src/ServerChannel.h
+ nxcomp/src/ServerProxy.cpp
+ nxcomp/src/ServerProxy.h
+ nxcomp/src/ServerReadBuffer.cpp
+ nxcomp/src/ServerReadBuffer.h
+ nxcomp/src/ServerStore.cpp
+ nxcomp/src/ServerStore.h
+ nxcomp/src/SetClipRectangles.cpp
+ nxcomp/src/SetClipRectangles.h
+ nxcomp/src/SetUnpackAlpha.cpp
+ nxcomp/src/SetUnpackAlpha.h
+ nxcomp/src/SetUnpackColormap.cpp
+ nxcomp/src/SetUnpackColormap.h
+ nxcomp/src/SetUnpackGeometry.cpp
+ nxcomp/src/SetUnpackGeometry.h
+ nxcomp/src/ShapeExtension.cpp
+ nxcomp/src/ShapeExtension.h
+ nxcomp/src/Socket.cpp
+ nxcomp/src/Socket.h
+ nxcomp/src/Split.cpp
+ nxcomp/src/Split.h
+ nxcomp/src/StaticCompressor.cpp
+ nxcomp/src/StaticCompressor.h
+ nxcomp/src/Statistics.cpp
+ nxcomp/src/Statistics.h
+ nxcomp/src/Timestamp.cpp
+ nxcomp/src/Timestamp.h
+ nxcomp/src/TranslateCoords.cpp
+ nxcomp/src/TranslateCoords.h
+ nxcomp/src/Transport.cpp
+ nxcomp/src/Transport.h
+ nxcomp/src/Types.h
+ nxcomp/src/Unpack.cpp
+ nxcomp/src/Unpack.h
+ nxcomp/src/Vars.c
+ nxcomp/src/WriteBuffer.cpp
+ nxcomp/src/WriteBuffer.h
+ nxcomp/src/XidCache.cpp
+ nxcomp/src/XidCache.h
+ nxcomp/src/Z.cpp
+ nxcomp/src/Z.h
+ nxcompshad/include/Shadow.h
+ nxcompshad/src/Core.cpp
+ nxcompshad/src/Core.h
+ nxcompshad/src/Input.cpp
+ nxcompshad/src/Input.h
+ nxcompshad/src/Logger.cpp
+ nxcompshad/src/Logger.h
+ nxcompshad/src/Manager.cpp
+ nxcompshad/src/Manager.h
+ nxcompshad/src/Misc.h
+ nxcompshad/src/Poller.h
+ nxcompshad/src/Regions.h
+ nxcompshad/src/Shadow.cpp
+ nxcompshad/src/Updater.cpp
+ nxcompshad/src/Updater.h
+ nxcompshad/src/X11.cpp
+ nxcompshad/src/X11.h
+Copyright: 2001, 2011, NoMachine (http:www.nomachine.com)
+  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2014-2016, Mihai Moldovan <ionic@ionic.de>
+  2014-2016, Ulrich Sibiller <uli42@gmx.de>
+  2015-2016, Qindel Group (http:www.qindel.com)
+  of the aforementioned persons and companies.
 License: UNKNOWN
  FIXME
 
@@ -415,7 +916,6 @@ Files: nx-X11/extras/Mesa/include/GL/gl.h
  nx-X11/extras/Mesa/src/mesa/main/drawpix.h
  nx-X11/extras/Mesa/src/mesa/main/enable.c
  nx-X11/extras/Mesa/src/mesa/main/enable.h
- nx-X11/extras/Mesa/src/mesa/main/enums.c
  nx-X11/extras/Mesa/src/mesa/main/enums.h
  nx-X11/extras/Mesa/src/mesa/main/eval.c
  nx-X11/extras/Mesa/src/mesa/main/eval.h
@@ -656,348 +1156,18 @@ Copyright: 1999-2001, Brian Paul
   1999-2003, Brian Paul
   1999-2004, Brian Paul
   1999-2005, Brian Paul
+  1999-2006, Brian Paul
   2004-2005, Brian Paul
   2005, Brian Paul
-License: Expat
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/include/XWDFile.h
- nx-X11/include/Xalloca.h
- nx-X11/include/Xauth.h
- nx-X11/include/Xfuncproto.h
- nx-X11/include/Xfuncs.h
- nx-X11/include/Xos.h
- nx-X11/include/Xos_r.h
- nx-X11/include/Xosdefs.h
- nx-X11/include/Xthreads.h
- nx-X11/include/Xwindows.h
- nx-X11/include/Xwinsock.h
- nx-X11/include/extensions/bigreqstr.h
- nx-X11/include/extensions/security.h
- nx-X11/include/extensions/securstr.h
- nx-X11/include/extensions/xcmiscstr.h
- nx-X11/include/extensions/xtestconst.h
- nx-X11/include/extensions/xteststr.h
- nx-X11/lib/X11/AllCells.c
- nx-X11/lib/X11/AllPlanes.c
- nx-X11/lib/X11/AllowEv.c
- nx-X11/lib/X11/AuDispose.c
- nx-X11/lib/X11/AuFileName.c
- nx-X11/lib/X11/AuGetBest.c
- nx-X11/lib/X11/AuRead.c
- nx-X11/lib/X11/AutoRep.c
- nx-X11/lib/X11/Backgnd.c
- nx-X11/lib/X11/BdrWidth.c
- nx-X11/lib/X11/Bell.c
- nx-X11/lib/X11/Border.c
- nx-X11/lib/X11/ChAccCon.c
- nx-X11/lib/X11/ChActPGb.c
- nx-X11/lib/X11/ChClMode.c
- nx-X11/lib/X11/ChCmap.c
- nx-X11/lib/X11/ChGC.c
- nx-X11/lib/X11/ChKeyCon.c
- nx-X11/lib/X11/ChPntCon.c
- nx-X11/lib/X11/ChProp.c
- nx-X11/lib/X11/ChSaveSet.c
- nx-X11/lib/X11/ChWAttrs.c
- nx-X11/lib/X11/ChWindow.c
- nx-X11/lib/X11/ChkIfEv.c
- nx-X11/lib/X11/ChkMaskEv.c
- nx-X11/lib/X11/ChkTypEv.c
- nx-X11/lib/X11/ChkTypWEv.c
- nx-X11/lib/X11/ChkWinEv.c
- nx-X11/lib/X11/CirWin.c
- nx-X11/lib/X11/CirWinDn.c
- nx-X11/lib/X11/CirWinUp.c
- nx-X11/lib/X11/ClDisplay.c
- nx-X11/lib/X11/Clear.c
- nx-X11/lib/X11/ClearArea.c
- nx-X11/lib/X11/ConfWind.c
- nx-X11/lib/X11/ConvSel.c
- nx-X11/lib/X11/CopyArea.c
- nx-X11/lib/X11/CopyCmap.c
- nx-X11/lib/X11/CopyGC.c
- nx-X11/lib/X11/CopyPlane.c
- nx-X11/lib/X11/CrBFData.c
- nx-X11/lib/X11/CrCmap.c
- nx-X11/lib/X11/CrCursor.c
- nx-X11/lib/X11/CrGC.c
- nx-X11/lib/X11/CrGlCur.c
- nx-X11/lib/X11/CrPFBData.c
- nx-X11/lib/X11/CrPixmap.c
- nx-X11/lib/X11/CrWindow.c
- nx-X11/lib/X11/Cursor.c
- nx-X11/lib/X11/DefCursor.c
- nx-X11/lib/X11/DelProp.c
- nx-X11/lib/X11/Depths.c
- nx-X11/lib/X11/DestSubs.c
- nx-X11/lib/X11/DestWind.c
- nx-X11/lib/X11/DisName.c
- nx-X11/lib/X11/DrArc.c
- nx-X11/lib/X11/DrArcs.c
- nx-X11/lib/X11/DrLine.c
- nx-X11/lib/X11/DrLines.c
- nx-X11/lib/X11/DrPoint.c
- nx-X11/lib/X11/DrPoints.c
- nx-X11/lib/X11/DrRect.c
- nx-X11/lib/X11/DrRects.c
- nx-X11/lib/X11/DrSegs.c
- nx-X11/lib/X11/ErrHndlr.c
- nx-X11/lib/X11/EvToWire.c
- nx-X11/lib/X11/FSSaver.c
- nx-X11/lib/X11/FetchName.c
- nx-X11/lib/X11/FillArc.c
- nx-X11/lib/X11/FillArcs.c
- nx-X11/lib/X11/FillPoly.c
- nx-X11/lib/X11/FillRct.c
- nx-X11/lib/X11/FillRcts.c
- nx-X11/lib/X11/Flush.c
- nx-X11/lib/X11/FontInfo.c
- nx-X11/lib/X11/FontNames.c
- nx-X11/lib/X11/FreeCmap.c
- nx-X11/lib/X11/FreeCols.c
- nx-X11/lib/X11/FreeCurs.c
- nx-X11/lib/X11/FreeEData.c
- nx-X11/lib/X11/FreeGC.c
- nx-X11/lib/X11/FreePix.c
- nx-X11/lib/X11/GCMisc.c
- nx-X11/lib/X11/Geom.c
- nx-X11/lib/X11/GetAtomNm.c
- nx-X11/lib/X11/GetColor.c
- nx-X11/lib/X11/GetFPath.c
- nx-X11/lib/X11/GetFProp.c
- nx-X11/lib/X11/GetGCVals.c
- nx-X11/lib/X11/GetGeom.c
- nx-X11/lib/X11/GetHColor.c
- nx-X11/lib/X11/GetIFocus.c
- nx-X11/lib/X11/GetImage.c
- nx-X11/lib/X11/GetKCnt.c
- nx-X11/lib/X11/GetMoEv.c
- nx-X11/lib/X11/GetPCnt.c
- nx-X11/lib/X11/GetPntMap.c
- nx-X11/lib/X11/GetProp.c
- nx-X11/lib/X11/GetRGBCMap.c
- nx-X11/lib/X11/GetSOwner.c
- nx-X11/lib/X11/GetSSaver.c
- nx-X11/lib/X11/GetWAttrs.c
- nx-X11/lib/X11/GrButton.c
- nx-X11/lib/X11/GrKey.c
- nx-X11/lib/X11/GrKeybd.c
- nx-X11/lib/X11/GrPointer.c
- nx-X11/lib/X11/GrServer.c
- nx-X11/lib/X11/IfEvent.c
- nx-X11/lib/X11/ImText.c
- nx-X11/lib/X11/ImText16.c
- nx-X11/lib/X11/ImUtil.c
- nx-X11/lib/X11/InitExt.c
- nx-X11/lib/X11/InsCmap.c
- nx-X11/lib/X11/IntAtom.c
- nx-X11/lib/X11/KeyBind.c
- nx-X11/lib/X11/KeysymStr.c
- nx-X11/lib/X11/KillCl.c
- nx-X11/lib/X11/LiICmaps.c
- nx-X11/lib/X11/LiProps.c
- nx-X11/lib/X11/ListExt.c
- nx-X11/lib/X11/LoadFont.c
- nx-X11/lib/X11/LockDis.c
- nx-X11/lib/X11/LookupCol.c
- nx-X11/lib/X11/LowerWin.c
- nx-X11/lib/X11/Macros.c
- nx-X11/lib/X11/MapRaised.c
- nx-X11/lib/X11/MapSubs.c
- nx-X11/lib/X11/MapWindow.c
- nx-X11/lib/X11/MaskEvent.c
- nx-X11/lib/X11/Misc.c
- nx-X11/lib/X11/ModMap.c
- nx-X11/lib/X11/MoveWin.c
- nx-X11/lib/X11/NextEvent.c
- nx-X11/lib/X11/ParseCol.c
- nx-X11/lib/X11/ParseGeom.c
- nx-X11/lib/X11/PeekEvent.c
- nx-X11/lib/X11/PeekIfEv.c
- nx-X11/lib/X11/Pending.c
- nx-X11/lib/X11/PixFormats.c
- nx-X11/lib/X11/PmapBgnd.c
- nx-X11/lib/X11/PmapBord.c
- nx-X11/lib/X11/PolyTxt.c
- nx-X11/lib/X11/PolyTxt16.c
- nx-X11/lib/X11/PropAlloc.c
- nx-X11/lib/X11/PutBEvent.c
- nx-X11/lib/X11/PutImage.c
- nx-X11/lib/X11/QuBest.c
- nx-X11/lib/X11/QuColor.c
- nx-X11/lib/X11/QuColors.c
- nx-X11/lib/X11/QuCurShp.c
- nx-X11/lib/X11/QuExt.c
- nx-X11/lib/X11/QuKeybd.c
- nx-X11/lib/X11/QuPntr.c
- nx-X11/lib/X11/QuStipShp.c
- nx-X11/lib/X11/QuTextE16.c
- nx-X11/lib/X11/QuTextExt.c
- nx-X11/lib/X11/QuTileShp.c
- nx-X11/lib/X11/QuTree.c
- nx-X11/lib/X11/RaiseWin.c
- nx-X11/lib/X11/RdBitF.c
- nx-X11/lib/X11/RecolorC.c
- nx-X11/lib/X11/ReconfWM.c
- nx-X11/lib/X11/ReconfWin.c
- nx-X11/lib/X11/RepWindow.c
- nx-X11/lib/X11/RestackWs.c
- nx-X11/lib/X11/RotProp.c
- nx-X11/lib/X11/ScrResStr.c
- nx-X11/lib/X11/SelInput.c
- nx-X11/lib/X11/SendEvent.c
- nx-X11/lib/X11/SetBack.c
- nx-X11/lib/X11/SetCRects.c
- nx-X11/lib/X11/SetClMask.c
- nx-X11/lib/X11/SetClOrig.c
- nx-X11/lib/X11/SetDashes.c
- nx-X11/lib/X11/SetFPath.c
- nx-X11/lib/X11/SetFont.c
- nx-X11/lib/X11/SetFore.c
- nx-X11/lib/X11/SetFunc.c
- nx-X11/lib/X11/SetIFocus.c
- nx-X11/lib/X11/SetLStyle.c
- nx-X11/lib/X11/SetPMask.c
- nx-X11/lib/X11/SetPntMap.c
- nx-X11/lib/X11/SetRGBCMap.c
- nx-X11/lib/X11/SetSOwner.c
- nx-X11/lib/X11/SetSSaver.c
- nx-X11/lib/X11/SetState.c
- nx-X11/lib/X11/SetStip.c
- nx-X11/lib/X11/SetTSOrig.c
- nx-X11/lib/X11/SetTile.c
- nx-X11/lib/X11/StBytes.c
- nx-X11/lib/X11/StColor.c
- nx-X11/lib/X11/StColors.c
- nx-X11/lib/X11/StNColor.c
- nx-X11/lib/X11/StName.c
- nx-X11/lib/X11/StrKeysym.c
- nx-X11/lib/X11/StrToText.c
- nx-X11/lib/X11/Sync.c
- nx-X11/lib/X11/Synchro.c
- nx-X11/lib/X11/Text.c
- nx-X11/lib/X11/Text16.c
- nx-X11/lib/X11/TextToStr.c
- nx-X11/lib/X11/TrCoords.c
- nx-X11/lib/X11/UndefCurs.c
- nx-X11/lib/X11/UngrabBut.c
- nx-X11/lib/X11/UngrabKbd.c
- nx-X11/lib/X11/UngrabKey.c
- nx-X11/lib/X11/UngrabPtr.c
- nx-X11/lib/X11/UngrabSvr.c
- nx-X11/lib/X11/UninsCmap.c
- nx-X11/lib/X11/UnldFont.c
- nx-X11/lib/X11/UnmapSubs.c
- nx-X11/lib/X11/UnmapWin.c
- nx-X11/lib/X11/VisUtil.c
- nx-X11/lib/X11/WMGeom.c
- nx-X11/lib/X11/WarpPtr.c
- nx-X11/lib/X11/WinEvent.c
- nx-X11/lib/X11/Window.c
- nx-X11/lib/X11/WrBitF.c
- nx-X11/lib/X11/XErrorDB
- nx-X11/lib/X11/XKBBind.c
- nx-X11/lib/X11/XKBCvt.c
- nx-X11/lib/X11/Xlib.h
- nx-X11/lib/X11/Xlocale.h
- nx-X11/lib/X11/cmsMath.c
- nx-X11/lib/X11/cursorfont.h
- nx-X11/lib/X11/evtomask.c
- nx-X11/lib/X11/globals.c
- nx-X11/lib/X11/locking.c
- nx-X11/lib/X11/locking.h
- nx-X11/lib/X11/mbWMProps.c
- nx-X11/lib/X11/util/makekeys.c
- nx-X11/programs/Xserver/Xext/bigreq.c
- nx-X11/programs/Xserver/Xext/shape.c
- nx-X11/programs/Xserver/Xext/shm.c
- nx-X11/programs/Xserver/Xext/sleepuntil.c
- nx-X11/programs/Xserver/Xext/xcmisc.c
- nx-X11/programs/Xserver/Xext/xtest.c
- nx-X11/programs/Xserver/Xi/queryst.c
- nx-X11/programs/Xserver/dix/ffs.c
- nx-X11/programs/Xserver/dix/pixmap.c
- nx-X11/programs/Xserver/dix/privates.c
- nx-X11/programs/Xserver/dix/xpstubs.c
- nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c
- nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h
- nx-X11/programs/Xserver/include/closestr.h
- nx-X11/programs/Xserver/include/opaque.h
- nx-X11/programs/Xserver/include/validate.h
- nx-X11/programs/Xserver/mi/cbrt.c
- nx-X11/programs/Xserver/mi/mibstorest.h
- nx-X11/programs/Xserver/mi/miclipn.c
- nx-X11/programs/Xserver/mi/midispcur.c
- nx-X11/programs/Xserver/mi/mieq.c
- nx-X11/programs/Xserver/mi/mifillarc.c
- nx-X11/programs/Xserver/mi/mifillarc.h
- nx-X11/programs/Xserver/mi/migc.c
- nx-X11/programs/Xserver/mi/migc.h
- nx-X11/programs/Xserver/mi/miline.h
- nx-X11/programs/Xserver/mi/mipointer.c
- nx-X11/programs/Xserver/mi/mipointer.h
- nx-X11/programs/Xserver/mi/mipointrst.h
- nx-X11/programs/Xserver/mi/mipoly.h
- nx-X11/programs/Xserver/mi/miscanfill.h
- nx-X11/programs/Xserver/mi/miscrinit.c
- nx-X11/programs/Xserver/mi/misprite.c
- nx-X11/programs/Xserver/mi/misprite.h
- nx-X11/programs/Xserver/mi/mispritest.h
- nx-X11/programs/Xserver/mi/mivalidate.h
- nx-X11/programs/Xserver/mi/miwideline.c
- nx-X11/programs/Xserver/mi/miwideline.h
- nx-X11/programs/Xserver/mi/mizerarc.c
- nx-X11/programs/Xserver/mi/mizerarc.h
- nx-X11/programs/Xserver/os/mitauth.c
- nx-X11/programs/Xserver/os/rpcauth.c
- nx-X11/programs/Xserver/os/secauth.c
- nx-X11/programs/Xserver/os/xdmauth.c
- nx-X11/programs/Xserver/record/record.c
- nx-X11/programs/Xserver/record/set.c
- nx-X11/programs/Xserver/record/set.h
- nxcompshad/X11/include/XTest_nxcompshad.h
-Copyright: 1985, 1987, 1990, 1998 The Open Group
-  1985, 1987, 1994, 1998 The Open Group
-  1985, 1987, 1998, The Open Group
-  1985, 1990, 1998, The Open Group
-  1985, 1998 The Open Group
-  1985-1986, 1998 The Open Group
-  1985-1987, 1991, 1998, The Open Group
-  1985-1987, 1998 The Open Group
-  1985-1987,1998, The Open Group
-  1986, 1990, 1998, The Open Group
-  1986, 1998 The Open Group
-  1986,1998, The Open Group
-  1986-1987, 1998 The Open Group
-  1987, 1998 The Open Group
-  1988, 1998 The Open Group
-  1988-1989, 1998 The Open Group
-  1989, 1991, 1998, The Open Group
-  1989, 1998 The Open Group
-  1990, 1994, 1998, The Open Group
-  1990, 1998 The Open Group
-  1991, 1998 The Open Group
-  1992, 1998 The Open Group
-  1993, 1995, 1998, The Open Group
-  1993, 1998 The Open Group
-  1993-1994, 1998 The Open Group
-  1994, 1998 The Open Group
-  1995, 1998 The Open Group
-  1996, 1998 The Open Group
-  1998, 1998 The Open Group
-  2003, The Open Group
-License: UNKNOWN
- FIXME
-
-Files: ChangeLog
- Makefile
+Files: Makefile
  VERSION
  debian/README.source
  debian/compat
  debian/control
- debian/copyright
- debian/copyright.in
+ debian/files
  debian/libnx-x11-6.install
  debian/libnx-x11-6.symbols
  debian/libnx-x11-6.triggers
@@ -1018,6 +1188,7 @@ Files: ChangeLog
  debian/nx-x11proto-damage-dev.install
  debian/nx-x11proto-randr-dev.install
  debian/nx-x11proto-render-dev.install
+ debian/nx-x11proto-scrnsaver-dev.install
  debian/nx-x11proto-xext-dev.install
  debian/nx-x11proto-xfixes-dev.install
  debian/nx-x11proto-xinerama-dev.install
@@ -1039,7 +1210,6 @@ Files: ChangeLog
  debian/watch
  doc/README.NX-development
  doc/libNX_X11/lcUniConv/8bit_tab_to_h.c
- doc/libNX_X11/lcUniConv/README
  doc/libNX_X11/lcUniConv/cjk_tab_to_h.c
  doc/nxagent/README.keystrokes
  doc/nxagent/README.keystrokes.debug
@@ -1049,8 +1219,6 @@ Files: ChangeLog
  nx-X11/Makefile
  nx-X11/config/Imakefile
  nx-X11/config/cf/Imake.cf
- nx-X11/config/cf/Imake.rules
- nx-X11/config/cf/Imake.tmpl
  nx-X11/config/cf/Imakefile
  nx-X11/config/cf/Library.tmpl
  nx-X11/config/cf/README
@@ -1058,9 +1226,11 @@ Files: ChangeLog
  nx-X11/config/cf/ServerLib.tmpl
  nx-X11/config/cf/Threads.tmpl
  nx-X11/config/cf/X11.rules
- nx-X11/config/cf/X11.tmpl
  nx-X11/config/cf/cross.def
  nx-X11/config/cf/cross.rules
+ nx-X11/config/cf/gnu.cf
+ nx-X11/config/cf/gnuLib.rules
+ nx-X11/config/cf/gnuLib.tmpl
  nx-X11/config/cf/linux.cf
  nx-X11/config/cf/lnxLib.rules
  nx-X11/config/cf/lnxLib.tmpl
@@ -1072,9 +1242,13 @@ Files: ChangeLog
  nx-X11/config/cf/xorg.tmpl
  nx-X11/config/cf/xorgsite.def
  nx-X11/config/cf/xorgversion.def
- nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch
+ nx-X11/extras/Mesa.patches/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch
+ nx-X11/extras/Mesa.patches/4002_no-special-glx-memfunctions.patch
+ nx-X11/extras/Mesa.patches/4003_CreatePixmap-AllocationHints.patch
+ nx-X11/extras/Mesa.patches/4004_define-USE_IEEE-macro-for-more-platforms.patch
+ nx-X11/extras/Mesa.patches/5001_nasty-typo-fixes.patch
  nx-X11/extras/Mesa.patches/series
- nx-X11/extras/Mesa/src/mesa/main/get.c
+ nx-X11/extras/Mesa/src/mesa/main/KNOWN_BUGS
  nx-X11/extras/Mesa/src/mesa/main/texrender.c
  nx-X11/extras/Mesa/src/mesa/main/texrender.h
  nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h
@@ -1092,67 +1266,83 @@ Files: ChangeLog
  nx-X11/include/GL/Imakefile
  nx-X11/include/Imakefile
  nx-X11/include/XF86keysym.h
- nx-X11/include/Xatom.h
  nx-X11/include/Xw32defs.h
  nx-X11/include/extensions/Imakefile
  nx-X11/include/extensions/XvMC.h
  nx-X11/include/extensions/XvMCproto.h
- nx-X11/lib/Imakefile
- nx-X11/lib/X11/Cmap.h
- nx-X11/lib/X11/Cr.h
- nx-X11/lib/X11/Cv.h
- nx-X11/lib/X11/ImUtil.h
- nx-X11/lib/X11/Key.h
- nx-X11/lib/X11/Xintatom.h
- nx-X11/lib/X11/Xintconn.h
- nx-X11/lib/X11/XlibConf.h
- nx-X11/lib/X11/Xresinternal.h
- nx-X11/lib/X11/imKStoUCS.c
- nx-X11/lib/X11/lcUniConv/armscii_8.h
- nx-X11/lib/X11/lcUniConv/big5.h
- nx-X11/lib/X11/lcUniConv/big5_emacs.h
- nx-X11/lib/X11/lcUniConv/big5hkscs.h
- nx-X11/lib/X11/lcUniConv/cp1133.h
- nx-X11/lib/X11/lcUniConv/cp1251.h
- nx-X11/lib/X11/lcUniConv/cp1255.h
- nx-X11/lib/X11/lcUniConv/cp1256.h
- nx-X11/lib/X11/lcUniConv/gb2312.h
- nx-X11/lib/X11/lcUniConv/gbk.h
- nx-X11/lib/X11/lcUniConv/georgian_academy.h
- nx-X11/lib/X11/lcUniConv/georgian_ps.h
- nx-X11/lib/X11/lcUniConv/iso8859_1.h
- nx-X11/lib/X11/lcUniConv/iso8859_10.h
- nx-X11/lib/X11/lcUniConv/iso8859_11.h
- nx-X11/lib/X11/lcUniConv/iso8859_13.h
- nx-X11/lib/X11/lcUniConv/iso8859_14.h
- nx-X11/lib/X11/lcUniConv/iso8859_15.h
- nx-X11/lib/X11/lcUniConv/iso8859_16.h
- nx-X11/lib/X11/lcUniConv/iso8859_2.h
- nx-X11/lib/X11/lcUniConv/iso8859_3.h
- nx-X11/lib/X11/lcUniConv/iso8859_4.h
- nx-X11/lib/X11/lcUniConv/iso8859_5.h
- nx-X11/lib/X11/lcUniConv/iso8859_6.h
- nx-X11/lib/X11/lcUniConv/iso8859_7.h
- nx-X11/lib/X11/lcUniConv/iso8859_8.h
- nx-X11/lib/X11/lcUniConv/iso8859_9.h
- nx-X11/lib/X11/lcUniConv/iso8859_9e.h
- nx-X11/lib/X11/lcUniConv/jisx0201.h
- nx-X11/lib/X11/lcUniConv/jisx0208.h
- nx-X11/lib/X11/lcUniConv/jisx0212.h
- nx-X11/lib/X11/lcUniConv/koi8_c.h
- nx-X11/lib/X11/lcUniConv/koi8_r.h
- nx-X11/lib/X11/lcUniConv/koi8_u.h
- nx-X11/lib/X11/lcUniConv/ksc5601.h
- nx-X11/lib/X11/lcUniConv/mulelao.h
- nx-X11/lib/X11/lcUniConv/tatar_cyr.h
- nx-X11/lib/X11/lcUniConv/tcvn.h
- nx-X11/lib/X11/lcUniConv/tis620.h
- nx-X11/lib/X11/lcUniConv/ucs2be.h
- nx-X11/lib/X11/lcUniConv/utf8.h
- nx-X11/lib/X11/lcUniConv/viscii.h
- nx-X11/lib/xtrans/Imakefile
+ nx-X11/lib/Makefile.am
+ nx-X11/lib/configure.ac
+ nx-X11/lib/include/Makefile.am
+ nx-X11/lib/include/X11/ImUtil.h
+ nx-X11/lib/modules/Makefile.am
+ nx-X11/lib/modules/im/Makefile.am
+ nx-X11/lib/modules/im/ximcp/Makefile.am
+ nx-X11/lib/modules/lc/Makefile.am
+ nx-X11/lib/modules/lc/Utf8/Makefile.am
+ nx-X11/lib/modules/lc/def/Makefile.am
+ nx-X11/lib/modules/lc/gen/Makefile.am
+ nx-X11/lib/modules/om/Makefile.am
+ nx-X11/lib/modules/om/generic/Makefile.am
+ nx-X11/lib/nx-x11.pc.in
+ nx-X11/lib/src/Cmap.h
+ nx-X11/lib/src/Cr.h
+ nx-X11/lib/src/Key.h
+ nx-X11/lib/src/Makefile.am
+ nx-X11/lib/src/Xintatom.h
+ nx-X11/lib/src/Xintconn.h
+ nx-X11/lib/src/Xresinternal.h
+ nx-X11/lib/src/util/Makefile.am
+ nx-X11/lib/src/xcms/Cv.h
+ nx-X11/lib/src/xcms/Makefile.am
+ nx-X11/lib/src/xkb/Makefile.am
+ nx-X11/lib/src/xlibi18n/Makefile.am
+ nx-X11/lib/src/xlibi18n/imKStoUCS.c
+ nx-X11/lib/src/xlibi18n/lcUniConv/armscii_8.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/big5.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/big5_emacs.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/big5hkscs.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/cp1133.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/cp1251.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/cp1255.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/cp1256.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/gb2312.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/gbk.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/georgian_academy.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/georgian_ps.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_1.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_10.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_11.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_13.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_14.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_15.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_16.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_2.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_3.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_4.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_5.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_6.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_7.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_8.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9e.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/jisx0201.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/jisx0208.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/jisx0212.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/koi8_c.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/koi8_r.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/koi8_u.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/ksc5601.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/mulelao.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/tatar_cyr.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/tcvn.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/tis620.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/ucs2be.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/utf8.h
+ nx-X11/lib/src/xlibi18n/lcUniConv/viscii.h
  nx-X11/programs/Xserver/GL/Imakefile
  nx-X11/programs/Xserver/GL/glx/Imakefile
+ nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
+ nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
  nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
  nx-X11/programs/Xserver/GL/mesa/Imakefile
  nx-X11/programs/Xserver/GL/mesa/Imakefile.inc
@@ -1190,8 +1380,6 @@ Files: ChangeLog
  nx-X11/programs/Xserver/damageext/Imakefile
  nx-X11/programs/Xserver/dbe/Imakefile
  nx-X11/programs/Xserver/dix/Imakefile
- nx-X11/programs/Xserver/dix/buildatoms
- nx-X11/programs/Xserver/dix/initatoms.c
  nx-X11/programs/Xserver/fb/Imakefile
  nx-X11/programs/Xserver/fix-miregion
  nx-X11/programs/Xserver/fix-miregion-private
@@ -1212,147 +1400,25 @@ Files: ChangeLog
  nx-X11/programs/Xserver/xkb/Imakefile
  nx-X11/programs/Xserver/xkb/ddxPrivate.c
  nx-X11/programs/Xserver/xkb/xkb.h
- nx-X11/programs/Xserver/xkb/xkbDflts.h
  nx-X11/x-indent-all.sh
  nx-X11/x-indent.sh
+ nxcomp/Makefile.am
  nxcomp/VERSION
- nxcomp/install-sh
- nxcomp/mkinstalldirs
+ nxcomp/configure.ac
  nxcomp/nxcomp.pc.in
+ nxcomp/src/Makefile.am
+ nxcompshad/Makefile.am
  nxcompshad/VERSION
- nxcompshad/install-sh
+ nxcompshad/configure.ac
  nxcompshad/nxcompshad.pc.in
- nxproxy/Makefile.in
+ nxcompshad/src/Makefile.am
+ nxproxy/Makefile.am
  nxproxy/VERSION
- nxproxy/configure.in
- nxproxy/install-sh
+ nxproxy/configure.ac
+ nxproxy/man/Makefile.am
  nxproxy/man/nxproxy.1
- nxproxy/mkinstalldirs
-Copyright: *No copyright*
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/include/DECkeysym.h
- nx-X11/include/HPkeysym.h
- nx-X11/include/X.h
- nx-X11/include/Xmd.h
- nx-X11/include/Xproto.h
- nx-X11/include/Xprotostr.h
- nx-X11/include/extensions/sync.h
- nx-X11/include/extensions/syncstr.h
- nx-X11/include/keysym.h
- nx-X11/include/keysymdef.h
- nx-X11/lib/X11/ErrDes.c
- nx-X11/lib/X11/GetDflt.c
- nx-X11/lib/X11/GetHints.c
- nx-X11/lib/X11/GetStCmap.c
- nx-X11/lib/X11/GetWMCMapW.c
- nx-X11/lib/X11/GetWMProto.c
- nx-X11/lib/X11/ParseCmd.c
- nx-X11/lib/X11/PolyReg.c
- nx-X11/lib/X11/Region.c
- nx-X11/lib/X11/SetHints.c
- nx-X11/lib/X11/SetStCmap.c
- nx-X11/lib/X11/SetWMCMapW.c
- nx-X11/lib/X11/SetWMProto.c
- nx-X11/lib/X11/Xatomtype.h
- nx-X11/lib/X11/XimThai.h
- nx-X11/lib/X11/Xregion.h
- nx-X11/lib/X11/Xresource.h
- nx-X11/lib/X11/Xutil.h
- nx-X11/lib/X11/imThaiFlt.c
- nx-X11/lib/X11/pathmax.h
- nx-X11/lib/X11/poly.h
- nx-X11/programs/Xserver/Xext/sync.c
- nx-X11/programs/Xserver/dix/atom.c
- nx-X11/programs/Xserver/dix/colormap.c
- nx-X11/programs/Xserver/dix/cursor.c
- nx-X11/programs/Xserver/dix/devices.c
- nx-X11/programs/Xserver/dix/extension.c
- nx-X11/programs/Xserver/dix/gc.c
- nx-X11/programs/Xserver/dix/globals.c
- nx-X11/programs/Xserver/dix/glyphcurs.c
- nx-X11/programs/Xserver/dix/grabs.c
- nx-X11/programs/Xserver/dix/property.c
- nx-X11/programs/Xserver/dix/swaprep.c
- nx-X11/programs/Xserver/dix/swapreq.c
- nx-X11/programs/Xserver/dix/tables.c
- nx-X11/programs/Xserver/include/closure.h
- nx-X11/programs/Xserver/include/colormap.h
- nx-X11/programs/Xserver/include/colormapst.h
- nx-X11/programs/Xserver/include/cursor.h
- nx-X11/programs/Xserver/include/cursorstr.h
- nx-X11/programs/Xserver/include/dix.h
- nx-X11/programs/Xserver/include/extension.h
- nx-X11/programs/Xserver/include/extnsionst.h
- nx-X11/programs/Xserver/include/gc.h
- nx-X11/programs/Xserver/include/gcstruct.h
- nx-X11/programs/Xserver/include/input.h
- nx-X11/programs/Xserver/include/inputstr.h
- nx-X11/programs/Xserver/include/miscstruct.h
- nx-X11/programs/Xserver/include/os.h
- nx-X11/programs/Xserver/include/pixmap.h
- nx-X11/programs/Xserver/include/pixmapstr.h
- nx-X11/programs/Xserver/include/property.h
- nx-X11/programs/Xserver/include/propertyst.h
- nx-X11/programs/Xserver/include/region.h
- nx-X11/programs/Xserver/include/regionstr.h
- nx-X11/programs/Xserver/include/resource.h
- nx-X11/programs/Xserver/include/rgb.h
- nx-X11/programs/Xserver/include/screenint.h
- nx-X11/programs/Xserver/include/scrnintstr.h
- nx-X11/programs/Xserver/include/selection.h
- nx-X11/programs/Xserver/include/servermd.h
- nx-X11/programs/Xserver/include/site.h
- nx-X11/programs/Xserver/include/window.h
- nx-X11/programs/Xserver/include/windowstr.h
- nx-X11/programs/Xserver/mi/mi.h
- nx-X11/programs/Xserver/mi/miarc.c
- nx-X11/programs/Xserver/mi/mibitblt.c
- nx-X11/programs/Xserver/mi/micursor.c
- nx-X11/programs/Xserver/mi/midash.c
- nx-X11/programs/Xserver/mi/mifillrct.c
- nx-X11/programs/Xserver/mi/mifpoly.h
- nx-X11/programs/Xserver/mi/mifpolycon.c
- nx-X11/programs/Xserver/mi/miglblt.c
- nx-X11/programs/Xserver/mi/miinitext.c
- nx-X11/programs/Xserver/mi/mipoly.c
- nx-X11/programs/Xserver/mi/mipolycon.c
- nx-X11/programs/Xserver/mi/mipolygen.c
- nx-X11/programs/Xserver/mi/mipolypnt.c
- nx-X11/programs/Xserver/mi/mipolyrect.c
- nx-X11/programs/Xserver/mi/mipolyseg.c
- nx-X11/programs/Xserver/mi/mipolytext.c
- nx-X11/programs/Xserver/mi/mipolyutil.c
- nx-X11/programs/Xserver/mi/mipushpxl.c
- nx-X11/programs/Xserver/mi/mispans.c
- nx-X11/programs/Xserver/mi/mispans.h
- nx-X11/programs/Xserver/mi/mistruct.h
- nx-X11/programs/Xserver/mi/miwindow.c
- nx-X11/programs/Xserver/mi/mizerclip.c
- nx-X11/programs/Xserver/mi/mizerline.c
- nx-X11/programs/Xserver/os/connection.c
- nx-X11/programs/Xserver/os/io.c
- nx-X11/programs/Xserver/os/oscolor.c
- nx-X11/programs/Xserver/os/osdep.h
- nx-X11/programs/Xserver/os/osinit.c
-Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts
-  1987, 1989, 1998, The Open Group
-  1987, 1994, 1998, The Open Group
-  1987, 1998 The Open Group
-  1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1987-1988, 1998 The Open Group
-  1987-1988, Digital Equipment Corporation, Maynard, Massachusetts
-  1988, 1998 The Open Group
-  1988, Digital Equipment Corporation, Maynard, Massachusetts
-  1989, 1998 The Open Group
-  1989, Digital Equipment Corporation, Maynard, Massachusetts
-  1991, 1993 Digital Equipment Corporation, Maynard, Massachusetts
-  1991, 1993, 1998, The Open Group
-  1991, 1993-1994, 1998 The Open Group
-  1991,1993, Digital Equipment Corporation, Maynard, Massachusetts
-  1993, 1998 The Open Group
-  1993, Digital Equipment Corporation, Maynard, Massachusetts
+ nxproxy/src/Makefile.am
+Copyright: NONE
 License: UNKNOWN
  FIXME
 
@@ -1360,8 +1426,9 @@ Files: nx-X11/include/extensions/composite.h
  nx-X11/include/extensions/compositeproto.h
  nx-X11/include/extensions/damageproto.h
  nx-X11/include/extensions/damagewire.h
- nx-X11/lib/X11/x11_trans.c
- nx-X11/lib/X11/xim_trans.c
+ nx-X11/lib/include/X11/XlibConf.h.in
+ nx-X11/lib/src/x11_trans.c
+ nx-X11/lib/src/xlibi18n/xim_trans.c
  nx-X11/programs/Xserver/Xext/shmint.h
  nx-X11/programs/Xserver/composite/compalloc.c
  nx-X11/programs/Xserver/composite/compext.c
@@ -1427,16 +1494,17 @@ Files: nx-X11/include/extensions/composite.h
  nx-X11/programs/Xserver/xfixes/xfixes.c
  nx-X11/programs/Xserver/xfixes/xfixes.h
  nx-X11/programs/Xserver/xfixes/xfixesint.h
- nxcompshad/X11/include/Xdamage_nxcompshad.h
+ nxcompshad/src/X11/include/Xdamage_nxcompshad.h
 Copyright: 1998, Keith Packard
   1999, Keith Packard
   2002, Keith Packard
   2003, Keith Packard
   2004, Keith Packard
+  2005, Keith Packard
   2006, Keith Packard
   2007, Keith Packard
   2014, Keith Packard
-License: UNKNOWN
+License: NTP (legal disclaimer)
  FIXME
 
 Files: nx-X11/include/extensions/XKB.h
@@ -1449,27 +1517,27 @@ Files: nx-X11/include/extensions/XKB.h
  nx-X11/include/extensions/XKBstr.h
  nx-X11/include/extensions/XKM.h
  nx-X11/include/extensions/XKMformat.h
- nx-X11/lib/X11/XKB.c
- nx-X11/lib/X11/XKBAlloc.c
- nx-X11/lib/X11/XKBBell.c
- nx-X11/lib/X11/XKBCompat.c
- nx-X11/lib/X11/XKBCtrls.c
- nx-X11/lib/X11/XKBExtDev.c
- nx-X11/lib/X11/XKBGAlloc.c
- nx-X11/lib/X11/XKBGeom.c
- nx-X11/lib/X11/XKBGetByName.c
- nx-X11/lib/X11/XKBGetMap.c
- nx-X11/lib/X11/XKBList.c
- nx-X11/lib/X11/XKBMAlloc.c
- nx-X11/lib/X11/XKBMisc.c
- nx-X11/lib/X11/XKBNames.c
- nx-X11/lib/X11/XKBRdBuf.c
- nx-X11/lib/X11/XKBSetGeom.c
- nx-X11/lib/X11/XKBSetMap.c
- nx-X11/lib/X11/XKBUse.c
- nx-X11/lib/X11/XKBleds.c
- nx-X11/lib/X11/XKBlib.h
- nx-X11/lib/X11/XKBlibint.h
+ nx-X11/lib/include/X11/XKBlib.h
+ nx-X11/lib/src/xkb/XKB.c
+ nx-X11/lib/src/xkb/XKBAlloc.c
+ nx-X11/lib/src/xkb/XKBBell.c
+ nx-X11/lib/src/xkb/XKBCompat.c
+ nx-X11/lib/src/xkb/XKBCtrls.c
+ nx-X11/lib/src/xkb/XKBExtDev.c
+ nx-X11/lib/src/xkb/XKBGAlloc.c
+ nx-X11/lib/src/xkb/XKBGeom.c
+ nx-X11/lib/src/xkb/XKBGetByName.c
+ nx-X11/lib/src/xkb/XKBGetMap.c
+ nx-X11/lib/src/xkb/XKBList.c
+ nx-X11/lib/src/xkb/XKBMAlloc.c
+ nx-X11/lib/src/xkb/XKBMisc.c
+ nx-X11/lib/src/xkb/XKBNames.c
+ nx-X11/lib/src/xkb/XKBRdBuf.c
+ nx-X11/lib/src/xkb/XKBSetGeom.c
+ nx-X11/lib/src/xkb/XKBSetMap.c
+ nx-X11/lib/src/xkb/XKBUse.c
+ nx-X11/lib/src/xkb/XKBleds.c
+ nx-X11/lib/src/xkb/XKBlibint.h
  nx-X11/programs/Xserver/include/xkbfile.h
  nx-X11/programs/Xserver/include/xkbrules.h
  nx-X11/programs/Xserver/include/xkbsrv.h
@@ -1509,77 +1577,78 @@ Files: nx-X11/include/extensions/XKB.h
  nx-X11/programs/Xserver/xkb/xkbout.c
  nx-X11/programs/Xserver/xkb/xkbtext.c
  nx-X11/programs/Xserver/xkb/xkmread.c
-Copyright: 1993, Silicon Graphics Computer Systems, Inc
-  1994, Silicon Graphics Computer Systems, Inc
-  1995, Silicon Graphics Computer Systems, Inc
-  1996, Silicon Graphics Computer Systems, Inc
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/lib/X11/AddDIC.c
- nx-X11/lib/X11/AddSF.c
- nx-X11/lib/X11/CvColW.c
- nx-X11/lib/X11/CvCols.c
- nx-X11/lib/X11/HVC.c
- nx-X11/lib/X11/HVCGcC.c
- nx-X11/lib/X11/HVCGcV.c
- nx-X11/lib/X11/HVCGcVC.c
- nx-X11/lib/X11/HVCMnV.c
- nx-X11/lib/X11/HVCMxC.c
- nx-X11/lib/X11/HVCMxV.c
- nx-X11/lib/X11/HVCMxVC.c
- nx-X11/lib/X11/HVCMxVs.c
- nx-X11/lib/X11/HVCWpAj.c
- nx-X11/lib/X11/IdOfPr.c
- nx-X11/lib/X11/LRGB.c
- nx-X11/lib/X11/Lab.c
- nx-X11/lib/X11/LabGcC.c
- nx-X11/lib/X11/LabGcL.c
- nx-X11/lib/X11/LabGcLC.c
- nx-X11/lib/X11/LabMnL.c
- nx-X11/lib/X11/LabMxC.c
- nx-X11/lib/X11/LabMxL.c
- nx-X11/lib/X11/LabMxLC.c
- nx-X11/lib/X11/LabWpAj.c
- nx-X11/lib/X11/Luv.c
- nx-X11/lib/X11/LuvGcC.c
- nx-X11/lib/X11/LuvGcL.c
- nx-X11/lib/X11/LuvGcLC.c
- nx-X11/lib/X11/LuvMnL.c
- nx-X11/lib/X11/LuvMxC.c
- nx-X11/lib/X11/LuvMxL.c
- nx-X11/lib/X11/LuvMxLC.c
- nx-X11/lib/X11/LuvWpAj.c
- nx-X11/lib/X11/OfCCC.c
- nx-X11/lib/X11/PrOfId.c
- nx-X11/lib/X11/QBlack.c
- nx-X11/lib/X11/QBlue.c
- nx-X11/lib/X11/QGreen.c
- nx-X11/lib/X11/QRed.c
- nx-X11/lib/X11/QWhite.c
- nx-X11/lib/X11/QuCol.c
- nx-X11/lib/X11/QuCols.c
- nx-X11/lib/X11/SetCCC.c
- nx-X11/lib/X11/SetGetCols.c
- nx-X11/lib/X11/StCol.c
- nx-X11/lib/X11/StCols.c
- nx-X11/lib/X11/UNDEFINED.c
- nx-X11/lib/X11/XRGB.c
- nx-X11/lib/X11/XYZ.c
- nx-X11/lib/X11/Xcms.h
- nx-X11/lib/X11/Xcmsint.h
- nx-X11/lib/X11/cmsAllCol.c
- nx-X11/lib/X11/cmsAllNCol.c
- nx-X11/lib/X11/cmsCmap.c
- nx-X11/lib/X11/cmsColNm.c
- nx-X11/lib/X11/cmsGlobls.c
- nx-X11/lib/X11/cmsInt.c
- nx-X11/lib/X11/cmsLkCol.c
- nx-X11/lib/X11/cmsProp.c
- nx-X11/lib/X11/cmsTrig.c
- nx-X11/lib/X11/uvY.c
- nx-X11/lib/X11/xyY.c
-Copyright: 1990, 1991 Tektronix, Inc
+Copyright: 1993, Silicon Graphics Computer Systems, Inc.
+  1994, Silicon Graphics Computer Systems, Inc.
+  1995, Silicon Graphics Computer Systems, Inc.
+  1996, Silicon Graphics Computer Systems, Inc.
+License: UNKNOWN
+ FIXME
+
+Files: nx-X11/lib/include/X11/Xcms.h
+ nx-X11/lib/src/xcms/AddDIC.c
+ nx-X11/lib/src/xcms/AddSF.c
+ nx-X11/lib/src/xcms/CCC.c
+ nx-X11/lib/src/xcms/CvColW.c
+ nx-X11/lib/src/xcms/CvCols.c
+ nx-X11/lib/src/xcms/HVC.c
+ nx-X11/lib/src/xcms/HVCGcC.c
+ nx-X11/lib/src/xcms/HVCGcV.c
+ nx-X11/lib/src/xcms/HVCGcVC.c
+ nx-X11/lib/src/xcms/HVCMnV.c
+ nx-X11/lib/src/xcms/HVCMxC.c
+ nx-X11/lib/src/xcms/HVCMxV.c
+ nx-X11/lib/src/xcms/HVCMxVC.c
+ nx-X11/lib/src/xcms/HVCMxVs.c
+ nx-X11/lib/src/xcms/HVCWpAj.c
+ nx-X11/lib/src/xcms/IdOfPr.c
+ nx-X11/lib/src/xcms/LRGB.c
+ nx-X11/lib/src/xcms/Lab.c
+ nx-X11/lib/src/xcms/LabGcC.c
+ nx-X11/lib/src/xcms/LabGcL.c
+ nx-X11/lib/src/xcms/LabGcLC.c
+ nx-X11/lib/src/xcms/LabMnL.c
+ nx-X11/lib/src/xcms/LabMxC.c
+ nx-X11/lib/src/xcms/LabMxL.c
+ nx-X11/lib/src/xcms/LabMxLC.c
+ nx-X11/lib/src/xcms/LabWpAj.c
+ nx-X11/lib/src/xcms/Luv.c
+ nx-X11/lib/src/xcms/LuvGcC.c
+ nx-X11/lib/src/xcms/LuvGcL.c
+ nx-X11/lib/src/xcms/LuvGcLC.c
+ nx-X11/lib/src/xcms/LuvMnL.c
+ nx-X11/lib/src/xcms/LuvMxC.c
+ nx-X11/lib/src/xcms/LuvMxL.c
+ nx-X11/lib/src/xcms/LuvMxLC.c
+ nx-X11/lib/src/xcms/LuvWpAj.c
+ nx-X11/lib/src/xcms/OfCCC.c
+ nx-X11/lib/src/xcms/PrOfId.c
+ nx-X11/lib/src/xcms/QBlack.c
+ nx-X11/lib/src/xcms/QBlue.c
+ nx-X11/lib/src/xcms/QGreen.c
+ nx-X11/lib/src/xcms/QRed.c
+ nx-X11/lib/src/xcms/QWhite.c
+ nx-X11/lib/src/xcms/QuCol.c
+ nx-X11/lib/src/xcms/QuCols.c
+ nx-X11/lib/src/xcms/SetCCC.c
+ nx-X11/lib/src/xcms/SetGetCols.c
+ nx-X11/lib/src/xcms/StCol.c
+ nx-X11/lib/src/xcms/StCols.c
+ nx-X11/lib/src/xcms/UNDEFINED.c
+ nx-X11/lib/src/xcms/XRGB.c
+ nx-X11/lib/src/xcms/XYZ.c
+ nx-X11/lib/src/xcms/Xcmsint.h
+ nx-X11/lib/src/xcms/cmsAllCol.c
+ nx-X11/lib/src/xcms/cmsAllNCol.c
+ nx-X11/lib/src/xcms/cmsCmap.c
+ nx-X11/lib/src/xcms/cmsColNm.c
+ nx-X11/lib/src/xcms/cmsGlobls.c
+ nx-X11/lib/src/xcms/cmsInt.c
+ nx-X11/lib/src/xcms/cmsLkCol.c
+ nx-X11/lib/src/xcms/cmsProp.c
+ nx-X11/lib/src/xcms/cmsTrig.c
+ nx-X11/lib/src/xcms/uvY.c
+ nx-X11/lib/src/xcms/xyY.c
+Copyright: 1990-1991, Tektronix, Inc.
 License: UNKNOWN
  FIXME
 
@@ -1591,11 +1660,6 @@ Files: nx-X11/extras/Mesa/include/GL/glext.h
  nx-X11/include/GL/glxmd.h
  nx-X11/include/GL/glxproto.h
  nx-X11/include/GL/glxtokens.h
- nx-X11/programs/Xserver/GL/glx/g_disptab.c
- nx-X11/programs/Xserver/GL/glx/g_disptab.h
- nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.c
- nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.h
- nx-X11/programs/Xserver/GL/glx/g_render.c
  nx-X11/programs/Xserver/GL/glx/g_renderswap.c
  nx-X11/programs/Xserver/GL/glx/g_single.c
  nx-X11/programs/Xserver/GL/glx/g_singleswap.c
@@ -1636,9 +1700,9 @@ Files: nx-X11/extras/Mesa/include/GL/glext.h
  nx-X11/programs/Xserver/GL/glx/singlesize.h
  nx-X11/programs/Xserver/GL/glx/unpack.h
  nx-X11/programs/Xserver/GL/glx/xfont.c
-Copyright: 1991-2000, Silicon Graphics, Inc
-  1991-2004, Silicon Graphics, Inc
-License: UNKNOWN
+Copyright: 1991-2000, Silicon Graphics, Inc.
+  1991-2004, Silicon Graphics, Inc.
+License: SGI Free Software License B (v1.1)
  FIXME
 
 Files: nx-X11/programs/Xserver/Xext/xtest1dd.h
@@ -1690,51 +1754,39 @@ Copyright: 1996, Thomas E. Dickey <dickey@clark.net>
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/include/extensions/XI.h
- nx-X11/include/extensions/XIproto.h
- nx-X11/programs/Xserver/Xi/allowev.c
- nx-X11/programs/Xserver/Xi/chgdctl.c
- nx-X11/programs/Xserver/Xi/chgfctl.c
- nx-X11/programs/Xserver/Xi/chgkbd.c
- nx-X11/programs/Xserver/Xi/chgkmap.c
- nx-X11/programs/Xserver/Xi/chgprop.c
- nx-X11/programs/Xserver/Xi/chgptr.c
- nx-X11/programs/Xserver/Xi/closedev.c
- nx-X11/programs/Xserver/Xi/devbell.c
- nx-X11/programs/Xserver/Xi/exevents.c
- nx-X11/programs/Xserver/Xi/extinit.c
- nx-X11/programs/Xserver/Xi/getbmap.c
- nx-X11/programs/Xserver/Xi/getdctl.c
- nx-X11/programs/Xserver/Xi/getfctl.c
- nx-X11/programs/Xserver/Xi/getfocus.c
- nx-X11/programs/Xserver/Xi/getkmap.c
- nx-X11/programs/Xserver/Xi/getmmap.c
- nx-X11/programs/Xserver/Xi/getprop.c
- nx-X11/programs/Xserver/Xi/getselev.c
- nx-X11/programs/Xserver/Xi/getvers.c
- nx-X11/programs/Xserver/Xi/grabdev.c
- nx-X11/programs/Xserver/Xi/grabdevb.c
- nx-X11/programs/Xserver/Xi/grabdevk.c
- nx-X11/programs/Xserver/Xi/gtmotion.c
- nx-X11/programs/Xserver/Xi/listdev.c
- nx-X11/programs/Xserver/Xi/opendev.c
- nx-X11/programs/Xserver/Xi/selectev.c
- nx-X11/programs/Xserver/Xi/sendexev.c
- nx-X11/programs/Xserver/Xi/setbmap.c
- nx-X11/programs/Xserver/Xi/setdval.c
- nx-X11/programs/Xserver/Xi/setfocus.c
- nx-X11/programs/Xserver/Xi/setmmap.c
- nx-X11/programs/Xserver/Xi/setmode.c
- nx-X11/programs/Xserver/Xi/stubs.c
- nx-X11/programs/Xserver/Xi/ungrdev.c
- nx-X11/programs/Xserver/Xi/ungrdevb.c
- nx-X11/programs/Xserver/Xi/ungrdevk.c
-Copyright: 1989, 1998 The Open Group
-  1989, Hewlett-Packard Company, Palo Alto, California
-License: UNKNOWN
+Files: nx-X11/lib/modules/lc/def/lcDefConv.c
+ nx-X11/lib/modules/lc/gen/lcGenConv.c
+ nx-X11/lib/modules/om/generic/omDefault.c
+ nx-X11/lib/modules/om/generic/omGeneric.c
+ nx-X11/lib/modules/om/generic/omImText.c
+ nx-X11/lib/modules/om/generic/omText.c
+ nx-X11/lib/modules/om/generic/omTextEsc.c
+ nx-X11/lib/modules/om/generic/omTextExt.c
+ nx-X11/lib/modules/om/generic/omTextPer.c
+ nx-X11/lib/modules/om/generic/omXChar.c
+ nx-X11/lib/src/OCWrap.c
+ nx-X11/lib/src/OMWrap.c
+ nx-X11/lib/src/XomGeneric.h
+ nx-X11/lib/src/xlibi18n/XlcGeneric.h
+ nx-X11/lib/src/xlibi18n/XlcPubI.h
+ nx-X11/lib/src/xlibi18n/XlcPublic.h
+ nx-X11/lib/src/xlibi18n/lcCT.c
+ nx-X11/lib/src/xlibi18n/lcCharSet.c
+ nx-X11/lib/src/xlibi18n/lcConv.c
+ nx-X11/lib/src/xlibi18n/lcGeneric.c
+ nx-X11/lib/src/xlibi18n/lcPrTxt.c
+ nx-X11/lib/src/xlibi18n/lcPubWrap.c
+ nx-X11/lib/src/xlibi18n/lcPublic.c
+ nx-X11/lib/src/xlibi18n/lcRM.c
+ nx-X11/lib/src/xlibi18n/lcStd.c
+ nx-X11/lib/src/xlibi18n/lcTxtPr.c
+ nx-X11/lib/src/xlibi18n/lcUtil.c
+Copyright: 1992-1993, TOSHIBA Corp.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/Args.c
+Files: nx-X11/include/Xpoll.h.in
+ nx-X11/programs/Xserver/hw/nxagent/Args.c
  nx-X11/programs/Xserver/hw/nxagent/Args.h
  nx-X11/programs/Xserver/hw/nxagent/Colormap.c
  nx-X11/programs/Xserver/hw/nxagent/Colormap.h
@@ -1758,36 +1810,14 @@ Files: nx-X11/programs/Xserver/hw/nxagent/Args.c
  nx-X11/programs/Xserver/hw/nxagent/Screen.h
  nx-X11/programs/Xserver/hw/nxagent/TestExt.c
  nx-X11/programs/Xserver/hw/nxagent/Visual.c
- nx-X11/programs/Xserver/hw/nxagent/Visual.h
-Copyright: 1993, Davor Matic
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/lib/X11/OCWrap.c
- nx-X11/lib/X11/OMWrap.c
- nx-X11/lib/X11/XlcPubI.h
- nx-X11/lib/X11/lcCharSet.c
- nx-X11/lib/X11/lcConv.c
- nx-X11/lib/X11/lcDefConv.c
- nx-X11/lib/X11/lcPrTxt.c
- nx-X11/lib/X11/lcPubWrap.c
- nx-X11/lib/X11/lcPublic.c
- nx-X11/lib/X11/lcRM.c
- nx-X11/lib/X11/lcStd.c
- nx-X11/lib/X11/lcTxtPr.c
- nx-X11/lib/X11/lcUtil.c
- nx-X11/lib/X11/omImText.c
- nx-X11/lib/X11/omTextExt.c
- nx-X11/lib/X11/omTextPer.c
-Copyright: 1992-1993, TOSHIBA Corp
-License: UNKNOWN
+Copyright: 2001, 2011, NoMachine (http:www.nomachine.com)
+  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2014-2016, Mihai Moldovan <ionic@ionic.de>
+  2014-2016, Ulrich Sibiller <uli42@gmx.de>
+  2015-2016, Qindel Group (http:www.qindel.com)
+  of the aforementioned persons and companies.
+License: NTP
  FIXME
 
 Files: nx-X11/include/extensions/render.h
@@ -1805,8 +1835,8 @@ Files: nx-X11/include/extensions/render.h
  nx-X11/programs/Xserver/render/picture.h
  nx-X11/programs/Xserver/render/picturestr.h
  nx-X11/programs/Xserver/render/render.c
-Copyright: 2000, SuSE, Inc
-License: UNKNOWN
+Copyright: 2000, SuSE, Inc.
+License: NTP (legal disclaimer)
  FIXME
 
 Files: nx-X11/include/extensions/dpms.h
@@ -1820,83 +1850,106 @@ Files: nx-X11/include/extensions/dpms.h
  nx-X11/programs/Xserver/Xext/panoramiXSwap.c
  nx-X11/programs/Xserver/Xext/panoramiXprocs.c
  nx-X11/programs/Xserver/dix/dixfonts.c
+ nx-X11/programs/Xserver/include/dixfont.h
+ nx-X11/programs/Xserver/include/dixfontstr.h
+ nx-X11/programs/Xserver/include/dixstruct.h
  nx-X11/programs/Xserver/randr/panoramiXproto.h
-Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts
-  1996, Digital Equipment Corporation, Maynard, Massachusetts
-License: Expat
- FIXME
-
-Files: nx-X11/lib/X11/XimImSw.h
- nx-X11/lib/X11/XimProto.h
- nx-X11/lib/X11/imDefFlt.c
- nx-X11/lib/X11/imDefLkup.c
- nx-X11/lib/X11/imDispch.c
- nx-X11/lib/X11/imExten.c
- nx-X11/lib/X11/imInt.c
- nx-X11/lib/X11/imLcGIc.c
- nx-X11/lib/X11/imLcIc.c
- nx-X11/lib/X11/imLcSIc.c
- nx-X11/lib/X11/imRmAttr.c
+Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts.
+  1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts.
+  1996, Digital Equipment Corporation, Maynard, Massachusetts.
+License: UNKNOWN
+ FIXME
+
+Files: nx-X11/lib/include/xtrans/Xtrans.c
+ nx-X11/lib/include/xtrans/Xtrans.h
+ nx-X11/lib/include/xtrans/Xtransint.h
+ nx-X11/lib/include/xtrans/Xtranslcl.c
+ nx-X11/lib/include/xtrans/Xtransutil.c
+ nx-X11/lib/include/xtrans/transport.c
+ nx-X11/lib/src/xlibi18n/Xlcint.h
+ nx-X11/lib/src/xlibi18n/lcWrap.c
+ nx-X11/lib/src/xlibi18n/mbWrap.c
+ nx-X11/lib/src/xlibi18n/utf8WMProps.c
+ nx-X11/lib/src/xlibi18n/utf8Wrap.c
+ nx-X11/lib/src/xlibi18n/wcWrap.c
+ nx-X11/programs/Xserver/Xext/sync.c
+ nx-X11/programs/Xserver/include/misc.h
+Copyright: 1987, 1998, The Open Group
+  1991, 1993, 1998, The Open Group
+  1991, 1998, The Open Group
+  1993-1994, 1998, The Open Group
+License: NTP (legal disclaimer)
+ FIXME
+
+Files: nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
+ nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
+ nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h
+ nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h
+ nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c
+ nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
+ nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h
+ nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+ nx-X11/programs/Xserver/randr/randr.c
+ nx-X11/programs/Xserver/randr/rrcrtc.c
+ nx-X11/programs/Xserver/randr/rrmode.c
+ nx-X11/programs/Xserver/randr/rrscreen.c
+ nx-X11/programs/Xserver/randr/rrxinerama.c
+Copyright: 2001, 2011, NoMachine (http:www.nomachine.com)
+  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2014-2016, Mihai Moldovan <ionic@ionic.de>
+  2014-2016, Ulrich Sibiller <uli42@gmx.de>
+  2015-2016, Qindel Group (http:www.qindel.com)
+  of the aforementioned persons and companies.
+License: NTP (legal disclaimer)
+ FIXME
+
+Files: nx-X11/lib/modules/im/ximcp/imDefFlt.c
+ nx-X11/lib/modules/im/ximcp/imDefLkup.c
+ nx-X11/lib/modules/im/ximcp/imDispch.c
+ nx-X11/lib/modules/im/ximcp/imExten.c
+ nx-X11/lib/modules/im/ximcp/imInt.c
+ nx-X11/lib/modules/im/ximcp/imLcGIc.c
+ nx-X11/lib/modules/im/ximcp/imLcIc.c
+ nx-X11/lib/modules/im/ximcp/imLcSIc.c
+ nx-X11/lib/modules/im/ximcp/imRmAttr.c
+ nx-X11/lib/src/xlibi18n/XimImSw.h
+ nx-X11/lib/src/xlibi18n/XimProto.h
 Copyright: 1990-1994, FUJITSU LIMITED
   1992-1993, FUJITSU LIMITED
   1992-1994, FUJITSU LIMITED
   1993-1994, FUJITSU LIMITED
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/lib/X11/XlcGeneric.h
- nx-X11/lib/X11/XlcPublic.h
- nx-X11/lib/X11/XomGeneric.h
- nx-X11/lib/X11/lcCT.c
- nx-X11/lib/X11/lcGenConv.c
- nx-X11/lib/X11/lcGeneric.c
- nx-X11/lib/X11/omDefault.c
- nx-X11/lib/X11/omGeneric.c
- nx-X11/lib/X11/omText.c
- nx-X11/lib/X11/omTextEsc.c
- nx-X11/lib/X11/omXChar.c
-Copyright: 1992-1993, TOSHIBA Corp
-  1995, FUJITSU LIMITED
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/include/extensions/Xv.h
- nx-X11/include/extensions/Xvproto.h
- nx-X11/lib/X11/imEvToWire.c
- nx-X11/programs/Xserver/Xext/xvdisp.c
- nx-X11/programs/Xserver/Xext/xvdix.h
- nx-X11/programs/Xserver/Xext/xvmain.c
- nx-X11/programs/Xserver/include/dixfont.h
- nx-X11/programs/Xserver/include/dixfontstr.h
- nx-X11/programs/Xserver/include/dixstruct.h
-Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1991, Digital Equipment Corporation, Maynard, Massachusetts
-  1993, Digital Equipment Corporation, Maynard, Massachusetts
-License: UNKNOWN
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
- nx-X11/programs/Xserver/hw/nxagent/NXevents.c
- nx-X11/programs/Xserver/hw/nxagent/NXextension.c
- nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
- nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
- nx-X11/programs/Xserver/hw/nxagent/NXresource.c
- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
- nx-X11/programs/Xserver/os/WaitFor.c
-Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts
-  1987, 1989, 1998, The Open Group
-  1987, 1998 The Open Group
-  1987, Digital Equipment Corporation, Maynard, Massachusetts
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: doc/libNX_X11/lcUniConv/README
+ nx-X11/config/cf/Imake.rules
+ nx-X11/config/cf/Imake.tmpl
+ nx-X11/config/cf/X11.tmpl
+ nx-X11/extras/Mesa/src/mesa/main/get.c
+ nx-X11/include/Xatom.h
+ nx-X11/lib/src/util/mkks.sh
+ nx-X11/programs/Xserver/dix/buildatoms
+ nx-X11/programs/Xserver/dix/initatoms.c
+ nx-X11/programs/Xserver/xkb/xkbDflts.h
+Copyright: NONE
+License: GENERATED FILE
+ FIXME
+
+Files: nx-X11/lib/modules/im/ximcp/imDefIc.c
+ nx-X11/lib/modules/im/ximcp/imTrX.c
+ nx-X11/lib/modules/im/ximcp/imTrans.c
+ nx-X11/lib/modules/im/ximcp/imTransR.c
+ nx-X11/lib/src/xlibi18n/XimTrInt.h
+ nx-X11/lib/src/xlibi18n/XimTrX.h
+ nx-X11/lib/src/xlibi18n/XimTrans.h
+ nx-X11/lib/src/xlibi18n/XimintP.h
+ nx-X11/programs/Xserver/composite/compoverlay.c
+ nx-X11/programs/Xserver/hw/nxagent/X11/include/Xcomposite_nxagent.h
+Copyright: 1991-1992, Oracle and/or its affiliates.
+  1992, Oracle and/or its affiliates.
+  2006, Oracle and/or its affiliates.
+License: NTP (legal disclaimer)
  FIXME
 
 Files: nx-X11/include/extensions/xfixesproto.h
@@ -1908,35 +1961,10 @@ Files: nx-X11/include/extensions/xfixesproto.h
  nx-X11/programs/Xserver/render/mirect.c
  nx-X11/programs/Xserver/render/mitrap.c
  nx-X11/programs/Xserver/render/mitri.c
-Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc
-  2001, Keith Packard, member of The XFree86 Project, Inc
-  2002, Keith Packard, member of The XFree86 Project, Inc
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/lib/X11/ConnDis.c
- nx-X11/lib/X11/OpenDis.c
- nx-X11/lib/X11/XlibAsync.c
- nx-X11/lib/X11/XlibInt.c
- nx-X11/lib/X11/Xlibint.h
- nx-X11/programs/Xserver/Xext/security.c
- nx-X11/programs/Xserver/hw/nxagent/NXshm.c
- nx-X11/programs/Xserver/os/auth.c
-Copyright: 1984-1985, 1987, 1989, 1998 The Open Group
-  1985-1986, 1998 The Open Group
-  1985-1987, 1998 The Open Group
-  1988, 1998 The Open Group
-  1989, 1998 The Open Group
-  1992, 1998 The Open Group
-  1996, 1998 The Open Group
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc.
+  2001, Keith Packard, member of The XFree86 Project, Inc.
+  2002, Keith Packard, member of The XFree86 Project, Inc.
+License: NTP (legal disclaimer)
  FIXME
 
 Files: 
@@ -1946,24 +1974,10 @@ Files:
  
  
  
-Copyright: 
+Copyright: NONE
 License: 
  FIXME
 
-Files: nx-X11/lib/X11/XimTrInt.h
- nx-X11/lib/X11/XimTrX.h
- nx-X11/lib/X11/XimTrans.h
- nx-X11/lib/X11/imDefIc.c
- nx-X11/lib/X11/imTrX.c
- nx-X11/lib/X11/imTrans.c
- nx-X11/lib/X11/imTransR.c
-Copyright: 1991-1992, Oracle and/or its affiliates.
-  1992, Oracle and/or its affiliates.
-  1992-1994, FUJITSU LIMITED
-  1993-1994, FUJITSU LIMITED
-License: Expat
- FIXME
-
 Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c
  nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h
  nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c
@@ -1971,23 +1985,9 @@ Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c
  nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c
  nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c
  nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S
-Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas
-  2004, Tungsten Graphics Inc., Cedar Park, Texas
-License: Expat
- FIXME
-
-Files: nx-X11/programs/Xserver/dix/dispatch.c
- nx-X11/programs/Xserver/dix/events.c
- nx-X11/programs/Xserver/dix/main.c
- nx-X11/programs/Xserver/dix/resource.c
- nx-X11/programs/Xserver/dix/window.c
- nx-X11/programs/Xserver/mi/miexpose.c
-Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts
-  1987, 1989, 1998, The Open Group
-  1987, 1998 The Open Group
-  1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts
-License: Expat
+Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas.
+  2004, Tungsten Graphics Inc., Cedar Park, Texas.
+License: UNKNOWN
  FIXME
 
 Files: nx-X11/include/extensions/Xdbeproto.h
@@ -1997,55 +1997,49 @@ Files: nx-X11/include/extensions/Xdbeproto.h
  nx-X11/programs/Xserver/dbe/midbe.h
  nx-X11/programs/Xserver/dbe/midbestr.h
 Copyright: 1994-1995, Hewlett-Packard Company
-License: Expat
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/lib/xtrans/Xtrans.c
- nx-X11/lib/xtrans/Xtrans.h
- nx-X11/lib/xtrans/Xtransint.h
- nx-X11/lib/xtrans/Xtranslcl.c
- nx-X11/lib/xtrans/Xtransutil.c
- nx-X11/lib/xtrans/transport.c
-Copyright: 1993-1994, 1998 The Open Group
-  1993-1994, NCR Corporation - Dayton, Ohio, USA
+Files: nx-X11/include/extensions/Xv.h
+ nx-X11/include/extensions/Xvproto.h
+ nx-X11/lib/modules/im/ximcp/imEvToWire.c
+ nx-X11/programs/Xserver/Xext/xvdisp.c
+ nx-X11/programs/Xserver/Xext/xvdix.h
+ nx-X11/programs/Xserver/Xext/xvmain.c
+Copyright: 1991, Digital Equipment Corporation, Maynard, Massachusetts,
+  1993, Digital Equipment Corporation, Maynard, Massachusetts,
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h
- nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c
- nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
- nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h
- nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h
-Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas
-License: Expat
+Files: m4/nx-macros.m4
+ nx-X11/lib/m4/nx-macros.m4
+ nxcomp/m4/nx-macros.m4
+ nxcompshad/m4/nx-macros.m4
+ nxproxy/m4/nx-macros.m4
+Copyright: 2005-2006, Oracle and/or its affiliates.
+  2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+License: GENERATED FILE
  FIXME
 
-Files: nx-X11/lib/X11/XimintL.h
- nx-X11/lib/X11/imImSw.c
- nx-X11/lib/X11/imLcIm.c
- nx-X11/lib/X11/imThaiIc.c
- nx-X11/lib/X11/imThaiIm.c
+Files: nx-X11/lib/modules/im/ximcp/imImSw.c
+ nx-X11/lib/modules/im/ximcp/imLcIm.c
+ nx-X11/lib/modules/im/ximcp/imThaiIc.c
+ nx-X11/lib/modules/im/ximcp/imThaiIm.c
+ nx-X11/lib/src/xlibi18n/XimintL.h
 Copyright: 1991-1994, FUJITSU LIMITED
   1992-1993, FUJITSU LIMITED
   1992-1994, FUJITSU LIMITED
   1993, Digital Equipment Corporation
-License: UNKNOWN
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
- nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h
- nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h
- nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
- nx-X11/programs/Xserver/hw/nxagent/NXrender.c
-Copyright: 2000, SuSE, Inc
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/GL/glx/g_disptab.c
+ nx-X11/programs/Xserver/GL/glx/g_disptab.h
+ nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.c
+ nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.h
+ nx-X11/programs/Xserver/GL/glx/g_render.c
+Copyright: 1991-2000, Silicon Graphics, Inc.
+License: SGI Free Software License B (v1.1) GENERATED FILE
  FIXME
 
 Files: testscripts/run-nxproxy2nxagent-on-localhost
@@ -2053,31 +2047,29 @@ Files: testscripts/run-nxproxy2nxagent-on-localhost
  testscripts/run-nxproxy2nxagent-over-sockets
  testscripts/run-nxproxy2nxproxy
  testscripts/run-nxproxy2nxproxy-over-sockets
-Copyright: 2001, 2011 NoMachine, http://www.nomachine.com/. */
-  2015-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  of the aforementioned persons and companies. */
+Copyright: 2001, 2011, NoMachine, http:www.nomachine.com/.
+  2015-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  of the aforementioned persons and companies.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/include/Sunkeysym.h
- nx-X11/lib/X11/Host.c
- nx-X11/lib/X11/LiHosts.c
- nx-X11/lib/X11/lcInit.c
-Copyright: 1985-1987, 1991, 1998, The Open Group
-  1986, 1998 The Open Group
-  1991, 1998 The Open Group
-  1991, Oracle and/or its affiliates.
-  2000, Oracle and/or its affiliates.
-  2004, Oracle and/or its affiliates.
-License: Expat
+Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h
+ nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c
+ nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
+ nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h
+ nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h
+Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas.
+License: UNKNOWN
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c
- nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h
- nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c
- nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c
-Copyright: 2003, Tungsten Graphics, inc
-License: Expat
+Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h
+Copyright: 1999-2001, Brian Paul
+  1999-2003, Brian Paul
+  IBM Corporation 2004
+License: GENERATED FILE
  FIXME
 
 Files: nx-X11/include/extensions/saver.h
@@ -2085,7 +2077,16 @@ Files: nx-X11/include/extensions/saver.h
  nx-X11/include/extensions/scrnsaver.h
  nx-X11/programs/Xserver/Xext/saver.c
 Copyright: 1992, X Consortium
-License: Expat
+License: MIT/X11 (BSD like)
+ FIXME
+
+Files: nx-X11/include/extensions/xtestext1.h
+ nx-X11/programs/Xserver/Xext/xtest1dd.c
+ nx-X11/programs/Xserver/Xext/xtest1di.c
+ nx-X11/programs/Xserver/mi/mibstore.c
+Copyright: 1986-1988, 1998, The Open Group
+  1987, 1998, The Open Group
+License: NTP
  FIXME
 
 Files: nx-X11/programs/Xserver/miext/cw/cw.c
@@ -2093,22 +2094,25 @@ Files: nx-X11/programs/Xserver/miext/cw/cw.c
  nx-X11/programs/Xserver/miext/cw/cw_ops.c
  nx-X11/programs/Xserver/miext/cw/cw_render.c
 Copyright: 2004, Eric Anholt
-License: UNKNOWN
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c
- nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c
- nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h
-Copyright: 1999-2003, David Airlie
-  2004, David Airlie
-License: Expat
+Files: m4/nx-xtrans.m4
+ nx-X11/include/Sunkeysym.h
+ nx-X11/lib/m4/nx-xtrans.m4
+ nx-X11/lib/modules/im/ximcp/imDefIm.c
+Copyright: 1990-1992, Oracle and/or its affiliates.
+  1991, Oracle and/or its affiliates.
+  2005, Oracle and/or its affiliates.
+License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/FreeEventData.c
- nx-X11/lib/X11/GetEventData.c
- nx-X11/programs/Xserver/include/protocol-versions.h
-Copyright: 2009, Red Hat, Inc
-License: Expat
+Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c
+ nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c
+Copyright: 2003, Tungsten Graphics, inc.
+License: UNKNOWN
  FIXME
 
 Files: bin/nxagent.in
@@ -2116,137 +2120,100 @@ Files: bin/nxagent.in
  mesa-quilt
 Copyright: 2012, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
   2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-License: GPL-3+
- FIXME
-
-Files: nx-X11/include/extensions/xf86bigfont.h
- nx-X11/include/extensions/xf86bigfproto.h
- nx-X11/programs/Xserver/Xext/xf86bigfont.c
-Copyright: 1999-2000, Bruno Haible
-  1999-2000, The XFree86 Project, Inc
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/lib/X11/Context.c
- nx-X11/lib/X11/Quarks.c
- nx-X11/lib/X11/Xrm.c
-Copyright: 1987-1988, 1990 Digital Equipment Corporation, Maynard
-  1987-1988, 1990, 1994, 1998 The Open Group
-  1987-1988, 1990, 1998, The Open Group
-License: UNKNOWN
+License: GPL (v3 or later)
  FIXME
 
-Files: nx-X11/include/extensions/xtestext1.h
- nx-X11/programs/Xserver/Xext/xtest1dd.c
- nx-X11/programs/Xserver/Xext/xtest1di.c
-Copyright: 1986-1988, 1998 The Open Group
-  1986-1988, Hewlett-Packard Corporation
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
- nx-X11/programs/Xserver/randr/rrmode.c
- nx-X11/programs/Xserver/randr/rrscreen.c
-Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */
-  2003, Keith Packard
-  2006, Keith Packard
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c
+ nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h
+Copyright: 1999-2003, David Airlie
+  2004, David Airlie
+License: MIT/X11 (BSD like)
  FIXME
 
 Files: nx-X11/programs/Xserver/include/bstore.h
  nx-X11/programs/Xserver/include/bstorestr.h
  nx-X11/programs/Xserver/mi/mibstore.h
 Copyright: 1987, the Regents of the University of California
+License: NTP
+ FIXME
+
+Files: nx-X11/include/extensions/xf86bigfont.h
+ nx-X11/include/extensions/xf86bigfproto.h
+ nx-X11/programs/Xserver/Xext/xf86bigfont.c
+Copyright: 1999-2000, Bruno Haible
+  1999-2000, The XFree86 Project, Inc.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h
- nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h
-Copyright: 1999-2001, Brian Paul
-  IBM Corporation 2004
-License: Expat
+Files: nx-X11/lib/src/FreeEventData.c
+ nx-X11/lib/src/GetEventData.c
+ nx-X11/programs/Xserver/include/protocol-versions.h
+Copyright: 2009, Red Hat, Inc.
+License: UNKNOWN
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h
- nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h
-Copyright: 1999-2001, Brian Paul
-  1999-2003, Brian Paul
-  IBM Corporation 2004,
-License: Expat
+Files: nx-X11/programs/Xserver/hw/nxagent/Rootless.h
+ nx-X11/programs/Xserver/os/Imakefile
+Copyright: 2001, 2011, NoMachine (http:www.nomachine.com)
+  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2014-2016, Mihai Moldovan <ionic@ionic.de>
+  2014-2016, Ulrich Sibiller <uli42@gmx.de>
+  2015-2016, Qindel Group (http:www.qindel.com)
+  of the aforementioned persons and companies.
+License: GENERATED FILE
  FIXME
 
-Files: nx-X11/programs/Xserver/dix/region.c
- nx-X11/programs/Xserver/mi/mivaltree.c
-Copyright: 1987-1989, 1998 The Open Group
-  1987-1989, by
-  1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts
-License: Expat
+Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c
+ nx-X11/extras/Mesa/src/glx/x11/indirect_size.h
+Copyright: IBM Corporation 2004
+License: GENERATED FILE
  FIXME
 
-Files: nx-X11/lib/X11/XimintP.h
- nx-X11/lib/X11/imDefIm.c
-Copyright: 1990-1992, Oracle and/or its affiliates.
-  1991-1992, Oracle and/or its affiliates.
-  1992-1994, FUJITSU LIMITED
-  1993-1994, Sony Corporation
-License: Expat
+Files: make-changelog.sh
+ regenerate-symbol-docs.sh
+Copyright: 2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+License: GPL (v2 or later)
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
- nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h
-Copyright: IBM Corporation 2003
-License: Expat
+Files: nx-X11/lib/src/Host.c
+ nx-X11/lib/src/LiHosts.c
+Copyright: 1986, 1998, The Open Group
+License: ICU
  FIXME
 
-Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c
- nx-X11/extras/Mesa/src/glx/x11/indirect_size.h
-Copyright: IBM Corporation 2004
-License: Expat
+Files: nx-X11/programs/Xserver/os/strlcat.c
+ nx-X11/programs/Xserver/os/strlcpy.c
+Copyright: 1998, Todd C. Miller <Todd.Miller@courtesan.com>
+License: ISC
  FIXME
 
-Files: nx-X11/programs/Xserver/composite/compoverlay.c
- nx-X11/programs/Xserver/hw/nxagent/X11/include/Xcomposite_nxagent.h
-Copyright: 2003, Keith Packard
-  2006, Oracle and/or its affiliates.
-License: Expat
+Files: nx-X11/extras/Mesa/src/mesa/main/mm.h
+ nx-X11/extras/Mesa/src/mesa/main/simple_list.h
+Copyright: 1997, Keith Whitwell
+  1999, Keith Whitwell
+License: MIT/X11 (BSD like)
  FIXME
 
 Files: nx-X11/programs/Xserver/Xext/sleepuntil.h
  nx-X11/programs/Xserver/mi/micoord.h
 Copyright: 2000, The XFree86 Project, Inc.
   2001, The XFree86 Project, Inc.
-License: Expat
+License: MIT/X11 (BSD like)
  FIXME
 
 Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c
  nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h
 Copyright: 2005, Tungsten Graphics
-License: Expat
- FIXME
-
-Files: make-changelog.sh
- regenerate-symbol-docs.sh
-Copyright: 2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-License: GPL-2+
- FIXME
-
-Files: nx-X11/programs/Xserver/os/strlcat.c
- nx-X11/programs/Xserver/os/strlcpy.c
-Copyright: 1998, Todd C. Miller <Todd.Miller@courtesan.com>
-License: ISC
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/lib/X11/lcUTF8.c
- nx-X11/lib/X11/lcUTF8Load.c
-Copyright: 1993, SunSoft, Inc
+Files: nx-X11/lib/modules/lc/Utf8/lcUTF8Load.c
+ nx-X11/lib/src/xlibi18n/lcUTF8.c
+Copyright: 1993, SunSoft, Inc.
   1999-2000, Bruno Haible
-License: UNKNOWN
+License: NTP (legal disclaimer)
  FIXME
 
 Files: nx-X11/include/extensions/randrproto.h
@@ -2254,62 +2221,57 @@ Files: nx-X11/include/extensions/randrproto.h
 Copyright: 2000, Compaq Computer Corporation
   2002, Hewlett-Packard Company
   2006, Intel Corporation
-  2008, Red Hat, Inc
-License: UNKNOWN
+  2008, Red Hat, Inc.
+License: NTP (legal disclaimer)
  FIXME
 
 Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
- nxcompshad/X11/include/Xrandr_nxcompshad.h
-Copyright: 2000, Compaq Computer Corporation, Inc
-  2002, Hewlett-Packard Company, Inc
+ nxcompshad/src/X11/include/Xrandr_nxcompshad.h
+Copyright: 2000, Compaq Computer Corporation, Inc.
+  2002, Hewlett-Packard Company, Inc.
   2006, Intel Corporation
-  2008, Red Hat, Inc
-License: UNKNOWN
+  2008, Red Hat, Inc.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/os/log.c
- nx-X11/programs/Xserver/os/utils.c
-Copyright: 1987, 1998 The Open Group
-  1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1994, Quarterdeck Office Systems
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/lib/modules/im/ximcp/imLcFlt.c
+ nx-X11/lib/modules/im/ximcp/imLcLkup.c
+Copyright: 1992, 1994, FUJITSU LIMITED
+  1992, Fuji Xerox Co., Ltd.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/lib/X11/GetNrmHint.c
- nx-X11/lib/X11/SetNrmHint.c
-Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1987-1988, 1998 The Open Group
-  1988, Wyse Technology, Inc., San Jose, Ca
-License: UNKNOWN
+Files: nx-X11/lib/modules/im/ximcp/imRm.c
+ nx-X11/lib/src/xlibi18n/Ximint.h
+Copyright: 1990-1994, FUJITSU LIMITED
+  1992-1994, FUJITSU LIMITED
+  1993-1994, Sony Corporation
+  1994, Sony Corporation
+License: NTP (legal disclaimer)
+ FIXME
+
+Files: nx-X11/lib/src/FilterEv.c
+ nx-X11/lib/src/RegstFlt.c
+Copyright: 1990-1991, OMRON Corporation
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/lib/X11/imLcFlt.c
- nx-X11/lib/X11/imLcLkup.c
-Copyright: 1992, 1994 FUJITSU LIMITED
-  1992, Fuji Xerox Co., Ltd
+Files: nx-X11/include/GL/glxint.h
+ nx-X11/programs/Xserver/GL/glx/glxext.c
+Copyright: 1991, -9 Silicon Graphics, Inc.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/Ximint.h
- nx-X11/lib/X11/imRm.c
-Copyright: 1990-1994, FUJITSU LIMITED
-  1992-1994, FUJITSU LIMITED
-  1993-1994, Sony Corporation
-  1994, Sony Corporation
+Files: nx-X11/lib/src/Context.c
+ nx-X11/lib/src/Quarks.c
+Copyright: 1987-1988, 1990, Digital Equipment Corporation, Maynard,
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/TextExt.c
- nx-X11/lib/X11/TextExt16.c
-Copyright: 1989, 1998 The Open Group
-  1995, FUJITSU LIMITED
+Files: nx-X11/lib/src/GetNrmHint.c
+ nx-X11/lib/src/SetNrmHint.c
+Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts,
+  1988, Wyse Technology, Inc., San Jose, Ca,
 License: UNKNOWN
  FIXME
 
@@ -2319,60 +2281,28 @@ Copyright: 1995, Network Computing Devices
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/FilterEv.c
- nx-X11/lib/X11/RegstFlt.c
-Copyright: 1990-1991, 1998 The Open Group
-  1990-1991, OMRON Corporation
-  1991, 1998 The Open Group
-License: UNKNOWN
- FIXME
-
 Files: testscripts/slave-agent
  testscripts/slave-client
-Copyright: 2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/include/GL/glxint.h
- nx-X11/programs/Xserver/GL/glx/glxext.c
-Copyright: 1991-9 Silicon Graphics, Inc.
+Copyright: 2015-2016, Qindel Group (http:www.qindel.com)
+  of the aforementioned persons and companies.
 License: UNKNOWN
  FIXME
 
 Files: nx-X11/programs/Xserver/fb/fbcmap.c
  nx-X11/programs/Xserver/mi/micmap.c
-Copyright: 1987, Sun Microsystems, Inc. Mountain View, CA
-  no-
+Copyright: 1987, Sun Microsystems, Inc. Mountain View, CA.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/Iconify.c
- nx-X11/lib/X11/SetTxtProp.c
-Copyright: 1988, 1998 The Open Group
-  1988, Wyse Technology, Inc., San Jose, Ca
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/lib/X11/GetTxtProp.c
- nx-X11/lib/X11/Withdraw.c
-Copyright: 1988, 1998 The Open Group
-  1988, Wyse Technology, Inc., San Jose, Ca.
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/lib/X11/mbWrap.c
- nx-X11/lib/X11/wcWrap.c
-Copyright: 1991, 1998 The Open Group
-  1991, the Open Software Foundation
+Files: nx-X11/lib/src/Iconify.c
+ nx-X11/lib/src/SetTxtProp.c
+Copyright: 1988, Wyse Technology, Inc., San Jose, Ca.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/FSWrap.c
- nx-X11/lib/X11/lcWrap.c
-Copyright: 1991, 1998 The Open Group
-  1991, the Open Software Foundation
-  1993, the TOSHIBA Corp
+Files: nx-X11/lib/src/GetTxtProp.c
+ nx-X11/lib/src/Withdraw.c
+Copyright: 1988, Wyse Technology, Inc., San Jose, Ca.,
 License: UNKNOWN
  FIXME
 
@@ -2382,189 +2312,112 @@ Copyright: 2002, XFree86 Inc
 License: UNKNOWN
  FIXME
 
-Files: nxcomp/MD5.c
- nxcomp/MD5.h
-Copyright: 1999, 2002 Aladdin Enterprises.
-  1999-2000, 2002 Aladdin Enterprises.
-License: Zlib
- FIXME
-
-Files: nx-X11/lib/X11/utlist.h
-Copyright: 2007-2009, Troy D. Hanson
-License: BSD-2-clause
- FIXME
-
-Files: nx-X11/programs/Xserver/os/xprintf.c
-Copyright: 2004, Alexander Gottwald
-License: Expat
+Files: nx-X11/lib/src/xlibi18n/lcDB.c
+ nx-X11/lib/src/xlibi18n/lcFile.c
+Copyright: IBM Corporation 1993
+License: UNKNOWN
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h
-Copyright: 1997, Keith Whitwell
-  1999-2001, Brian Paul
-License: Expat
+Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+ nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h
+Copyright: IBM Corporation 2003
+License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/UIThrStubs.c
-Copyright: 1995, David E. Wexelblat.
-License: Expat
+Files: doc/nxcomp/DXPC_re-licensed_debug_784565.mbox
+ doc/nxcomp/README.on-retroactive-DXPC-license
+Copyright: states:
+License: UNKNOWN
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
-Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: Expat
+Files: nxcomp/include/MD5.h
+ nxcomp/src/MD5.c
+Copyright: 1999, 2002, Aladdin Enterprises.
+  1999-2000, 2002, Aladdin Enterprises.
+License: zlib/libpng
  FIXME
 
-Files: nx-X11/programs/Xserver/os/access.c
-Copyright: 1987, 1998 The Open Group
-  1987, Digital Equipment Corporation, Maynard, Massachusetts
-  2004, Sun Microsystems, Inc
-License: Expat
+Files: nx-X11/lib/src/utlist.h
+Copyright: 2007-2009, Troy D. Hanson
+License: BSD (unspecified)
  FIXME
 
-Files: nx-X11/programs/Xserver/include/list.h
-Copyright: 2010, Francisco Jerez <currojerez@riseup.net>
-  2010, Intel Corporation
-License: Expat
+Files: nx-X11/lib/m4/ax_define_dir.m4
+Copyright: 2008, Alexandre Oliva
+  2008, Andreas Schwab <schwab@suse.de>
+  2008, Guido U. Draheim <guidod@gmx.de>
+  2008, Stepan Kasal <kasal@ucw.cz>
+License: FSF All Permissive
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h
-Copyright: 1989-95 GROUPE BULL
-License: Expat
+Files: nx-X11/extras/Mesa/src/mesa/main/enums.c
+Copyright: 1999-2005, Brian Paul
+License: GENERATED FILE
  FIXME
 
 Files: nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h
 Copyright: IBM Corporation 2005
-License: Expat
- FIXME
-
-Files: fix-patch-whitespace
-Copyright: 2010, Keith Packard <keithp@keithp.com>
-License: Expat
- FIXME
-
-Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xfixes_nxagent.h
-Copyright: 2002, Keith Packard, member of The XFree86 Project, Inc
-  2006, Oracle and/or its affiliates.
-  2011, Red Hat, Inc
-License: Expat
- FIXME
-
-Files: nx-X11/extras/Mesa/src/mesa/main/mm.h
-Copyright: 1999, Keith Whitwell
-License: Expat
- FIXME
-
-Files: nx-X11/lib/xtrans/Xtranssock.c
-Copyright: 1993-1994, 1998 The Open Group
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2002, Oracle and/or its affiliates.
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: Expat
- FIXME
-
-Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h
-Copyright: 1995, X Consortium
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: Expat
- FIXME
-
-Files: nx-X11/programs/Xserver/composite/compositeext.h
-Copyright: 2009, NVIDIA Corporation
-License: Expat
- FIXME
-
-Files: nx-X11/programs/Xserver/include/client.h
-Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies). All
-License: Expat
+License: GENERATED FILE
  FIXME
 
-Files: nx-X11/programs/Xserver/os/client.c
-Copyright: 1993, 2010, Oracle and/or its affiliates.
-  2010, Nokia Corporation and/or its subsidiary(-ies). All
-License: Expat
+Files: debian/changelog
+Copyright: attributions.
+License: GENERATED FILE
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c
-Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas
-License: Expat
+Files: replace.sh
+Copyright: 2013, Jan Engelhardt <jengelh@inai.de>
+License: GPL (v2 or later)
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/main/mm.c
-Copyright: 1999, Wittawat Yamwong
-License: Expat
+Files: version.sh
+Copyright: 2015, Mihai Moldovan <ionic@ionic.de>
+  2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+License: GPL (v2 or later)
  FIXME
 
 Files: LICENSE.nxcomp
-Copyright: 1995-1996,2000,2006, Brian Pane
-  1996-1997, Zachary Vonler and Brian Pane
-  1999, Kevin Vigor and Brian Pane
-  2000,2003, Gian Filippo Pinzari
-  2000,2006, Gian Filippo Pinzari and Brian Pane</crossed-out>
-  2001,2010, NoMachine (http://www.nomachine.com)
+Copyright: 2000, 2003, Gian Filippo Pinzari
+  2001, 2010, NoMachine (http:www.nomachine.com)
   2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
   2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
   2014-2016, Mihai Moldovan <ionic@ionic.de>
   2014-2016, Ulrich Sibiller <uli42@gmx.de>
-  2015-2016, Qindel Group (http://www.qindel.com)
+  2015-2016, Qindel Group (http:www.qindel.com)
   of the aforementioned
-License: GPL
+License: GPL (v2)
  FIXME
 
 Files: LICENSE
-Copyright: 2001, 2011 NoMachine (http://www.nomachine.com)
+Copyright: 2001, 2011, NoMachine (http:www.nomachine.com)
   2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
   2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
   2014-2016, Mihai Moldovan <ionic@ionic.de>
   2014-2016, Ulrich Sibiller <uli42@gmx.de>
-  2015-2016, Qindel Group (http://www.qindel.com)
-  of the aforementioned holders
-License: GPL
- FIXME
-
-Files: nxcomp/Version.c
-Copyright: 2015, Qindel Formacion y Servicios SL. */
-License: GPL-2
+  2015-2016, Qindel Group (http:www.qindel.com)
+  of the aforementioned copyright holders.
+License: GPL (v2)
  FIXME
 
-Files: replace.sh
-Copyright: 2013, Jan Engelhardt <jengelh@inai.de>
-License: GPL-2+
- FIXME
-
-Files: version.sh
-Copyright: 2015, Mihai Moldovan <ionic@ionic.de>
-  2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-License: GPL-2+
+Files: nxcomp/src/Version.c
+Copyright: 2015, Qindel Formacion y Servicios SL.
+License: GPL (v2)
  FIXME
 
 Files: roll-tarballs.sh
 Copyright: 2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
   2012, Reinhard Tartler <siretart@tauware.de>
-License: GPL-3+
+License: GPL (v3 or later)
+ FIXME
+
+Files: nx-X11/programs/Xserver/os/access.c
+Copyright: 1987, 1998, The Open Group
+  2004, Sun Microsystems, Inc.
+License: ICU
  FIXME
 
 Files: nx-X11/programs/Xserver/os/timingsafe_memcmp.c
-Copyright: 2014, Google Inc
+Copyright: 2014, Google Inc.
 License: ISC
  FIXME
 
@@ -2573,308 +2426,234 @@ Copyright: 2008, Otto Moerbeek <otto@drijf.net>
 License: ISC
  FIXME
 
-Files: doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf
-Copyright: +œ7óY9Ø»¢TŽ÷x²ÛÐ�`>+‡ºUNcf /
-License: UNKNOWN
- FIXME
-
-Files: nx-X11/programs/Xserver/dix/dixutils.c
-Copyright: 1987, 1998 The Open Group
-  1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1988,1991, Adobe Systems Incorporated.
-License: UNKNOWN
- FIXME
-
-Files: doc/nxcomp/README.on-retroactive-DXPC-license
-Copyright: 1995-1996, Brian Pane
-  1996-1997, Zachary Vonler and Brian Pane
-  1999, Kevin Vigor and Brian Pane
-  2000-2001, Gian Filippo Pinzari and Brian Pane
-  states:
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h
+Copyright: 1989, -95 GROUPE BULL
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/lib/X11/utf8WMProps.c
-Copyright: 1991, 1998 The Open Group
-  2000, Bruno Haible
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/os/xprintf.c
+Copyright: 2004, Alexander Gottwald
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/lib/X11/utf8Wrap.c
-Copyright: 1991, 1998 The Open Group
-  1991, the Open Software Foundation
-  2000, Bruno Haible
-License: UNKNOWN
+Files: nx-X11/lib/src/UIThrStubs.c
+Copyright: 1995, David E. Wexelblat.
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/include/extensions/randr.h
-Copyright: 2000, Compaq Computer Corporation
-  2002, Hewlett Packard Company
-  2006, Intel Corporation
-  2008, Red Hat, Inc
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h
+Copyright: 2001, 2011, NoMachine (http:www.nomachine.com)
+  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2014-2016, Mihai Moldovan <ionic@ionic.de>
+  2014-2016, Ulrich Sibiller <uli42@gmx.de>
+  2015-2016, Qindel Group (http:www.qindel.com)
+  of the aforementioned persons and companies.
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/programs/Xserver/randr/randr.c
-Copyright: 2000, Compaq Computer Corporation
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2002, Hewlett-Packard Company
-  2006, Intel Corporation
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/include/client.h
+Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies). All
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/include/Xpoll.h.in
-Copyright: 1994, 1998 The Open Group
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2005, Daniel Stone
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/os/client.c
+Copyright: 1993, 2010, Oracle and/or its affiliates.
+  2010, Nokia Corporation and/or its subsidiary(-ies). All
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/programs/Xserver/include/misc.h
-Copyright: 1987, 1998 The Open Group
-  1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1992-1993, Data General Corporation;
-  1992-1993, OMRON Corporation
-License: UNKNOWN
+Files: nx-X11/lib/src/xlibi18n/lcInit.c
+Copyright: 1985-1987, 1991, 1998, The Open Group
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h
-Copyright: 2004, David Airlie
-License: UNKNOWN
+Files: nx-X11/extras/Mesa/src/mesa/main/mm.c
+Copyright: 1999, Wittawat Yamwong
+License: MIT/X11 (BSD like)
  FIXME
 
-Files: nx-X11/lib/X11/imCallbk.c
-Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts
-  1994, FUJITSU LIMITED
-  1994, Sony Corporation
-License: UNKNOWN
+Files: nx-X11/include/Xarch.h
+Copyright: 1997, Metro Link Incorporated
+License: NTP
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
-Copyright: 1991, Digital Equipment Corporation, Maynard, Massachusetts
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/os/xdmcp.c
+Copyright: 1989, Network Computing Devices, Inc., Mountain View, California.
+License: NTP
  FIXME
 
-Files: nx-X11/lib/X11/WMProps.c
-Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts
-  1987-1988, 1993, 1998, The Open Group
-  1988, Wyse Technology, Inc., San Jose, Ca.
-License: UNKNOWN
+Files: nx-X11/include/extensions/randr.h
+Copyright: 2000, Compaq Computer Corporation
+  2002, Hewlett Packard Company
+  2006, Intel Corporation
+  2008, Red Hat, Inc.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/lib/X11/imConv.c
-Copyright: 1991-1992, Fuji Xerox Co.,Ltd
+Files: nx-X11/lib/src/imConv.c
+Copyright: 1991-1992, Fuji Xerox Co.,Ltd.
   1993-1994, FUJITSU LIMITED
-License: UNKNOWN
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/lib/X11/lcDB.c
-Copyright: 1995, FUJITSU LIMITED
-  IBM Corporation 1993
-License: UNKNOWN
+Files: nx-X11/lib/modules/im/ximcp/imLcPrs.c
+Copyright: 1992, Fuji Xerox Co., Ltd.
+  1992, Oki Technosystems Laboratory, Inc.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: COPYING
-Copyright: 1989, 1991 Free Software Foundation, Inc.
-  the software, and
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/randr/rroutput.c
+Copyright: 2006, Keith Packard
+  2008, Red Hat, Inc.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/lib/X11/imLcPrs.c
-Copyright: 1992, Fuji Xerox Co., Ltd
-  1992, Oki Technosystems Laboratory, Inc
-License: UNKNOWN
+Files: nx-X11/lib/src/SetLocale.c
+Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation,
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
-Copyright: 2008, Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/lib/src/xlibi18n/ICWrap.c
+Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation,
+  1991, the Open Software Foundation
+  1993, the FUJITSU LIMITED
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/lib/X11/lcFile.c
-Copyright: IBM Corporation 1993
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xfixes_nxagent.h
+Copyright: 2006, Oracle and/or its affiliates.
+  2011, Red Hat, Inc.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/lib/X11/Xprivate.h
-Copyright: 2008, Jamey Sharp, Josh Triplett
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/randr/rrprovider.c
+Copyright: 2012, Red Hat Inc.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/randr/rrcrtc.c
-Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */
-  2006, Keith Packard
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2010, Red Hat, Inc
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/lib/modules/im/ximcp/imInsClbk.c
+Copyright: 1993-1994, Sony Corporation
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/randr/rrxinerama.c
-Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */
-  2001-2005, Thomas Winischhofer, Vienna, Austria
-  2006, Keith Packard
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/lib/src/xlibi18n/IMWrap.c
+Copyright: 1991, the Open Software Foundation
+  1993-1994, the Sony Corporation
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/randr/rroutput.c
-Copyright: 2006, Keith Packard
-  2008, Red Hat, Inc
-License: UNKNOWN
+Files: nx-X11/lib/src/FSWrap.c
+Copyright: 1991, the Open Software Foundation
+  1993, the TOSHIBA Corp.
+License: NTP (legal disclaimer)
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c
-Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */
-  2002, Keith Packard, member of The XFree86 Project, Inc
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
-License: UNKNOWN
+Files: nx-X11/programs/Xserver/hw/nxagent/Visual.h
+Copyright: 2001, 2011, NoMachine (http:www.nomachine.com)
+  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2014-2016, Mihai Moldovan <ionic@ionic.de>
+  2014-2016, Ulrich Sibiller <uli42@gmx.de>
+  2015-2016, Qindel Group (http:www.qindel.com)
+  of the aforementioned persons and companies.
+License: NTP GENERATED FILE
  FIXME
 
-Files: nx-X11/include/Xarch.h
-Copyright: 1997, Metro Link Incorporated
+Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h
+Copyright: 2004, David Airlie
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
-Copyright: 1991-9 Silicon Graphics, Inc.
-  2001, 2011 NoMachine (http://www.nomachine.com) */
-  2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-  2014-2016, Mihai Moldovan <ionic@ionic.de> */
-  2014-2016, Ulrich Sibiller <uli42@gmx.de> */
-  2015-2016, Qindel Group (http://www.qindel.com) */
-  of the aforementioned persons and companies. */
+Files: nx-X11/lib/src/Xrm.c
+Copyright: 1987-1988, 1990, Digital Equipment Corporation, Maynard
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
-Copyright: 1984, - 1991, 1993-1994, 1998 The Open Group
-  2011, - 2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Files: nx-X11/lib/modules/im/ximcp/imCallbk.c
+Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts,
+  1994, FUJITSU LIMITED
+  1994, Sony Corporation
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/programs/Xserver/os/xdmcp.c
-Copyright: 1989, Network Computing Devices, Inc., Mountain View, California
+Files: nx-X11/programs/Xserver/include/list.h
+Copyright: 2010, Francisco Jerez <currojerez@riseup.net>
+  2010, Intel Corporation
 License: UNKNOWN
  FIXME
 
-Files: nxproxy/Main.c
-Copyright: 2001, 2011 NoMachine, http://www.nomachine.com/. */
-  of NoMachine. Redistribution and use of the present */
+Files: COPYING
+Copyright: 1989, 1991, Free Software Foundation, Inc.,
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/Xlcint.h
-Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation
-  1991, 1998 The Open Group
-  1991, the Open Software Foundation
-  1993, the TOSHIBA Corp
-  1993-1994, Sony Corporation
-  1993-1994, the FUJITSU LIMITED
+Files: nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
+Copyright: 2008, Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de>
+  of the aforementioned persons and companies.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/SetLocale.c
-Copyright: 1987,1998, The Open Group
-  1990-1991, OMRON Corporation, NTT Software Corporation
+Files: nx-X11/lib/src/Xprivate.h
+Copyright: 2008, Jamey Sharp, Josh Triplett
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/ICWrap.c
-Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation
-  1991, 1998 The Open Group
-  1991, the Open Software Foundation
-  1993, the FUJITSU LIMITED
+Files: fix-patch-whitespace
+Copyright: 2010, Keith Packard <keithp@keithp.com>
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/programs/Xserver/randr/rrprovider.c
-Copyright: 2012, Red Hat Inc
+Files: nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+Copyright: 1984-1991, 1993-1994, 1998, The Open Group
+  2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/imInsClbk.c
-Copyright: 1993-1994, Sony Corporation
+Files: nx-X11/programs/Xserver/composite/compositeext.h
+Copyright: 2009, NVIDIA Corporation
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/Xcms.txt
-Copyright: 1990, 1991 Tektronix Inc
+Files: nxproxy/src/Main.c
+Copyright: 2001, 2011, NoMachine, http:www.nomachine.com/.
+  of NoMachine. Redistribution and use of the present
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/CCC.c
-Copyright: 1990, 1991 Tektronix, Inc
-  1994, 1998 The Open Group
+Files: nx-X11/lib/src/xcms/Xcms.txt
+Copyright: 1990-1991, Tektronix Inc.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/Font.c
-Copyright: 1986, 1998 The Open Group
-  2000, The XFree86 Project, Inc
+Files: nx-X11/lib/src/Font.c
+Copyright: 1986, 1998, The Open Group
+  2000, The XFree86 Project, Inc.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/lib/X11/IMWrap.c
-Copyright: 1991, 1998 The Open Group
-  1991, the Open Software Foundation
-  1993-1994, the Sony Corporation
+Files: nx-X11/include/Xdefs.h
+Copyright: 1999, The XFree86 Project Inc.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/programs/Xserver/mi/mibstore.c
-Copyright: 1987, 1998 The Open Group
-  1987, the Regents of the University of California
+Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c
+Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas.
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/include/Xdefs.h
-Copyright: 1999, The XFree86 Project Inc
+Files: debian/copyright
+Copyright: -format/1.0/
 License: UNKNOWN
  FIXME
 
-Files: debian/changelog
-Copyright: attributions
+Files: ChangeLog
+Copyright: Update copyright attributions.
 License: UNKNOWN
  FIXME
 
-Files: doc/nxcomp/DXPC_re-licensed_debug_784565.mbox
-Copyright: states:
+Files: doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf
+Copyright: ê²�#zü�7VSٌB§Ùܾ»Q,ì¯ñ—¥7»²À5s
 License: UNKNOWN
  FIXME
 
diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols
index 2901c1d83..ed6bcf8e5 100644
--- a/debian/libnx-x11-6.symbols
+++ b/debian/libnx-x11-6.symbols
@@ -134,7 +134,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  XEHeadOfExtensionList@Base 3.5.0.29
  XESetBeforeFlush@Base 3.5.0.29
  XESetCloseDisplay@Base 3.5.0.29
- XESetCopyEventCookie@Base 2:3.5.99.2
+ XESetCopyEventCookie@Base 3.5.99.2
  XESetCopyGC@Base 3.5.0.29
  XESetCreateFont@Base 3.5.0.29
  XESetCreateGC@Base 3.5.0.29
@@ -147,7 +147,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  XESetPrintErrorValues@Base 3.5.0.29
  XESetWireToError@Base 3.5.0.29
  XESetWireToEvent@Base 3.5.0.29
- XESetWireToEventCookie@Base 2:3.5.99.2
+ XESetWireToEventCookie@Base 3.5.99.2
  XEmptyRegion@Base 3.5.0.29
  XEnableAccessControl@Base 3.5.0.29
  XEqualRegion@Base 3.5.0.29
@@ -174,7 +174,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  XFreeColormap@Base 3.5.0.29
  XFreeColors@Base 3.5.0.29
  XFreeCursor@Base 3.5.0.29
- XFreeEventData@Base 2:3.5.99.2
+ XFreeEventData@Base 3.5.99.2
  XFreeExtensionList@Base 3.5.0.29
  XFreeFont@Base 3.5.0.29
  XFreeFontInfo@Base 3.5.0.29
@@ -194,7 +194,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  XGetDefault@Base 3.5.0.29
  XGetErrorDatabaseText@Base 3.5.0.29
  XGetErrorText@Base 3.5.0.29
- XGetEventData@Base 2:3.5.99.2
+ XGetEventData@Base 3.5.99.2
  XGetFontPath@Base 3.5.0.29
  XGetFontProperty@Base 3.5.0.29
  XGetGCValues@Base 3.5.0.29
@@ -819,7 +819,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XCloseLC@Base 3.5.0.29
  _XColor_to_XcmsRGB@Base 3.5.0.29
  _XConnectDisplay@Base 3.5.0.29
- _XCopyEventCookie@Base 2:3.5.99.2
+ _XCopyEventCookie@Base 3.5.99.2
  _XCopyToArg@Base 3.5.0.29
  _XCreateMutex_fn@Base 3.5.0.29
   (arch=amd64 ia64 alpha ppc64 arm64)_XData32@Base 3.5.0.29
@@ -838,13 +838,13 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XEventsQueued@Base 3.5.0.29
  _XF86BigfontFreeFontMetrics@Base 3.5.0.29
  _XF86LoadQueryLocaleFont@Base 3.5.0.29
- _XFetchEventCookie@Base 2:3.5.99.2
+ _XFetchEventCookie@Base 3.5.99.2
  _XFlush@Base 3.5.0.29
  _XFlushGCCache@Base 3.5.0.29
  _XFreeAtomTable@Base 3.5.0.29
  _XFreeDisplayLock_fn@Base 3.5.0.29
  _XFreeDisplayStructure@Base 3.5.0.29
- _XFreeEventCookies@Base 2:3.5.99.2
+ _XFreeEventCookies@Base 3.5.99.2
  _XFreeExtData@Base 3.5.0.29
  _XFreeMutex_fn@Base 3.5.0.29
  _XFreeTemp@Base 3.5.0.29
@@ -857,7 +857,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XGetScanlinePad@Base 3.5.0.29
  _XGetWindowAttributes@Base 3.5.0.29
  _XHeadOfDisplayList@Base 3.5.0.29
-#MISSING: 3.5.99.2# _XIDHandler@Base 2:3.5.99.2
+#MISSING: 3.5.99.2# _XIDHandler@Base 3.5.99.2
  _XIMCompileResourceList@Base 3.5.0.29
  _XIOError@Base 3.5.0.29
  _XIOErrorFunction@Base 3.5.0.29
@@ -866,7 +866,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XInitImageFuncPtrs@Base 3.5.0.29
  _XInitKeysymDB@Base 3.5.0.29
  _XInitOM@Base 3.5.0.29
- _XIsEventCookie@Base 2:3.5.99.2
+ _XIsEventCookie@Base 3.5.99.2
  _XKeyInitialize@Base 3.5.0.29
  _XKeycodeToKeysym@Base 3.5.0.29
  _XKeysymToKeycode@Base 3.5.0.29
@@ -881,7 +881,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XPollfdCacheAdd@Base 3.5.0.29
  _XPollfdCacheDel@Base 3.5.0.29
  _XPollfdCacheInit@Base 3.5.0.29
- _XProcessInternalConnection@Base 2:3.5.99.2
+ _XProcessInternalConnection@Base 3.5.99.2
  _XProcessWindowAttributes@Base 3.5.0.29
  _XPutBackEvent@Base 3.5.0.29
  (arch=amd64 ia64 alpha ppc64 arm64)_XRead32@Base 3.5.0.29
@@ -898,22 +898,22 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XSelect@Base 3.5.0.29
  _XSend@Base 3.5.0.29
  _XSendClientPrefix@Base 3.5.0.29
-#MISSING: 3.5.99.2# _XSeqSyncFunction@Base 2:3.5.99.2
+#MISSING: 3.5.99.2# _XSeqSyncFunction@Base 3.5.99.2
  _XSetClipRectangles@Base 3.5.0.29
  _XSetImage@Base 3.5.0.29
  _XSetLastRequestRead@Base 3.5.0.29
-#MISSING: 3.5.99.2# _XSetPrivSyncFunction@Base 2:3.5.99.2
-#MISSING: 3.5.99.2# _XSetSeqSyncFunction@Base 2:3.5.99.2
- _XStoreEventCookie@Base 2:3.5.99.2
+#MISSING: 3.5.99.2# _XSetPrivSyncFunction@Base 3.5.99.2
+#MISSING: 3.5.99.2# _XSetSeqSyncFunction@Base 3.5.99.2
+ _XStoreEventCookie@Base 3.5.99.2
  _XTextHeight16@Base 3.5.0.29
  _XTextHeight@Base 3.5.0.29
  _XTranslateKey@Base 3.5.0.29
  _XTranslateKeySym@Base 3.5.0.29
 #MISSING: 2:3.5.99.9# _XTryShapeBitmapCursor@Base 3.5.0.29
- _XUnknownCopyEventCookie@Base 2:3.5.99.2
+ _XUnknownCopyEventCookie@Base 3.5.99.2
  _XUnknownNativeEvent@Base 3.5.0.29
  _XUnknownWireEvent@Base 3.5.0.29
- _XUnknownWireEventCookie@Base 2:3.5.99.2
+ _XUnknownWireEventCookie@Base 3.5.99.2
  _XUnlockMutex_fn@Base 3.5.0.29
  _XUnregisterFilter@Base 3.5.0.29
  _XUnregisterInternalConnection@Base 3.5.0.29
@@ -1017,7 +1017,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XimGetICValueData@Base 3.5.0.29
  _XimGetIMValueData@Base 3.5.0.29
  _XimGetLocaleCode@Base 3.5.0.29
- _XimGetMyEndian@Base 2:3.5.99.2
+ _XimGetMyEndian@Base 3.5.99.2
  _XimGetResourceListRec@Base 3.5.0.29
  _XimGetResourceListRecByQuark@Base 3.5.0.29
  _XimGetWindowEventmask@Base 3.5.0.29
@@ -1156,7 +1156,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XkeyTable@Base 3.5.0.29
  _XlcAddCT@Base 3.5.0.29
  _XlcAddCharSet@Base 3.5.0.29
- _XlcAddGB18030LocaleConverters@Base 2:3.5.99.2
+ _XlcAddGB18030LocaleConverters@Base 3.5.99.2
  _XlcAddLoader@Base 3.5.0.29
  _XlcAddUtf8Converters@Base 3.5.0.29
  _XlcAddUtf8LocaleConverters@Base 3.5.0.29
@@ -1189,7 +1189,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _XlcInitCTInfo@Base 3.5.0.29
  _XlcInitLoader@Base 3.5.0.29
  _XlcLocaleDirName@Base 3.5.0.29
- _XlcLocaleLibDirName@Base 2:3.5.99.2
+ _XlcLocaleLibDirName@Base 3.5.99.2
  _XlcMapOSLocaleName@Base 3.5.0.29
  _XlcNCompareISOLatin1@Base 3.5.0.29
  _XlcOpenConverter@Base 3.5.0.29
@@ -1271,4 +1271,4 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
  _qfree@Base 3.5.0.29
 #MISSING: 3.5.99.2# in6addr_any@Base 3.5.0.29
  read_EncodingInfo@Base 3.5.0.29
- xlocaledir@Base 2:3.5.99.2
+ xlocaledir@Base 3.5.99.2
diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install
index 169f0f6ef..6767e4d19 100644
--- a/debian/libnx-x11-dev.install
+++ b/debian/libnx-x11-dev.install
@@ -1,8 +1,6 @@
-usr/lib/*/libNX_X11.so
-usr/lib/*/libNX_X11.a
 usr/include/*/nx-X11/ImUtil.h
-usr/include/*/nx-X11/Xauth.h
 usr/include/*/nx-X11/XKBlib.h
+usr/include/*/nx-X11/Xauth.h
 usr/include/*/nx-X11/Xcms.h
 usr/include/*/nx-X11/Xlib.h
 usr/include/*/nx-X11/XlibConf.h
@@ -14,4 +12,6 @@ usr/include/*/nx-X11/Xutil.h
 usr/include/*/nx-X11/cursorfont.h
 usr/include/*/nx-X11/misc.h
 usr/include/*/nx-X11/os.h
+usr/lib/*/libNX_X11.a
+usr/lib/*/libNX_X11.so
 usr/lib/*/pkgconfig/nx-x11.pc
diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install
index f73422f40..89f20a453 100644
--- a/debian/libxcomp-dev.install
+++ b/debian/libxcomp-dev.install
@@ -1,9 +1,9 @@
-usr/lib/*/libXcomp.so
-usr/lib/*/libXcomp.a
+usr/include/*/nx/MD5.h
 usr/include/*/nx/NX.h
 usr/include/*/nx/NXalert.h
 usr/include/*/nx/NXpack.h
 usr/include/*/nx/NXproto.h
 usr/include/*/nx/NXvars.h
-usr/include/*/nx/MD5.h
-usr/lib/*/pkgconfig/nxcomp.pc
\ No newline at end of file
+usr/lib/*/libXcomp.a
+usr/lib/*/libXcomp.so
+usr/lib/*/pkgconfig/nxcomp.pc
diff --git a/debian/libxcomp3.docs b/debian/libxcomp3.docs
index 8861756ba..0b15e2cfc 100644
--- a/debian/libxcomp3.docs
+++ b/debian/libxcomp3.docs
@@ -1,2 +1,2 @@
-doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf
 doc/nxcomp/README.on-retroactive-DXPC-license
+doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf
diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install
index 68318ee03..e0114c1e6 100644
--- a/debian/libxcompshad-dev.install
+++ b/debian/libxcompshad-dev.install
@@ -1,4 +1,4 @@
-usr/lib/*/libXcompshad.so
-usr/lib/*/libXcompshad.a
 usr/include/*/nx/Shadow.h
+usr/lib/*/libXcompshad.a
+usr/lib/*/libXcompshad.so
 usr/lib/*/pkgconfig/nxcompshad.pc
diff --git a/debian/libxcompshad-dev.links b/debian/libxcompshad-dev.links
index adeb7ecb5..68e40471c 100644
--- a/debian/libxcompshad-dev.links
+++ b/debian/libxcompshad-dev.links
@@ -1,2 +1 @@
 usr/share/doc/libxcompshad3 usr/share/doc/libxcompshad3-dev
-
diff --git a/debian/nx-x11proto-composite-dev.install b/debian/nx-x11proto-composite-dev.install
index cf2c77e36..2e2a8ca3b 100644
--- a/debian/nx-x11proto-composite-dev.install
+++ b/debian/nx-x11proto-composite-dev.install
@@ -1,2 +1,2 @@
 usr/include/*/nx-X11/extensions/composite.h
-usr/include/*/nx-X11/extensions/compositeproto.h
\ No newline at end of file
+usr/include/*/nx-X11/extensions/compositeproto.h
diff --git a/debian/nx-x11proto-damage-dev.install b/debian/nx-x11proto-damage-dev.install
index 1503260cf..8fc4e6668 100644
--- a/debian/nx-x11proto-damage-dev.install
+++ b/debian/nx-x11proto-damage-dev.install
@@ -1,2 +1,2 @@
-usr/include/*/nx-X11/extensions/damagewire.h
 usr/include/*/nx-X11/extensions/damageproto.h
+usr/include/*/nx-X11/extensions/damagewire.h
diff --git a/debian/nx-x11proto-render-dev.install b/debian/nx-x11proto-render-dev.install
index f2222d234..c0cde3eb3 100644
--- a/debian/nx-x11proto-render-dev.install
+++ b/debian/nx-x11proto-render-dev.install
@@ -1,3 +1,2 @@
 usr/include/*/nx-X11/extensions/render.h
 usr/include/*/nx-X11/extensions/renderproto.h
-
diff --git a/debian/nx-x11proto-scrnsaver-dev.install b/debian/nx-x11proto-scrnsaver-dev.install
index 952a6c52f..5a04b360b 100644
--- a/debian/nx-x11proto-scrnsaver-dev.install
+++ b/debian/nx-x11proto-scrnsaver-dev.install
@@ -1,3 +1,3 @@
 usr/include/*/nx-X11/extensions/saver.h
 usr/include/*/nx-X11/extensions/saverproto.h
-usr/include/*/nx-X11/extensions/scrnsaver.h
\ No newline at end of file
+usr/include/*/nx-X11/extensions/scrnsaver.h
diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install
index 26a719b01..fb97e99cb 100644
--- a/debian/nx-x11proto-xext-dev.install
+++ b/debian/nx-x11proto-xext-dev.install
@@ -1,3 +1,4 @@
+usr/include/*/nx-X11/extensions/Xdbeproto.h
 usr/include/*/nx-X11/extensions/bigreqstr.h
 usr/include/*/nx-X11/extensions/dpms.h
 usr/include/*/nx-X11/extensions/dpmsstr.h
@@ -6,10 +7,9 @@ usr/include/*/nx-X11/extensions/security.h
 usr/include/*/nx-X11/extensions/securstr.h
 usr/include/*/nx-X11/extensions/sync.h
 usr/include/*/nx-X11/extensions/syncstr.h
-usr/include/*/nx-X11/extensions/xf86bigfproto.h
-usr/include/*/nx-X11/extensions/xf86bigfont.h
 usr/include/*/nx-X11/extensions/xcmiscstr.h
-usr/include/*/nx-X11/extensions/Xdbeproto.h
+usr/include/*/nx-X11/extensions/xf86bigfont.h
+usr/include/*/nx-X11/extensions/xf86bigfproto.h
 usr/include/*/nx-X11/extensions/xtestconst.h
 usr/include/*/nx-X11/extensions/xtestext1.h
 usr/include/*/nx-X11/extensions/xteststr.h
diff --git a/debian/nx-x11proto-xfixes-dev.install b/debian/nx-x11proto-xfixes-dev.install
index 91eae0306..b276f09a7 100644
--- a/debian/nx-x11proto-xfixes-dev.install
+++ b/debian/nx-x11proto-xfixes-dev.install
@@ -1,3 +1,2 @@
-usr/include/*/nx-X11/extensions/xfixeswire.h
 usr/include/*/nx-X11/extensions/xfixesproto.h
-
+usr/include/*/nx-X11/extensions/xfixeswire.h
diff --git a/debian/nxagent.install b/debian/nxagent.install
index 87ba3583f..3f9525906 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,9 +1,9 @@
 etc/nxagent/keystrokes.cfg
-usr/share/nx/VERSION.nxagent
-usr/share/man/man1/nxagent.1*
-usr/lib/*/nx/X11/
+etc/nxagent/nxagent.keyboard
 usr/bin/nxagent
+usr/lib/*/nx/X11/
+usr/share/man/man1/nxagent.1*
+usr/share/nx/VERSION.nxagent
 usr/share/pixmaps/nxagent.xpm
-etc/nxagent/nxagent.keyboard
 # FIXME: compatibility symlink, drop for 3.6.0 release
 usr/lib/*/nx/bin/nxagent
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch
deleted file mode 100644
index a2a0f9f45..000000000
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: FHS adaptation for Debian packaging
-Abstract:
- On Debian, binaries are installed to /usr/<lib>/nx.
- .
- Also, a fake-libX11 library symlink is placed into
- /usr/<lib>/nx/X11.
- .
- The given paths will be overridden by the Debian packaging
- and modified into multi-arch paths.
-
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2017-02-08
-
---- a/nx-X11/config/cf/Imake.tmpl
-+++ b/nx-X11/config/cf/Imake.tmpl
-@@ -736,7 +736,7 @@
- #define AlternateUsrLibDir YES
- #endif
- #else
--#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11)
-+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11)
- #ifndef AlternateUsrLibDir
- #define AlternateUsrLibDir NO
- #endif
-@@ -754,7 +754,7 @@
- #define AlternateUsrDataDir YES
- #endif
- #else
--#define UsrDataDir Concat4(/usr/local,/,share,/nx)
-+#define UsrDataDir Concat4(/usr,/,share,/nx)
- #ifndef AlternateUsrDataDir
- #define AlternateUsrDataDir NO
- #endif
---- a/nx-X11/config/cf/site.def
-+++ b/nx-X11/config/cf/site.def
-@@ -69,7 +69,7 @@
- #ifdef AfterVendorCF
- 
- #ifndef ProjectRoot
--#define ProjectRoot /usr/local
-+#define ProjectRoot /usr
- #endif
- 
- /*
diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
deleted file mode 100644
index b3186a9b4..000000000
--- a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: FHS path fix for SecurityPolicy file
- This patch is needed on Debian only, not reporting this path
- change to upstream.
- .
- Originally contributed by Marcelo Boveto Shima <marceloshima@gmail.com>.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2012-01-12
---- a/nx-X11/programs/Xserver/Xext/security.c
-+++ b/nx-X11/programs/Xserver/Xext/security.c
-@@ -84,7 +84,7 @@
- 
- #ifdef NXAGENT_SERVER
- 
--#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy"
-+#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy"
- 
- #endif
- 
diff --git a/debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch b/debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
deleted file mode 100644
index ab16864df..000000000
--- a/debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
+++ /dev/null
@@ -1,1870 +0,0 @@
---- a/nxcomp/ClientChannel.cpp
-+++ b/nxcomp/ClientChannel.cpp
-@@ -447,6 +447,26 @@
-         }
-       }
- 
-+      // Get other bits of the header, so will not need to refer to them again
-+      unsigned char inputDataByte = inputMessage[1];
-+      unsigned int buffer2 = GetUINT(inputMessage + 2, bigEndian_);
-+      unsigned int inputDataSize = buffer2 - 1;
-+      if (buffer2 == 0)
-+      {
-+        // BIG-REQUESTS
-+        inputMessage += 4;
-+        inputLength -= 4;
-+        inputDataSize = GetULONG(inputMessage, bigEndian_) - 2;
-+      }
-+      if (inputLength != (4 * (inputDataSize + 1)))
-+      {
-+        #ifdef WARNING
-+        *logofs << "handleRead: inputLength=" << inputLength
-+                << " mismatch inputDataSize=" << inputDataSize
-+                << ".\n" << logofs_flush;
-+        #endif
-+      }
-+
-       //
-       // Go to the message's specific encoding.
-       //
-@@ -455,6 +475,11 @@
-       {
-       case X_AllocColor:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 14)
-+            *logofs << "handleRead: X_AllocColor inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                              clientCache_ -> colormapCache);
-           const unsigned char *nextSrc = inputMessage + 8;
-@@ -476,6 +501,11 @@
-         break;
-       case X_ReparentWindow:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_ReparentWindow inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
-@@ -486,6 +516,11 @@
-         break;
-       case X_ChangeProperty:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 24)
-+            *logofs << "handleRead: X_ChangeProperty inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           MessageStore *messageStore = clientStore_ ->
-                                getRequestStore(X_ChangeProperty);
- 
-@@ -501,8 +536,36 @@
-           encodeBuffer.encodeCachedValue(format, 8,
-                              clientCache_ -> changePropertyFormatCache);
-           unsigned int dataLength = GetULONG(inputMessage + 20, bigEndian_);
-+
-+          // Self-preserving sanity check (otherwise we crash and dump core):
-+          // some clients do this when not getting their beloved BIG-REQUESTS.
-+          unsigned int maxLength = 0;
-+          if (format == 8)
-+          {
-+            maxLength = inputLength - 24;
-+          }
-+          else if (format == 32)
-+          {
-+            maxLength = (inputLength - 24) >> 2;
-+          }
-+          else if (format == 16)
-+          {
-+            maxLength = (inputLength - 24) >> 1;
-+          }
-+          if (dataLength > maxLength)
-+          {
-+            #ifdef WARNING
-+            *logofs << "handleRead X_ChangeProperty bogus dataLength=" << dataLength
-+                    << " set to " << maxLength
-+                    << " when format=" << (int)format
-+                    << " inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+            #endif
-+            dataLength = maxLength;
-+          }
-+
-           encodeBuffer.encodeValue(dataLength, 32, 6);
--          encodeBuffer.encodeValue(inputMessage[1], 2);
-+          encodeBuffer.encodeValue(inputDataByte, 2);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
-@@ -533,7 +596,7 @@
-               nextSrc += 4;
-             }
-           }
--          else
-+          else if (format == 16)
-           {
-             for (unsigned int i = 0; i < dataLength; i++)
-             {
-@@ -541,6 +604,13 @@
-               nextSrc += 2;
-             }
-           }
-+          else
-+          {
-+            #ifdef WARNING
-+            *logofs << "ChangeProperty bogus format=" << (int)format
-+                    << ".\n" << logofs_flush;
-+            #endif
-+          }
-         }
-         break;
-       case X_SendEvent:
-@@ -551,6 +621,11 @@
-           // ratio.
-           //
- 
-+          #ifdef WARNING
-+          if (inputLength < 44)
-+            *logofs << "handleRead: X_SendEvent inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           MessageStore *messageStore = clientStore_ ->
-                                getRequestStore(X_SendEvent);
- 
-@@ -562,7 +637,7 @@
-             break;
-           }
- 
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           unsigned int window = GetULONG(inputMessage + 4, bigEndian_);
- 
-           if (window == 0 || window == 1)
-@@ -599,7 +674,12 @@
-         break;
-       case X_ChangeWindowAttributes:
-         {
--          encodeBuffer.encodeValue((inputLength - 12) >> 2, 4);
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_ChangeWindowAttributes inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-+          encodeBuffer.encodeValue(inputDataSize - 2, 4);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           unsigned int bitmask = GetULONG(inputMessage + 8, bigEndian_);
-@@ -621,6 +701,11 @@
-         break;
-       case X_ClearArea:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_ClearArea inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -654,7 +739,7 @@
-             break;
-           }
- 
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           const unsigned char *nextSrc = inputMessage + 8;
-@@ -668,6 +753,11 @@
-         break;
-       case X_CloseFont:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_CloseFont inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
-           encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
-           clientCache_ -> lastFont = font;
-@@ -675,6 +765,11 @@
-         break;
-       case X_ConfigureWindow:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_ConfigureWindow inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           MessageStore *messageStore = clientStore_ ->
-                                getRequestStore(X_ConfigureWindow);
- 
-@@ -708,6 +803,11 @@
-         break;
-       case X_ConvertSelection:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 24)
-+            *logofs << "handleRead: X_ConvertSelection inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                              clientCache_ -> convertSelectionRequestorCache, 9);
-           const unsigned char* nextSrc = inputMessage + 8;
-@@ -725,6 +825,11 @@
-         break;
-       case X_CopyArea:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 28)
-+            *logofs << "handleRead: X_CopyArea inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -793,6 +898,11 @@
-         break;
-       case X_CopyGC:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_CopyGC inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int s_g_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -814,6 +924,11 @@
-         break;
-       case X_CopyPlane:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 32)
-+            *logofs << "handleRead: X_CopyPlane inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                              bigEndian_), clientCache_ -> drawableCache);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-@@ -833,6 +948,11 @@
-         break;
-       case X_CreateGC:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_CreateGC inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -917,6 +1037,11 @@
-         break;
-       case X_ChangeGC:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_ChangeGC inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -998,14 +1123,19 @@
-         break;
-       case X_CreatePixmap:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_CreatePixmap inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
--          *logofs << "handleRead: X_CreatePixmap depth " << (unsigned) inputMessage[1]
-+          *logofs << "handleRead: X_CreatePixmap depth " << (unsigned) inputDataByte
-                   << ", pixmap id " << GetULONG(inputMessage + 4, bigEndian_)
-                   << ", drawable " << GetULONG(inputMessage + 8, bigEndian_)
-                   << ", width " << GetUINT(inputMessage + 12, bigEndian_)
-                   << ", height " << GetUINT(inputMessage + 14, bigEndian_)
--                  << ", size " << GetUINT(inputMessage + 2, bigEndian_) << 2
-+                  << ", length " << inputLength
-                   << ".\n" << logofs_flush;
- 
-           unsigned int   p_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1042,6 +1172,11 @@
-         break;
-       case X_CreateWindow:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 32)
-+            *logofs << "handleRead: X_CreateWindow inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int w_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1054,7 +1189,7 @@
-           #endif
- 
-           unsigned bitmask = GetULONG(inputMessage + 28, bigEndian_);
--          encodeBuffer.encodeCachedValue((unsigned int) inputMessage[1], 8,
-+          encodeBuffer.encodeCachedValue((unsigned int) inputDataByte, 8,
-                                          clientCache_ -> depthCache);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
-                              clientCache_ -> windowCache);
-@@ -1098,6 +1233,11 @@
-         break;
-       case X_DeleteProperty:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_DeleteProperty inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 29, 9);
-@@ -1105,6 +1245,11 @@
-         break;
-       case X_FillPoly:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_FillPoly inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1138,7 +1283,7 @@
-             break;
-           }
- 
--          unsigned int numPoints = ((inputLength - 16) >> 2);
-+          unsigned int numPoints = (inputDataSize - 3);
- 
-           if (control -> isProtoStep10() == 1)
-           {
-@@ -1209,7 +1354,12 @@
-         break;
-       case X_FreeColors:
-         {
--          unsigned int numPixels = GetUINT(inputMessage + 2, bigEndian_) - 3;
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_FreeColors inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-+          unsigned int numPixels = inputDataSize - 2;
-           encodeBuffer.encodeValue(numPixels, 16, 4);
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                                          clientCache_ -> colormapCache);
-@@ -1225,12 +1375,22 @@
-         break;
-       case X_FreeCursor:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_FreeCursor inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                                          29, clientCache_ -> cursorCache, 9);
-         }
-         break;
-       case X_FreeGC:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_FreeGC inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1284,6 +1444,11 @@
-         break;
-       case X_FreePixmap:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_FreePixmap inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int p_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1318,6 +1483,11 @@
-         break;
-       case X_GetAtomName:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_GetAtomName inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 29, 9);
- 
-           sequenceQueue_.push(clientSequence_, inputOpcode);
-@@ -1327,6 +1497,11 @@
-         break;
-       case X_GetGeometry:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_GetGeometry inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> drawableCache);
- 
-@@ -1351,6 +1526,11 @@
-         break;
-       case X_GetKeyboardMapping:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_GetKeyboardMapping inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeValue((unsigned int) inputMessage[4], 8);
-           encodeBuffer.encodeValue((unsigned int) inputMessage[5], 8);
- 
-@@ -1361,6 +1541,11 @@
-         break;
-       case X_GetProperty:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 24)
-+            *logofs << "handleRead: X_GetProperty inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           MessageStore *messageStore = clientStore_ ->
-                                getRequestStore(X_GetProperty);
- 
-@@ -1378,7 +1563,7 @@
-             break;
-           }
- 
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           unsigned int property = GetULONG(inputMessage + 8, bigEndian_);
-@@ -1394,6 +1579,11 @@
-         break;
-       case X_GetSelectionOwner:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_GetSelectionOwner inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                              clientCache_ -> getSelectionOwnerSelectionCache, 9);
- 
-@@ -1404,7 +1594,12 @@
-         break;
-       case X_GrabButton:
-         {
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          #ifdef WARNING
-+          if (inputLength < 24)
-+            *logofs << "handleRead: X_GrabButton inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-@@ -1423,7 +1618,12 @@
-         break;
-       case X_GrabPointer:
-         {
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          #ifdef WARNING
-+          if (inputLength < 24)
-+            *logofs << "handleRead: X_GrabPointer inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-@@ -1448,7 +1648,12 @@
-         break;
-       case X_GrabKeyboard:
-         {
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_GrabKeyboard inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> windowCache);
-           unsigned int timestamp = GetULONG(inputMessage + 8, bigEndian_);
-@@ -1471,6 +1676,11 @@
-         break;
-       case X_PolyText8:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_PolyText8 inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1555,6 +1765,11 @@
-         break;
-       case X_PolyText16:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_PolyText16 inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1639,6 +1854,11 @@
-         break;
-       case X_ImageText8:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16 + (unsigned int)inputDataByte)
-+            *logofs << "handleRead: X_ImageText8 inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1673,7 +1893,7 @@
-             break;
-           }
- 
--          unsigned int textLength = (unsigned int) inputMessage[1];
-+          unsigned int textLength = (unsigned int) inputDataByte;
-           encodeBuffer.encodeCachedValue(textLength, 8,
-                              clientCache_ -> imageTextLengthCache, 4);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-@@ -1706,6 +1926,11 @@
-         break;
-       case X_ImageText16:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16 + (unsigned int)inputDataByte)
-+            *logofs << "handleRead: X_ImageText16 inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -1740,7 +1965,7 @@
-             break;
-           }
- 
--          unsigned int textLength = (unsigned int) inputMessage[1];
-+          unsigned int textLength = (unsigned int) inputDataByte;
-           encodeBuffer.encodeCachedValue(textLength, 8,
-                              clientCache_ -> imageTextLengthCache, 4);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-@@ -1773,6 +1998,11 @@
-         break;
-       case X_InternAtom:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_InternAtom inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           MessageStore *messageStore = clientStore_ ->
-                                getRequestStore(X_InternAtom);
- 
-@@ -1796,8 +2026,18 @@
-           }
- 
-           unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_);
-+          unsigned int maxLength = inputLength - 8;
-+          if (nameLength > maxLength)
-+          {
-+            #ifdef WARNING
-+            *logofs << "handleRead X_InternAtom bogus nameLength=" << nameLength
-+                    << " set to " << maxLength
-+                    << ".\n" << logofs_flush;
-+            #endif
-+            nameLength = maxLength;
-+          }
-           encodeBuffer.encodeValue(nameLength, 16, 6);
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           const unsigned char *nextSrc = inputMessage + 8;
- 
-           if (control -> isProtoStep7() == 1)
-@@ -1827,7 +2067,22 @@
-         break;
-       case X_ListFonts:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_ListFonts inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           unsigned int textLength = GetUINT(inputMessage + 6, bigEndian_);
-+          unsigned int maxLength = inputLength - 8;
-+          if (textLength > maxLength)
-+          {
-+            #ifdef WARNING
-+            *logofs << "handleRead X_ListFonts bogus textLength=" << textLength
-+                    << " set to " << maxLength
-+                    << ".\n" << logofs_flush;
-+            #endif
-+            textLength = maxLength;
-+          }
-           encodeBuffer.encodeValue(textLength, 16, 6);
-           encodeBuffer.encodeValue(GetUINT(inputMessage + 4, bigEndian_), 16, 6);
-           const unsigned char* nextSrc = inputMessage + 8;
-@@ -1853,7 +2108,22 @@
-       case X_LookupColor:
-       case X_AllocNamedColor:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_AllocNamedColor inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           unsigned int textLength = GetUINT(inputMessage + 8, bigEndian_);
-+          unsigned int maxLength = inputLength - 12;
-+          if (textLength > maxLength)
-+          {
-+            #ifdef WARNING
-+            *logofs << "handleRead X_AllocNamedColor bogus textLength=" << textLength
-+                    << " set to " << maxLength
-+                    << ".\n" << logofs_flush;
-+            #endif
-+            textLength = maxLength;
-+          }
-           encodeBuffer.encodeValue(textLength, 16, 6);
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                                          29, clientCache_ -> colormapCache);
-@@ -1886,6 +2156,11 @@
-       case X_QueryPointer:
-       case X_QueryTree:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_MapWindow...X_QueryTree inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           if (inputOpcode == X_DestroyWindow)
-@@ -1923,7 +2198,22 @@
-         break;
-       case X_OpenFont:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_OpenFont inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           unsigned int nameLength = GetUINT(inputMessage + 8, bigEndian_);
-+          unsigned int maxLength = inputLength - 12;
-+          if (nameLength > maxLength)
-+          {
-+            #ifdef WARNING
-+            *logofs << "handleRead X_InternAtom bogus nameLength=" << nameLength
-+                    << " set to " << maxLength
-+                    << ".\n" << logofs_flush;
-+            #endif
-+            nameLength = maxLength;
-+          }
-           encodeBuffer.encodeValue(nameLength, 16, 7);
-           unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
-           encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
-@@ -1947,6 +2237,11 @@
-         break;
-       case X_PolyFillRectangle:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_PolyFillRectangle inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2034,6 +2329,11 @@
-         break;
-       case X_PolyFillArc:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_PolyFillArc inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2135,6 +2435,11 @@
-         break;
-       case X_PolyArc:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_PolyArc inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2236,6 +2541,11 @@
-         break;
-       case X_PolyPoint:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_PolyPoint inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2269,8 +2579,8 @@
-             break;
-           }
- 
--          encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4);
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          encodeBuffer.encodeValue(inputDataSize - 2, 32, 4);
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> drawableCache);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
-@@ -2303,6 +2613,11 @@
-         break;
-       case X_PolyLine:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_PolyLine inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2336,8 +2651,8 @@
-             break;
-           }
- 
--          encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4);
--          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-+          encodeBuffer.encodeValue(inputDataSize - 2, 32, 4);
-+          encodeBuffer.encodeBoolValue((unsigned int) inputDataByte);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                              bigEndian_), clientCache_ -> drawableCache);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-@@ -2370,8 +2685,12 @@
-         break;
-       case X_PolyRectangle:
-         {
--          encodeBuffer.encodeValue((GetUINT(inputMessage + 2,
--                                            bigEndian_) - 3) >> 1, 16, 3);
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_PolyRectangle inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-+          encodeBuffer.encodeValue((inputDataSize - 2) >> 1, 32, 3);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                              bigEndian_), clientCache_ -> drawableCache);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-@@ -2391,6 +2710,11 @@
-         break;
-       case X_PolySegment:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_PolySegment inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2424,8 +2748,7 @@
-             break;
-           }
- 
--          encodeBuffer.encodeValue((GetUINT(inputMessage + 2,
--                                            bigEndian_) - 3) >> 1, 16, 4);
-+          encodeBuffer.encodeValue((inputDataSize - 2) >> 1, 32, 4);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                              bigEndian_), clientCache_ -> drawableCache);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-@@ -2491,6 +2814,11 @@
-         break;
-       case X_PutImage:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_PutImage inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2522,7 +2850,12 @@
-         break;
-       case X_QueryBestSize:
-         {
--          encodeBuffer.encodeValue((unsigned int)inputMessage[1], 2);
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_QueryBestSize inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-+          encodeBuffer.encodeValue((unsigned int)inputDataByte, 2);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                              bigEndian_), clientCache_ -> drawableCache);
-           encodeBuffer.encodeValue(GetUINT(inputMessage + 8, bigEndian_), 16, 8);
-@@ -2535,10 +2868,15 @@
-         break;
-       case X_QueryColors:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_QueryColors inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           // Differential encoding.
-           encodeBuffer.encodeBoolValue(1);
- 
--          unsigned int numColors = ((inputLength - 8) >> 2);
-+          unsigned int numColors = (inputDataSize - 1);
-           encodeBuffer.encodeValue(numColors, 16, 5);
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                                          clientCache_ -> colormapCache);
-@@ -2567,15 +2905,20 @@
-         break;
-       case X_QueryExtension:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_QueryExtension inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TEST
- 
-           char data[256];
- 
-           int length = GetUINT(inputMessage + 4, bigEndian_);
- 
--          if (length > 256)
-+          if (length > 255)
-           {
--            length = 256;
-+            length = 255;
-           }
- 
-           strncpy(data, (char *) inputMessage + 8, length);
-@@ -2588,6 +2931,16 @@
-           #endif
- 
-           unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_);
-+          unsigned int maxLength = inputLength - 8;
-+          if (nameLength > maxLength)
-+          {
-+            #ifdef WARNING
-+            *logofs << "handleRead X_QueryExtension bogus nameLength=" << nameLength
-+                    << " set to " << maxLength
-+                    << ".\n" << logofs_flush;
-+            #endif
-+            nameLength = maxLength;
-+          }
-           encodeBuffer.encodeValue(nameLength, 16, 6);
-           const unsigned char *nextSrc = inputMessage + 8;
- 
-@@ -2614,6 +2967,11 @@
-         break;
-       case X_QueryFont:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 8)
-+            *logofs << "handleRead: X_QueryFont inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
-           encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
-           clientCache_ -> lastFont = font;
-@@ -2625,6 +2983,11 @@
-         break;
-       case X_SetClipRectangles:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_SetClipRectangles inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           MessageStore *messageStore = clientStore_ ->
-                                getRequestStore(X_SetClipRectangles);
- 
-@@ -2636,7 +2999,7 @@
-             break;
-           }
- 
--          unsigned int numRectangles = ((inputLength - 12) >> 3);
-+          unsigned int numRectangles = ((inputDataSize - 2) >> 1);
- 
-           if (control -> isProtoStep9() == 1)
-           {
-@@ -2647,7 +3010,7 @@
-             encodeBuffer.encodeValue(numRectangles, 13, 4);
-           }
- 
--          encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
-+          encodeBuffer.encodeValue((unsigned int) inputDataByte, 2);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                              clientCache_ -> gcCache);
-           encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-@@ -2668,7 +3031,22 @@
-         break;
-       case X_SetDashes:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 12)
-+            *logofs << "handleRead: X_SetDashes inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           unsigned int numDashes = GetUINT(inputMessage + 10, bigEndian_);
-+          unsigned int maxLength = inputLength - 12;
-+          if (numDashes > maxLength)
-+          {
-+            #ifdef WARNING
-+            *logofs << "handleRead X_SetDashes bogus numDashes=" << numDashes
-+                    << " set to " << maxLength
-+                    << ".\n" << logofs_flush;
-+            #endif
-+            numDashes = maxLength;
-+          }
-           encodeBuffer.encodeCachedValue(numDashes, 16,
-                              clientCache_ -> setDashesLengthCache, 5);
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-@@ -2683,6 +3061,11 @@
-         break;
-       case X_SetSelectionOwner:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_SetSelectionOwner inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                                     clientCache_ -> setSelectionOwnerCache, 9);
-           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
-@@ -2693,6 +3076,11 @@
-         break;
-       case X_TranslateCoords:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 16)
-+            *logofs << "handleRead: X_TranslateCoords inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2764,6 +3152,11 @@
-         break;
-       case X_GetImage:
-         {
-+          #ifdef WARNING
-+          if (inputLength < 20)
-+            *logofs << "handleRead: X_GetImage inputLength=" << inputLength
-+                    << ".\n" << logofs_flush;
-+          #endif
-           #ifdef TARGETS
- 
-           unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -2802,7 +3195,7 @@
-           }
- 
-           // Format.
--          encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
-+          encodeBuffer.encodeValue((unsigned int) inputDataByte, 2);
-           // Drawable.
-           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                              bigEndian_), clientCache_ -> drawableCache);
-@@ -2869,6 +3262,11 @@
-           }
-           else if (inputOpcode == opcodeStore_ -> putPackedImage)
-           {
-+            #ifdef WARNING
-+            if (inputLength < 24)
-+              *logofs << "handleRead: putPackedImage inputLength=" << inputLength
-+                      << ".\n" << logofs_flush;
-+            #endif
-             #ifdef TARGETS
- 
-             unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-@@ -3004,7 +3402,7 @@
-                     << ".\n" << logofs_flush;
-             #endif
- 
--            encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8,
-+            encodeBuffer.encodeCachedValue(inputDataByte, 8,
-                          clientCache_ -> resourceCache);
-           }
-           else if (inputOpcode == opcodeStore_ -> freeUnpack)
-@@ -3015,7 +3413,7 @@
-                     << ".\n" << logofs_flush;
-             #endif
- 
--            encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8,
-+            encodeBuffer.encodeCachedValue(inputDataByte, 8,
-                          clientCache_ -> resourceCache);
-           }
-           else if (inputOpcode == opcodeStore_ -> getControlParameters)
-@@ -3130,6 +3528,11 @@
-             // Enable or disable expose events
-             // coming from the real server.
-             //
-+            #ifdef WARNING
-+            if (inputLength < 8)
-+              *logofs << "handleRead: setExposeParameters inputLength=" << inputLength
-+                      << ".\n" << logofs_flush;
-+            #endif
- 
-             encodeBuffer.encodeBoolValue(*(inputMessage + 4));
-             encodeBuffer.encodeBoolValue(*(inputMessage + 5));
-@@ -3198,10 +3601,10 @@
-       {
-         if (hit)
-         {
--          statistics -> addRenderCachedRequest(*(inputMessage + 1));
-+          statistics -> addRenderCachedRequest(inputDataByte);
-         }
- 
--        statistics -> addRenderRequestBits(*(inputMessage + 1), inputLength << 3, bits);
-+        statistics -> addRenderRequestBits(inputDataByte, inputLength << 3, bits);
-       }
- 
-     }  // End if (firstRequest_)... else ...
-@@ -4548,10 +4951,10 @@
-         //
- 
- /*
--FIXME: Recover the sequence number if the proxy
-+Fixed as below? - FIXME: Recover the sequence number if the proxy
-        is not connected to an agent.
- */
--        if (serverSequence_ > lastSequence_ ||
-+        if (SequenceNumber_x_gt_y(serverSequence_, lastSequence_) ||
-                 control -> SessionMode != session_proxy)
-         {
-           #ifdef DEBUG
-@@ -4564,7 +4967,7 @@
-           lastSequence_ = serverSequence_;
-         }
-         #ifdef DEBUG
--        else if (serverSequence_ < lastSequence_)
-+        else if (SequenceNumber_x_gt_y(lastSequence_, serverSequence_))
-         {
-           //
-           // Use our last auto-generated sequence.
-@@ -5003,6 +5406,12 @@
-           break;
-         default:
-           {
-+            // BEWARE: not only inputOpcode == GenericEvent but also
-+            // others not handled above, at least:
-+            //   GraphicsExpose    13
-+            //   MapRequest        20
-+            //   ConfigureRequest  23
-+            // and any beyond LASTEvent.
-             #ifdef TEST
-             *logofs << "handleWrite: Using generic event compression "
-                     << "for OPCODE#" << (unsigned int) outputOpcode
-@@ -5014,11 +5423,51 @@
- 
-             for (unsigned int i = 0; i < 14; i++)
-             {
--              decodeBuffer.decodeCachedValue(value, 16,
--                           *serverCache_ -> genericEventIntCache[i]);
-+              //decodeBuffer.decodeCachedValue(value, 16,
-+              //             *serverCache_ -> genericEventIntCache[i]);
-+              if ( ! (decodeBuffer.decodeCachedValue(value, 16,
-+                           *serverCache_ -> genericEventIntCache[i])) )
-+              {
-+                #ifdef WARNING
-+                *logofs << "decodeCachedValue failed for GenEvt:"
-+                        << " buffer length=" << length
-+                        << " i=" << i
-+                        << "\n" << logofs_flush;
-+                #endif
-+                break;
-+              }
- 
-               PutUINT(value, outputMessage + i * 2 + 4, bigEndian_);
-             }
-+            // Handle "X Generic Event Extension"
-+            // Extra data is not cached...
-+            if (outputOpcode == GenericEvent && *(outputMessage+1) != 0 && outputLength == 32)
-+            {
-+              unsigned int extraOutputLength = (GetULONG(outputMessage + 4, bigEndian_) << 2);
-+              if (extraOutputLength > 0 && extraOutputLength < 100*1024*1024)
-+              {
-+                // Extend buffer for the extra data
-+                outputMessage = writeBuffer_.addMessage(extraOutputLength);
-+                // Decode data and write into buffer at new position
-+                for (unsigned int i = 0; i < (extraOutputLength>>1); i++)
-+                {
-+                  //decodeBuffer.decodeValue(value, 16);
-+                  if ( ! (decodeBuffer.decodeValue(value, 16)) )
-+                  {
-+                    #ifdef WARNING
-+                    *logofs << "decodeValue failed for GenEvt:"
-+                            << " extraOutputLength=" << extraOutputLength
-+                            << " buffer length=" << length
-+                            << " i=" << i
-+                            << "\n" << logofs_flush;
-+                    #endif
-+                    break;
-+                  }
-+                  PutUINT(value, outputMessage + i * 2, bigEndian_);
-+                }
-+              }
-+            }
-+
-           }
-         } // End of switch (outputOpcode)...
- 
-@@ -6892,7 +7341,7 @@
-   }
-   else
-   {
--    if (serverSequence_ > lastSequence_)
-+    if (SequenceNumber_x_gt_y(serverSequence_, lastSequence_))
-     {
-       #ifdef DEBUG
-       *logofs << "handleNotify: Updating last event's sequence "
-@@ -6904,7 +7353,7 @@
-       lastSequence_ = serverSequence_;
-     }
-     #ifdef DEBUG
--    else if (serverSequence_ < lastSequence_)
-+    else if (SequenceNumber_x_gt_y(lastSequence_, serverSequence_))
-     {
-       //
-       // Use our last auto-generated sequence.
---- a/nxcomp/ClientReadBuffer.cpp
-+++ b/nxcomp/ClientReadBuffer.cpp
-@@ -119,15 +119,34 @@
- 
-     dataLength = (GetUINT(start + 2, bigEndian_) << 2);
- 
--    if (dataLength < 4)
-+    if (dataLength == 0)        // or equivalently (dataLength < 4)
-     {
--      #ifdef TEST
--      *logofs << "ClientReadBuffer: WARNING! Assuming length 4 "
--              << "for suspicious message of length " << dataLength
--              << ".\n" << logofs_flush;
--      #endif
-+      // BIG-REQUESTS extension
-+      if (size < 8)
-+      {
-+        remaining_ = 8 - size;
-+        return 0;
-+      }
- 
--      dataLength = 4;
-+      dataLength = (GetULONG(start + 4, bigEndian_) << 2);
-+
-+// See WRITE_BUFFER_OVERFLOW_SIZE elsewhere
-+// and also ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE.
-+      if (dataLength < 8 || dataLength > 100*1024*1024)
-+      {
-+        #ifdef WARNING
-+        *logofs << "BIG-REQUESTS with unacceptable dataLength="
-+                << dataLength << ", now set to 8.\n" << logofs_flush;
-+        #endif
-+        dataLength = 8;
-+      }
-+      else if (dataLength < 4*64*1024)
-+      {
-+        #ifdef WARNING
-+        *logofs << "BIG-REQUESTS with silly dataLength="
-+                << dataLength << ".\n" << logofs_flush;
-+        #endif
-+      }
-     }
-   }
- 
---- a/nxcomp/DecodeBuffer.cpp
-+++ b/nxcomp/DecodeBuffer.cpp
-@@ -78,34 +78,45 @@
-       {
-         if (!endOkay)
-         {
--          #ifdef PANIC
--          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [A] "
--                  << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
--                  << " end_ = " << (end_ - buffer_) << ".\n"
--                  << logofs_flush;
-+          #ifdef WARNING
-+          *logofs << "DecodeBuffer: Error [A] in decodeValue(), returning 0:"
-+                  << " nextSrc_ = " << (nextSrc_ - buffer_)
-+                  << " end_ = " << (end_ - buffer_)
-+                  << ".\n" << logofs_flush;
-           #endif
--
--          //
--          // Label "context" is just used to identify
--          // the routine which detected the problem in
--          // present source file.
--          //
--
--          cerr << "Error" << ": Failure decoding data in context [A].\n";
--
--          HandleAbort();
-+          value = 0;
-+          return 0;
-+          //#ifdef PANIC
-+          //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [A] "
-+          //        << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-+          //        << " end_ = " << (end_ - buffer_) << ".\n"
-+          //        << logofs_flush;
-+          //#endif
-+          ////
-+          //// Label "context" is just used to identify
-+          //// the routine which detected the problem in
-+          //// present source file.
-+          ////
-+          //cerr << "Error" << ": Failure decoding data in context [A].\n";
-+          //HandleAbort();
-         }
- 
--        #ifdef PANIC
--        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [B] "
--                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
--                << " end_ = " << (end_ - buffer_) << ".\n"
--                << logofs_flush;
-+        #ifdef WARNING
-+        *logofs << "DecodeBuffer: Error [B] in decodeValue(), returning 0:"
-+                << " nextSrc_ = " << (nextSrc_ - buffer_)
-+                << " end_ = " << (end_ - buffer_)
-+                << ".\n" << logofs_flush;
-         #endif
--
--        cerr << "Error" << ": Failure decoding data in context [B].\n";
--
--        HandleAbort();
-+        value = 0;
-+        return 0;
-+        //#ifdef PANIC
-+        //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [B] "
-+        //        << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-+        //        << " end_ = " << (end_ - buffer_) << ".\n"
-+        //        << logofs_flush;
-+        //#endif
-+        //cerr << "Error" << ": Failure decoding data in context [B].\n";
-+        //HandleAbort();
-       }
- 
-       lastBit = (nextSrcChar & srcMask_);
-@@ -134,28 +145,40 @@
-       {
-         if (!endOkay)
-         {
--          #ifdef PANIC
--          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [C] "
--                  << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
--                  << " end_ = " << (end_ - buffer_) << ".\n"
--                  << logofs_flush;
-+          #ifdef WARNING
-+          *logofs << "DecodeBuffer: Error [C] in decodeValue(), returning 0:"
-+                  << " nextSrc_ = " << (nextSrc_ - buffer_)
-+                  << " end_ = " << (end_ - buffer_)
-+                  << ".\n" << logofs_flush;
-           #endif
--
--          cerr << "Error" << ": Failure decoding data in context [C].\n";
--
--          HandleAbort();
-+          value = 0;
-+          return 0;
-+          //#ifdef PANIC
-+          //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [C] "
-+          //        << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-+          //        << " end_ = " << (end_ - buffer_) << ".\n"
-+          //        << logofs_flush;
-+          //#endif
-+          //cerr << "Error" << ": Failure decoding data in context [C].\n";
-+          //HandleAbort();
-         }
- 
--        #ifdef PANIC
--        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [D] "
--                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
--                << " end_ = " << (end_ - buffer_) << ".\n"
--                << logofs_flush;
-+        #ifdef WARNING
-+        *logofs << "DecodeBuffer: Error [D] in decodeValue(), returning 0:"
-+                << " nextSrc_ = " << (nextSrc_ - buffer_)
-+                << " end_ = " << (end_ - buffer_)
-+                << ".\n" << logofs_flush;
-         #endif
--
--        cerr << "Error" << ": Failure decoding data in context [D].\n";
--
--        HandleAbort();
-+        value = 0;
-+        return 0;
-+        //#ifdef PANIC
-+        //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [D] "
-+        //        << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-+        //        << " end_ = " << (end_ - buffer_) << ".\n"
-+        //        << logofs_flush;
-+        //#endif
-+        //cerr << "Error" << ": Failure decoding data in context [D].\n";
-+        //HandleAbort();
-       }
- 
-       unsigned char moreData = (nextSrcChar & srcMask_);
-@@ -212,16 +235,24 @@
- 
-   if (nextSrc_ >= end_)
-   {
--    #ifdef PANIC
--    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [E] "
--            << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
--            << " end_ = " << (end_ - buffer_) << ".\n"
--            << logofs_flush;
-+    #ifdef WARNING
-+    *logofs << "DecodeBuffer: Error [E] in decodeCachedValue(), returning 0:"
-+            << " nextSrc_ = " << (nextSrc_ - buffer_)
-+            << " end_ = " << (end_ - buffer_)
-+            << ".\n" << logofs_flush;
-     #endif
--
--    cerr << "Error" << ": Failure decoding data in context [E].\n";
--
--    HandleAbort();
-+    // Failed: return value 0
-+    value = 0;
-+    // Failed: return 0, though our callers do not check that...
-+    return 0;
-+    //#ifdef PANIC
-+    //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [E] "
-+    //        << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-+    //        << " end_ = " << (end_ - buffer_) << ".\n"
-+    //        << logofs_flush;
-+    //#endif
-+    //cerr << "Error" << ": Failure decoding data in context [E].\n";
-+    //HandleAbort();
-   }
- 
-   unsigned int index = 0;
-@@ -237,30 +268,33 @@
-       nextSrc_++;
-       if (nextSrc_ >= end_)
-       {
--        if (!endOkay)
--        {
--          #ifdef PANIC
--          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [F] "
--                  << "in decodeCachedValue() nextSrc_ = "
--                  << (nextSrc_ - buffer_) << " end_ = "
--                  << (end_ - buffer_) << ".\n" << logofs_flush;
--          #endif
--
--          cerr << "Error" << ": Failure decoding data in context [F].\n";
--
--          HandleAbort();
--        }
--
--        #ifdef PANIC
--        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [G] "
--                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
--                << " end_ = " << (end_ - buffer_) << ".\n"
--                << logofs_flush;
-+        #ifdef WARNING
-+        *logofs << "DecodeBuffer: Error [G] in decodeCachedValue(), returning 0:"
-+                << " nextSrc_ = " << (nextSrc_ - buffer_)
-+                << " end_ = " << (end_ - buffer_)
-+                << ".\n" << logofs_flush;
-         #endif
--
--        cerr << "Error" << ": Failure decoding data in context [G].\n";
--
--        HandleAbort();
-+        value = 0;
-+        return 0;
-+        //if (!endOkay)
-+        //{
-+        //  #ifdef PANIC
-+        //  *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [F] "
-+        //          << "in decodeCachedValue() nextSrc_ = "
-+        //          << (nextSrc_ - buffer_) << " end_ = "
-+        //          << (end_ - buffer_) << ".\n" << logofs_flush;
-+        //  #endif
-+        //  cerr << "Error" << ": Failure decoding data in context [F].\n";
-+        //  HandleAbort();
-+        //}
-+        //#ifdef PANIC
-+        //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [G] "
-+        //        << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-+        //        << " end_ = " << (end_ - buffer_) << ".\n"
-+        //        << logofs_flush;
-+        //#endif
-+        //cerr << "Error" << ": Failure decoding data in context [G].\n";
-+        //HandleAbort();
-       }
- 
-       nextSrcChar = *nextSrc_;
-@@ -288,15 +322,20 @@
-         return 1;
-       }
- 
--      #ifdef PANIC
--      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
--              << "in decodeCacheValue() with no value found.\n"
--              << logofs_flush;
-+      #ifdef WARNING
-+      *logofs << "DecodeBuffer: Error [H] in decodeCachedValue(), returning 0:"
-+              << " no value found"
-+              << ".\n" << logofs_flush;
-       #endif
--
--      cerr << "Error" << ": Failure decoding data in context [H].\n";
--
--      HandleAbort();
-+      value = 0;
-+      return 0;
-+      //#ifdef PANIC
-+      //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
-+      //        << "in decodeCacheValue() with no value found.\n"
-+      //        << logofs_flush;
-+      //#endif
-+      //cerr << "Error" << ": Failure decoding data in context [H].\n";
-+      //HandleAbort();
-     }
-     else
-     {
-@@ -323,15 +362,20 @@
-           return 1;
-         }
- 
--        #ifdef PANIC
--        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
--                << "in decodeCacheValue() with no value found.\n"
--                << logofs_flush;
-+        #ifdef WARNING
-+        *logofs << "DecodeBuffer: Error [F] in decodeCachedValue(), returning 0:"
-+                << " no value found"
-+                << " .\n" << logofs_flush;
-         #endif
--
--        cerr << "Error" << ": Failure decoding data in context [H].\n";
--
--        HandleAbort();
-+        value = 0;
-+        return 0;
-+        //#ifdef PANIC
-+        //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
-+        //        << "in decodeCacheValue() with no value found.\n"
-+        //        << logofs_flush;
-+        //#endif
-+        //cerr << "Error" << ": Failure decoding data in context [H].\n";
-+        //HandleAbort();
-       }
-     }
-   }
-@@ -344,16 +388,22 @@
- 
-     if (index > cache.getSize())
-     {
--      #ifdef PANIC
--      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [I] "
--              << "in decodeCachedValue() index = " << index
--              << " cache size = " << cache.getSize() << ".\n"
--              << logofs_flush;
-+      #ifdef WARNING
-+      *logofs << "DecodeBuffer: Error [I] in decodeCachedValue(), returning 0:"
-+              << " index = " << index
-+              << " cache size = " << cache.getSize()
-+              << ".\n" << logofs_flush;
-       #endif
--
--      cerr << "Error" << ": Failure decoding data in context [I].\n";
--
--      HandleAbort();
-+      value = 0;
-+      return 0;
-+      //#ifdef PANIC
-+      //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [I] "
-+      //        << "in decodeCachedValue() index = " << index
-+      //        << " cache size = " << cache.getSize() << ".\n"
-+      //        << logofs_flush;
-+      //#endif
-+      //cerr << "Error" << ": Failure decoding data in context [I].\n";
-+      //HandleAbort();
-     }
- 
-     value = cache.get(index);
-@@ -401,16 +451,22 @@
-       {
-         if (!endOkay)
-         {
--          #ifdef PANIC
--          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [K] "
--                  << "in decodeCachedValue() nextSrc_ "
--                  << (nextSrc_ - buffer_) << " end_ " << (end_ - buffer_)
-+          #ifdef WARNING
-+          *logofs << "DecodeBuffer: Error [K] in decodeCachedValue(), returning 0:"
-+                  << " nextSrc_ " << (nextSrc_ - buffer_)
-+                  << " end_ " << (end_ - buffer_)
-                   << ".\n" << logofs_flush;
-           #endif
--
--          cerr << "Error" << ": Failure decoding data in context [K].\n";
--
--          HandleAbort();
-+          value = 0;
-+          return 0;
-+          //#ifdef PANIC
-+          //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [K] "
-+          //        << "in decodeCachedValue() nextSrc_ "
-+          //        << (nextSrc_ - buffer_) << " end_ " << (end_ - buffer_)
-+          //        << ".\n" << logofs_flush;
-+          //#endif
-+          //cerr << "Error" << ": Failure decoding data in context [K].\n";
-+          //HandleAbort();
-         }
- 
-         #ifdef TEST
-@@ -446,15 +502,20 @@
-     }
-     else
-     {
--      #ifdef PANIC
--      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [M] "
--              << "in decodeValue() with index = 2.\n"
--              << logofs_flush;
-+      #ifdef WARNING
-+      *logofs << "DecodeBuffer: Error [M] in decodeCachedValue(), returning 0:"
-+              << "with index = 2"
-+              << ".\n" << logofs_flush;
-       #endif
--
--      cerr << "Error" << ": Failure decoding data in context [M].\n";
--
--      HandleAbort();
-+      value = 0;
-+      return 0;
-+      //#ifdef PANIC
-+      //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [M] "
-+      //        << "in decodeValue() with index = 2.\n"
-+      //        << logofs_flush;
-+      //#endif
-+      //cerr << "Error" << ": Failure decoding data in context [M].\n";
-+      //HandleAbort();
-     }
-   }
-   else
-@@ -466,16 +527,22 @@
- 
-     if (index > cache.getSize())
-     {
--      #ifdef PANIC
--      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [N] "
--              << "in decodeCachedValue() " << "index = " << index
--              << " cache size = " << cache.getSize() << ".\n"
--              << logofs_flush;
-+      #ifdef WARNING
-+      *logofs << "DecodeBuffer: Error [N] in decodeCachedValue(), returning 0:"
-+              << " index = " << index
-+              << " cache size = " << cache.getSize()
-+              << ".\n" << logofs_flush;
-       #endif
--
--      cerr << "Error" << ": Failure decoding data in context [N].\n";
--
--      HandleAbort();
-+      value = 0;
-+      return 0;
-+      //#ifdef PANIC
-+      //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [N] "
-+      //        << "in decodeCachedValue() " << "index = " << index
-+      //        << " cache size = " << cache.getSize() << ".\n"
-+      //        << logofs_flush;
-+      //#endif
-+      //cerr << "Error" << ": Failure decoding data in context [N].\n";
-+      //HandleAbort();
-     }
- 
-     value = cache.get(index);
-@@ -538,16 +605,22 @@
-   }
-   else if (end_ - nextSrc_ < (int) numBytes)
-   {
--    #ifdef PANIC
--    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [P] "
--            << "in decodeMemory() " << "with length " << numBytes
-+    #ifdef WARNING
-+    *logofs << "DecodeBuffer: Error [P] in decodeMemory(), returning NULL:"
-+            << " with length " << numBytes
-             << " and " << (end_ - nextSrc_)
--            << " bytes remaining.\n" << logofs_flush;
-+            << " bytes remaining"
-+            << ".\n" << logofs_flush;
-     #endif
--
--    cerr << "Error" << ": Failure decoding data in context [P].\n";
--
--    HandleAbort();
-+    return NULL;
-+    //#ifdef PANIC
-+    //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [P] "
-+    //        << "in decodeMemory() " << "with length " << numBytes
-+    //        << " and " << (end_ - nextSrc_)
-+    //        << " bytes remaining.\n" << logofs_flush;
-+    //#endif
-+    //cerr << "Error" << ": Failure decoding data in context [P].\n";
-+    //HandleAbort();
-   }
- 
-   nextSrc_ += numBytes;
---- a/nxcomp/DecodeBuffer.h
-+++ b/nxcomp/DecodeBuffer.h
-@@ -30,7 +30,8 @@
- #include "ActionCacheCompat.h"
- #include "PositionCacheCompat.h"
- 
--#define DECODE_BUFFER_OVERFLOW_SIZE        4194304
-+// See WriteBuffer.h and EncodeBuffer.h
-+#define DECODE_BUFFER_OVERFLOW_SIZE        104857600
- 
- #define DECODE_BUFFER_POSTFIX_SIZE         1
- 
---- a/nxcomp/EncodeBuffer.h
-+++ b/nxcomp/EncodeBuffer.h
-@@ -33,10 +33,10 @@
- //
- // This should match the maximum size of
- // a single message added to write buffer
--// (see WriteBuffer.h).
-+// (see WriteBuffer.h and DecodeBuffer.h).
- //
- 
--#define ENCODE_BUFFER_OVERFLOW_SIZE       4194304
-+#define ENCODE_BUFFER_OVERFLOW_SIZE       104857600
- 
- //
- // Adjust for the control messages and the
---- a/nxcomp/SequenceQueue.h
-+++ b/nxcomp/SequenceQueue.h
-@@ -18,6 +18,22 @@
- #ifndef SequenceQueue_H
- #define SequenceQueue_H
- 
-+inline int SequenceNumber_x_gt_y(unsigned int x, unsigned int y)
-+{
-+  // For two sequence numbers x and y, determine whether (x > y).
-+  // Sequence numbers are the trailing 16 bits of a bigger number:
-+  // need to handle wraparound, e.g. 0 is 65536, just after 65535.
-+  if (x != (x & 0x00ffff)) return 0;
-+  if (y != (y & 0x00ffff)) return 0;
-+  // Closeness when comparison makes sense: arbitrarily set at 16*1024
-+  if ((x > y) && ((x-y) < 16*1024)) return 1;
-+  // Wrapped value
-+  unsigned int w = x + 64*1024;
-+  // We know that w>y but test left for symmetry
-+  if ((w > y) && ((w-y) < 16*1024)) return 1;
-+  return 0;
-+}
-+
- //
- // List of outstanding request messages which
- // are waiting for a reply. This class is used
---- a/nxcomp/ServerChannel.cpp
-+++ b/nxcomp/ServerChannel.cpp
-@@ -104,7 +104,8 @@
- //
- 
- #define HIDE_MIT_SHM_EXTENSION
--#define HIDE_BIG_REQUESTS_EXTENSION
-+// HIDE_BIG_REQUESTS_EXTENSION : No good to hide, some clients may send crap instead...
-+#undef  HIDE_BIG_REQUESTS_EXTENSION
- #define HIDE_XFree86_Bigfont_EXTENSION
- #undef  HIDE_SHAPE_EXTENSION
- #undef  HIDE_XKEYBOARD_EXTENSION
-@@ -1412,6 +1413,9 @@
- 
-         unsigned int inputSequence = GetUINT(inputMessage + 2, bigEndian_);
- 
-+        // Sometimes we get inputSequence=0 or =256 when inputOpcode=11=X_UnmapSubwindows
-+        // Seems weird... but is "normal" and is to be accepted.
-+
-         //
-         // Check if this is an event which we can discard.
-         //
-@@ -1905,6 +1909,12 @@
-           break;
-         default:
-           {
-+            // BEWARE: not only inputOpcode == GenericEvent but also
-+            // others not handled above, at least:
-+            //   GraphicsExpose    13
-+            //   MapRequest        20
-+            //   ConfigureRequest  23
-+            // and any beyond LASTEvent.
-             #ifdef TEST
-             *logofs << "handleRead: Using generic event compression "
-                     << "for OPCODE#" << (unsigned int) inputOpcode
-@@ -1919,6 +1929,16 @@
-               encodeBuffer.encodeCachedValue(GetUINT(inputMessage + i * 2 + 4, bigEndian_),
-                                  16, *serverCache_ -> genericEventIntCache[i]);
-             }
-+            // Handle "X Generic Event Extension"
-+            // Cannot cache extra data...
-+// FIXME: BUG ALERT: is it OK to have the first 32 bytes cached, but not the rest?
-+            if (inputOpcode == GenericEvent && inputLength > 32)
-+            {
-+              for (unsigned int i = 14; i < ((inputLength-4)>>1); i++)
-+              {
-+                encodeBuffer.encodeValue(GetUINT(inputMessage + i * 2 + 4, bigEndian_), 16);
-+              }
-+            }
-           }
- 
-         } // switch (inputOpcode)...
-@@ -3756,7 +3776,7 @@
-           }
- 
-           unsigned int numPoints;
--          decodeBuffer.decodeValue(numPoints, 16, 4);
-+          decodeBuffer.decodeValue(numPoints, 32, 4);
-           outputLength = (numPoints << 2) + 12;
-           outputMessage = writeBuffer_.addMessage(outputLength);
-           unsigned int relativeCoordMode;
-@@ -3802,7 +3822,7 @@
-           }
- 
-           unsigned int numPoints;
--          decodeBuffer.decodeValue(numPoints, 16, 4);
-+          decodeBuffer.decodeValue(numPoints, 32, 4);
-           outputLength = (numPoints << 2) + 12;
-           outputMessage = writeBuffer_.addMessage(outputLength);
-           unsigned int relativeCoordMode;
-@@ -3839,7 +3859,7 @@
-       case X_PolyRectangle:
-         {
-           unsigned int numRectangles;
--          decodeBuffer.decodeValue(numRectangles, 16, 3);
-+          decodeBuffer.decodeValue(numRectangles, 32, 3);
-           outputLength = (numRectangles << 3) + 12;
-           outputMessage = writeBuffer_.addMessage(outputLength);
-           decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-@@ -3869,7 +3889,7 @@
-           }
- 
-           unsigned int numSegments;
--          decodeBuffer.decodeValue(numSegments, 16, 4);
-+          decodeBuffer.decodeValue(numSegments, 32, 4);
-           outputLength = (numSegments << 3) + 12;
-           outputMessage = writeBuffer_.addMessage(outputLength);
-           decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-@@ -4590,7 +4610,29 @@
- 
-         *outputMessage = (unsigned char) outputOpcode;
- 
--        PutUINT(outputLength >> 2, outputMessage + 2, bigEndian_);
-+        if (outputLength < 4*64*1024)
-+          PutUINT(outputLength >> 2, outputMessage + 2, bigEndian_);
-+        else
-+        {
-+          // Handle BIG-REQUESTS
-+          PutUINT(0, outputMessage + 2, bigEndian_);
-+// FIXME: BUG ALERT: following write may not work well,
-+// particularly with un-flushed messages.
-+if (outputMessage != writeBuffer_.getData())
-+{
-+*logofs << "PSz BUG handleWrite BIG-REQUESTS:"
-+        << " have " << (unsigned int)(outputMessage - writeBuffer_.getData())
-+        << " bytes in buffer"
-+        << ", write immediate of 4-byte header will not work well"
-+        << "\n" << logofs_flush;
-+}
-+// But, it works well enough in my testing...
-+          // Write first four bytes
-+          if (transport_ -> write(write_immediate, outputMessage, 4) < 0)
-+              return -1;
-+          // Replace with new 4-byte length
-+          PutULONG(1 + (outputLength >> 2), outputMessage, bigEndian_);
-+        }
- 
-         #if defined(TEST) || defined(OPCODES)
-         *logofs << "handleWrite: Handled request OPCODE#"
-@@ -5912,7 +5954,7 @@
-   unsigned char opcode = *lastMotion_;
-   unsigned int size = 32;
- 
--  if (GetUINT(buffer + 2, bigEndian_) < serverSequence_)
-+  if (SequenceNumber_x_gt_y(serverSequence_, GetUINT(buffer + 2, bigEndian_)))
-   {
-     PutUINT(serverSequence_, (unsigned char *) buffer + 2, bigEndian_);
-   }
---- a/nxcomp/ServerReadBuffer.cpp
-+++ b/nxcomp/ServerReadBuffer.cpp
-@@ -108,14 +108,21 @@
-     {
-       dataLength = 32 + (GetULONG(start + 4, bigEndian_) << 2);
-     }
-+    else if (*start == GenericEvent && *(start+1) != 0)
-+    {
-+      // X Generic Event Extension
-+      dataLength = 32 + (GetULONG(start + 4, bigEndian_) << 2);
-+    }
-     else
-     {
-       dataLength = 32;
-     }
- 
--    if (dataLength < 32)
-+// See WRITE_BUFFER_OVERFLOW_SIZE elsewhere
-+// and also ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE.
-+    if (dataLength < 32 || dataLength > 100*1024*1024)
-     {
--      #ifdef TEST
-+      #ifdef WARNING
-       *logofs << "ServerReadBuffer: WARNING! Assuming length 32 "
-               << "for suspicious message of length " << dataLength
-               << ".\n" << logofs_flush;
---- a/nxcomp/WriteBuffer.h
-+++ b/nxcomp/WriteBuffer.h
-@@ -32,8 +32,14 @@
- // This is likely to be a reply to a X_ListFonts where
- // user has a large amount of installed fonts.
- //
-+// Used also for messages sent, and should accommodate any BIG-REQUESTS.
-+// Value was 4MB = 4194304, changed to 100MB = 104857600.
-+// See also sanity check limits (set same, to 100*1024*1024) in
-+// ClientReadBuffer.cpp ServerReadBuffer.cpp and ClientChannel.cpp, and
-+// ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE elsewhere.
-+//
- 
--#define WRITE_BUFFER_OVERFLOW_SIZE        4194304
-+#define WRITE_BUFFER_OVERFLOW_SIZE        104857600
- 
- class WriteBuffer
- {
diff --git a/debian/patches/series b/debian/patches/series
index 1a9405986..79df3658e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-#401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
-016_nx-X11_install-location.debian.patch
-102_xserver-xext_set-securitypolicy-path.debian.patch
+2001_nx-X11_install-location.debian.patch
+2002_xserver-xext_set-securitypolicy-path.debian.patch
diff --git a/debian/rules b/debian/rules
index 61ff2d934..ab69da2d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,53 @@ override_dh_auto_clean:
 	rm -Rf nx-X11/.build-exports
 	dh_auto_clean
 
+override_dh_clean:
+	rm nx-X11/config/Makefile
+	rm nx-X11/config/cf/Makefile
+	rm nx-X11/config/cf/date.def
+	rm nx-X11/config/cf/nxversion.def
+	rm nx-X11/include/GL/Makefile
+	rm nx-X11/include/Makefile
+	rm nx-X11/include/extensions/Makefile
+	rm nx-X11/programs/Makefile
+	rm nx-X11/programs/Xserver/GL/Makefile
+	rm nx-X11/programs/Xserver/GL/glx/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/GLcore/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/X/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/array_cache/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/main/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/math/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/shader/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/shader/grammar/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/shader/slang/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/swrast/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/swrast_setup/Makefile
+	rm nx-X11/programs/Xserver/GL/mesa/tnl/Makefile
+	rm nx-X11/programs/Xserver/Makefile
+	rm nx-X11/programs/Xserver/Xext/Makefile
+	rm nx-X11/programs/Xserver/Xi/Makefile
+	rm nx-X11/programs/Xserver/composite/Makefile
+	rm nx-X11/programs/Xserver/damageext/Makefile
+	rm nx-X11/programs/Xserver/dbe/Makefile
+	rm nx-X11/programs/Xserver/dix/Makefile
+	rm nx-X11/programs/Xserver/fb/Makefile
+	rm nx-X11/programs/Xserver/hw/nxagent/Makefile
+	rm nx-X11/programs/Xserver/hw/nxagent/compext/Makefile
+	rm nx-X11/programs/Xserver/include/Makefile
+	rm nx-X11/programs/Xserver/mi/Makefile
+	rm nx-X11/programs/Xserver/miext/cw/Makefile
+	rm nx-X11/programs/Xserver/miext/damage/Makefile
+	rm nx-X11/programs/Xserver/os/Makefile
+	rm nx-X11/programs/Xserver/randr/Makefile
+	rm nx-X11/programs/Xserver/record/Makefile
+	rm nx-X11/programs/Xserver/render/Makefile
+	rm nx-X11/programs/Xserver/xfixes/Makefile
+	rm nx-X11/programs/Xserver/xkb/Makefile
+	rm nx-X11/xmakefile
+	dh_clean
+
 override_dh_install:
 
 	# strip static libs and remove .la files
diff --git a/debian/watch b/debian/watch
index 4ca027c1b..3620348df 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=filenamemangle=s/.*\/.*?([\d\.-]+)\.tar\.gz/nx-libs-$1.tar.gz/ \
-https://github.com/ArcticaProject/nx-libs/tags .*/archive/.*?([\d\.]+).tar.gz
+opts=pgpsigurlmangle=s/$/.asc/ \
+http://releases.arctica-project.org/source/nx-libs/nx-libs-(.+)-full\.tar\.gz