diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-17 12:09:54 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-17 12:10:04 +0100 |
| commit | a96a43f14b27ab9ff51c4dbd4e60024374baa4d7 (patch) | |
| tree | 707f80d309130d98b1b80ae471c6a679e7ce5b7c /debian | |
| parent | ded201707148e26756653c9aba0e46fb0c5e027b (diff) | |
| download | nx-libs-a96a43f14b27ab9ff51c4dbd4e60024374baa4d7.tar.gz nx-libs-a96a43f14b27ab9ff51c4dbd4e60024374baa4d7.tar.bz2 nx-libs-a96a43f14b27ab9ff51c4dbd4e60024374baa4d7.zip | |
Enable Xinerama support for RPM packages. (Fixes: #370).
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/Makefile.nx-libs | 9 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index ac814dd2f..1aecee9d3 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -3,6 +3,7 @@ INSTALL_DIR=install -d -m 755 INSTALL_FILE=install -m 644 INSTALL_PROGRAM=install -m 755 +INSTALL_SYMLINK=ln -s -f COPY_SYMLINK=cp -a RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty @@ -114,6 +115,14 @@ install-full: "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"/ || true; \ done; \ + # Provide means for Xinerama support in NX/X2Go sessions. This + # This also requires two post-install symlinks: + # (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6 + # (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6 + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama + $(INSTALL_SYMLINK) ../libNX_Xinerama.so $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so + $(INSTALL_SYMLINK) ../libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps $(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \ $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps/ diff --git a/debian/changelog b/debian/changelog index 4486f7f48..72cbc7b2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low + Use local tarball, don't expect ,,-full'' in tarball name. + The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode __global_ldflags macro for EPEL builds. + + Enable Xinerama support for RPM packages. (Fixes: #370). [ Clemens Lang ] * Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix |