Clear header file namespace separation (<X11/...> vs. <nx-X11/...>).

 In the process of building nxagent against more and more system-wide installed
 X.org libraries, we come to the limit of including structs from this (bundled
 nx-X11) and that (system-wide X.Org) library.

 This commit introduces a clear namespace separation of headers provided by
 nx-X11 and headers provided by X.Org. This approach is only temporary as we
 want to drop all nx-X11 bundled libraries from nx-libs.

 However, for a while we need to make this separation clear and also ship
 some reduced fake X.Org headers that avoid pulling in libX* and libNX_X*
 symbols at the same time.

 This patch has been tested on Debian jessie and unstable and requires no
 overall testing on various distros and distro versions, as we finally will
 drop all libNX_X* libraries and build against X.org's client libs.

 For now, this hack eases our development / cleanup process.

15 files changed, 110 insertions, 110 deletions

diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install.in
index 331ec104f..13af54672 100644
--- a/debian/libnx-x11-dev.install.in
+++ b/debian/libnx-x11-dev.install.in
@@ -1,15 +1,15 @@
 usr/lib/*/libNX_X11.so
-usr/include/*/nx/X11/ImUtil.h
-usr/include/*/nx/X11/XKBlib.h
-usr/include/*/nx/X11/Xcms.h
-usr/include/*/nx/X11/Xlib.h
-usr/include/*/nx/X11/XlibConf.h
-usr/include/*/nx/X11/Xlibint.h
-usr/include/*/nx/X11/Xlocale.h
-usr/include/*/nx/X11/Xregion.h
-usr/include/*/nx/X11/Xresource.h
-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/include/*/nx/X11/X10.h
+usr/include/*/nx-X11/ImUtil.h
+usr/include/*/nx-X11/XKBlib.h
+usr/include/*/nx-X11/Xcms.h
+usr/include/*/nx-X11/Xlib.h
+usr/include/*/nx-X11/XlibConf.h
+usr/include/*/nx-X11/Xlibint.h
+usr/include/*/nx-X11/Xlocale.h
+usr/include/*/nx-X11/Xregion.h
+usr/include/*/nx-X11/Xresource.h
+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/include/*/nx-X11/X10.h
diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install.in
index dd17a6054..1bf954c00 100644
--- a/debian/libnx-xau-dev.install.in
+++ b/debian/libnx-xau-dev.install.in
@@ -1,2 +1,2 @@
 usr/lib/*/libNX_Xau.so
-usr/include/*/nx/X11/Xauth.h
+usr/include/*/nx-X11/Xauth.h
diff --git a/debian/libnx-xcomposite-dev.install.in b/debian/libnx-xcomposite-dev.install.in
index e7e3a33db..71451dbcc 100644
--- a/debian/libnx-xcomposite-dev.install.in
+++ b/debian/libnx-xcomposite-dev.install.in
@@ -1,2 +1,2 @@
 usr/lib/*/libNX_Xcomposite.so
-usr/include/*/nx/X11/extensions/Xcomposite.h
+usr/include/*/nx-X11/extensions/Xcomposite.h
diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in
index 9f4f60551..0d1df8c08 100644
--- a/debian/libnx-xext-dev.install.in
+++ b/debian/libnx-xext-dev.install.in
@@ -1,34 +1,34 @@
 usr/lib/*/libNX_Xext.so
-usr/include/*/nx/X11/extensions/MITMisc.h
-usr/include/*/nx/X11/extensions/XEVI.h
-usr/include/*/nx/X11/extensions/XEVIstr.h
-usr/include/*/nx/X11/extensions/Xevie.h
-usr/include/*/nx/X11/extensions/Xeviestr.h
-usr/include/*/nx/X11/extensions/XLbx.h
-usr/include/*/nx/X11/extensions/XShm.h
-usr/include/*/nx/X11/extensions/Xag.h
-usr/include/*/nx/X11/extensions/Xagsrv.h
-usr/include/*/nx/X11/extensions/Xagstr.h
-usr/include/*/nx/X11/extensions/Xcup.h
-usr/include/*/nx/X11/extensions/Xcupstr.h
-usr/include/*/nx/X11/extensions/Xdbe.h
-usr/include/*/nx/X11/extensions/Xdbeproto.h
-usr/include/*/nx/X11/extensions/Xext.h
-usr/include/*/nx/X11/extensions/dpms.h
-usr/include/*/nx/X11/extensions/dpmsstr.h
-usr/include/*/nx/X11/extensions/extutil.h
-usr/include/*/nx/X11/extensions/lbxstr.h
-usr/include/*/nx/X11/extensions/lbxbuf.h
-usr/include/*/nx/X11/extensions/lbxdeltastr.h
-usr/include/*/nx/X11/extensions/lbximage.h
-usr/include/*/nx/X11/extensions/lbxbufstr.h
-usr/include/*/nx/X11/extensions/lbxopts.h
-usr/include/*/nx/X11/extensions/lbxzlib.h
-usr/include/*/nx/X11/extensions/mitmiscstr.h
-usr/include/*/nx/X11/extensions/multibuf.h
-usr/include/*/nx/X11/extensions/multibufst.h
-usr/include/*/nx/X11/extensions/security.h
-usr/include/*/nx/X11/extensions/securstr.h
-usr/include/*/nx/X11/extensions/shape.h
-usr/include/*/nx/X11/extensions/sync.h
-usr/include/*/nx/X11/extensions/xtestext1.h
+usr/include/*/nx-X11/extensions/MITMisc.h
+usr/include/*/nx-X11/extensions/XEVI.h
+usr/include/*/nx-X11/extensions/XEVIstr.h
+usr/include/*/nx-X11/extensions/Xevie.h
+usr/include/*/nx-X11/extensions/Xeviestr.h
+usr/include/*/nx-X11/extensions/XLbx.h
+usr/include/*/nx-X11/extensions/XShm.h
+usr/include/*/nx-X11/extensions/Xag.h
+usr/include/*/nx-X11/extensions/Xagsrv.h
+usr/include/*/nx-X11/extensions/Xagstr.h
+usr/include/*/nx-X11/extensions/Xcup.h
+usr/include/*/nx-X11/extensions/Xcupstr.h
+usr/include/*/nx-X11/extensions/Xdbe.h
+usr/include/*/nx-X11/extensions/Xdbeproto.h
+usr/include/*/nx-X11/extensions/Xext.h
+usr/include/*/nx-X11/extensions/dpms.h
+usr/include/*/nx-X11/extensions/dpmsstr.h
+usr/include/*/nx-X11/extensions/extutil.h
+usr/include/*/nx-X11/extensions/lbxstr.h
+usr/include/*/nx-X11/extensions/lbxbuf.h
+usr/include/*/nx-X11/extensions/lbxdeltastr.h
+usr/include/*/nx-X11/extensions/lbximage.h
+usr/include/*/nx-X11/extensions/lbxbufstr.h
+usr/include/*/nx-X11/extensions/lbxopts.h
+usr/include/*/nx-X11/extensions/lbxzlib.h
+usr/include/*/nx-X11/extensions/mitmiscstr.h
+usr/include/*/nx-X11/extensions/multibuf.h
+usr/include/*/nx-X11/extensions/multibufst.h
+usr/include/*/nx-X11/extensions/security.h
+usr/include/*/nx-X11/extensions/securstr.h
+usr/include/*/nx-X11/extensions/shape.h
+usr/include/*/nx-X11/extensions/sync.h
+usr/include/*/nx-X11/extensions/xtestext1.h
diff --git a/debian/libnx-xfixes-dev.install.in b/debian/libnx-xfixes-dev.install.in
index 96b6cf61c..475c78d0a 100644
--- a/debian/libnx-xfixes-dev.install.in
+++ b/debian/libnx-xfixes-dev.install.in
@@ -1,2 +1,2 @@
 usr/lib/*/libNX_Xfixes.so
-usr/include/*/nx/X11/extensions/Xfixes.h
+usr/include/*/nx-X11/extensions/Xfixes.h
diff --git a/debian/libnx-xinerama-dev.install.in b/debian/libnx-xinerama-dev.install.in
index 983784460..59c0456aa 100644
--- a/debian/libnx-xinerama-dev.install.in
+++ b/debian/libnx-xinerama-dev.install.in
@@ -1,3 +1,3 @@
 usr/lib/*/libNX_Xinerama.so
-usr/include/*/nx/X11/extensions/Xinerama.h
-usr/include/*/nx/X11/extensions/panoramiXext.h
+usr/include/*/nx-X11/extensions/Xinerama.h
+usr/include/*/nx-X11/extensions/panoramiXext.h
diff --git a/debian/libnx-xrender-dev.install.in b/debian/libnx-xrender-dev.install.in
index 392e20025..2aede35da 100644
--- a/debian/libnx-xrender-dev.install.in
+++ b/debian/libnx-xrender-dev.install.in
@@ -1,2 +1,2 @@
 usr/lib/*/libNX_Xrender.so
-usr/include/*/nx/X11/extensions/Xrender.h
+usr/include/*/nx-X11/extensions/Xrender.h
diff --git a/debian/libnx-xtst-dev.install.in b/debian/libnx-xtst-dev.install.in
index 9dd16a1db..5acca96cf 100644
--- a/debian/libnx-xtst-dev.install.in
+++ b/debian/libnx-xtst-dev.install.in
@@ -1,2 +1,2 @@
 usr/lib/*/libNX_Xtst.so
