From 433d8186588698ce6a435fbff5e9d40a37b78be9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Jul 2015 16:16:40 +0200 Subject: Clear header file namespace separation ( vs. ). 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. --- debian/nx-x11proto-xfixes-dev.install.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/nx-x11proto-xfixes-dev.install.in') 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 -- cgit v1.2.3 From 593e15ca1c93c83ae5629de450c2c92f7ca3ab56 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:09:17 +0200 Subject: debian/*: Drop non-multi-arch support (i.e. Debian squeeze, Ubuntu 10.04 and earlier). --- debian/nx-x11proto-xfixes-dev.install.in | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 debian/nx-x11proto-xfixes-dev.install.in (limited to 'debian/nx-x11proto-xfixes-dev.install.in') diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install.in deleted file mode 100644 index 91eae0306..000000000 --- a/debian/nx-x11proto-xfixes-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/*/nx-X11/extensions/xfixeswire.h -usr/include/*/nx-X11/extensions/xfixesproto.h - -- cgit v1.2.3