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-xinerama-dev.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/nx-x11proto-xinerama-dev.install.in') 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 -- cgit v1.2.3 From 2d776b14fddc5ec70c97aa82672f3a7c9caef6a3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 May 2015 10:24:24 +0200 Subject: library clean-up: Don't build libNX_Xinerama anymore. Use system's libXinerama shared library. (Fixes ArcticaProject/nx-libs#49). This commit goes along with a patch from Ulrich Sibiller who managed to move the Xinerama awareness for NX sessions into the Xserver code. This makes Xinerama support for NX in libNX_Xinerama.so obsolete. Fixes ArcticaProject/nx-libs#49 --- debian/nx-x11proto-xinerama-dev.install.in | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/nx-x11proto-xinerama-dev.install.in (limited to 'debian/nx-x11proto-xinerama-dev.install.in') diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in deleted file mode 100644 index dca06ddee..000000000 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/include/*/nx-X11/extensions/panoramiXproto.h \ No newline at end of file -- cgit v1.2.3 From e794be341e7ca63ff9e0397c60e408c610d63067 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 2 Jan 2016 07:30:02 +0100 Subject: debian/nx-x11proto-xinerama-dev.install.in: Install PANORAMIX extension header files into its own nx-x11proto bin:package. (more Xinerama clean-up, fix FTBFS during dh_install). --- debian/nx-x11proto-xinerama-dev.install.in | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/nx-x11proto-xinerama-dev.install.in (limited to 'debian/nx-x11proto-xinerama-dev.install.in') diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in new file mode 100644 index 000000000..2e1efbc63 --- /dev/null +++ b/debian/nx-x11proto-xinerama-dev.install.in @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/panoramiXext.h +usr/include/*/nx-X11/extensions/panoramiXproto.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-xinerama-dev.install.in | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/nx-x11proto-xinerama-dev.install.in (limited to 'debian/nx-x11proto-xinerama-dev.install.in') diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in deleted file mode 100644 index 2e1efbc63..000000000 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/panoramiXext.h -usr/include/*/nx-X11/extensions/panoramiXproto.h -- cgit v1.2.3