-usr/include/*/nx/X11/extensions/XTest.h
+usr/include/*/nx-X11/extensions/XTest.h
diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install.in
index 609454a5e..cf2c77e36 100644
--- a/debian/nx-x11proto-composite-dev.install.in
+++ b/debian/nx-x11proto-composite-dev.install.in
@@ -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/composite.h
+usr/include/*/nx-X11/extensions/compositeproto.h
\ No newline at end of file
diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install.in
index 92c529f41..2e99909a8 100644
--- a/debian/nx-x11proto-core-dev.install.in
+++ b/debian/nx-x11proto-core-dev.install.in
@@ -1,23 +1,23 @@
-usr/include/*/nx/X11/DECkeysym.h
-usr/include/*/nx/X11/HPkeysym.h
-usr/include/*/nx/X11/Sunkeysym.h
-usr/include/*/nx/X11/X.h
-usr/include/*/nx/X11/XF86keysym.h
-usr/include/*/nx/X11/XWDFile.h
-usr/include/*/nx/X11/Xalloca.h
-usr/include/*/nx/X11/Xarch.h
-usr/include/*/nx/X11/Xatom.h
-usr/include/*/nx/X11/Xdefs.h
-usr/include/*/nx/X11/Xfuncproto.h
-usr/include/*/nx/X11/Xfuncs.h
-usr/include/*/nx/X11/Xmd.h
-usr/include/*/nx/X11/Xos.h
-usr/include/*/nx/X11/Xos_r.h
-usr/include/*/nx/X11/Xosdefs.h
-usr/include/*/nx/X11/Xpoll.h
-usr/include/*/nx/X11/Xproto.h
-usr/include/*/nx/X11/Xprotostr.h
-usr/include/*/nx/X11/Xthreads.h
-usr/include/*/nx/X11/ap_keysym.h
-usr/include/*/nx/X11/keysym.h
-usr/include/*/nx/X11/keysymdef.h
+usr/include/*/nx-X11/DECkeysym.h
+usr/include/*/nx-X11/HPkeysym.h
+usr/include/*/nx-X11/Sunkeysym.h
+usr/include/*/nx-X11/X.h
+usr/include/*/nx-X11/XF86keysym.h
+usr/include/*/nx-X11/XWDFile.h
+usr/include/*/nx-X11/Xalloca.h
+usr/include/*/nx-X11/Xarch.h
+usr/include/*/nx-X11/Xatom.h
+usr/include/*/nx-X11/Xdefs.h
+usr/include/*/nx-X11/Xfuncproto.h
+usr/include/*/nx-X11/Xfuncs.h
+usr/include/*/nx-X11/Xmd.h
+usr/include/*/nx-X11/Xos.h
+usr/include/*/nx-X11/Xos_r.h
+usr/include/*/nx-X11/Xosdefs.h
+usr/include/*/nx-X11/Xpoll.h
+usr/include/*/nx-X11/Xproto.h
+usr/include/*/nx-X11/Xprotostr.h
+usr/include/*/nx-X11/Xthreads.h
+usr/include/*/nx-X11/ap_keysym.h
+usr/include/*/nx-X11/keysym.h
+usr/include/*/nx-X11/keysymdef.h
diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install.in
index bf778716f..f2222d234 100644
--- a/debian/nx-x11proto-render-dev.install.in
+++ b/debian/nx-x11proto-render-dev.install.in
@@ -1,3 +1,3 @@
-usr/include/*/nx/X11/extensions/render.h
-usr/include/*/nx/X11/extensions/renderproto.h
+usr/include/*/nx-X11/extensions/render.h
+usr/include/*/nx-X11/extensions/renderproto.h
 
diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in
index 7e0ca507f..0d1f8699b 100644
--- a/debian/nx-x11proto-xext-dev.install.in
+++ b/debian/nx-x11proto-xext-dev.install.in
@@ -1,4 +1,4 @@
-usr/include/*/nx/X11/extensions/xteststr.h
-usr/include/*/nx/X11/extensions/shapestr.h
-usr/include/*/nx/X11/extensions/shmstr.h
-usr/include/*/nx/X11/extensions/syncstr.h
+usr/include/*/nx-X11/extensions/xteststr.h
+usr/include/*/nx-X11/extensions/shapestr.h
+usr/include/*/nx-X11/extensions/shmstr.h
+usr/include/*/nx-X11/extensions/syncstr.h
diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install.in
index 4b614d6c1..91eae0306 100644
--- a/debian/nx-x11proto-xfixes-dev.install.in
+++ b/debian/nx-x11proto-xfixes-dev.install.in
@@ -1,3 +1,3 @@
-usr/include/*/nx/X11/extensions/xfixeswire.h
-usr/include/*/nx/X11/extensions/xfixesproto.h
+usr/include/*/nx-X11/extensions/xfixeswire.h
+usr/include/*/nx-X11/extensions/xfixesproto.h
 
diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in
index 36717e1f5..dca06ddee 100644
--- a/debian/nx-x11proto-xinerama-dev.install.in
+++ b/debian/nx-x11proto-xinerama-dev.install.in
@@ -1 +1 @@
-usr/include/*/nx/X11/extensions/panoramiXproto.h
\ No newline at end of file
+usr/include/*/nx-X11/extensions/panoramiXproto.h
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index b3060b36f..b78855033 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,28 +42,28 @@ override_dh_install:
 	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a
 
 	# remove extras, GL, and other unneeded headers
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/GL/
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XInput.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmstr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86misc.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dgastr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfstr.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfont.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XI.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/Xtrans/
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XInput.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xtrap*.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/record*.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmode.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmstr.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86misc.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dgastr.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1str.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86mscstr.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfstr.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h
+	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/Xtrans/
 
 	dh_install --fail-missing