From 83983e944e5076ad2d8beb6dd9190559fb6c5937 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 28 Apr 2015 23:00:43 +0200 Subject: libnx-xinerama1: also create libXinerama symlink in postinst (and remove in prerm.) Due to the nx-x11-common package being a noarch/allarch package, creating the symlink in nx-libs' Makefile will lead to the symlink referencing the "default" architecture dpkg uses for building noarch/allarch packages. Incidentally, this worked fine for Debian, as amd64 seems to be the default architecture. On Ubuntu, however, the default architecture up to Vivid (15.04) was i386. For those builds, the symlink pointed to the 32 bit library of libNX_Xinerama.so.1 -- essentially breaking this feature. Move the symlink creation to the arch-sensitive libnx-xinerama1 package. The postinst and prerm scriptlets will work fine, unless someone installs the i386 package version *after* the amd64 version. Given that we already create symlinks to libNX_X11 and friends using that method, no new regression is introduced. Strictly speaking that's a bug, but we'll hopefully clean that up later... --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9f6442181..47efbde52 100644 --- a/Makefile +++ b/Makefile @@ -155,11 +155,12 @@ install-full: 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//libX11.so.6 - # (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr//libXext.so.6 - $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama - $(INSTALL_SYMLINK) $(USRLIBDIR)/libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 + # This also requires three post-install symlinks created by libnx-xinerama1: + # $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr//libX11.so.6 + # $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr//libXext.so.6 + # $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 -> /usr//libNX_Xinerama.so.1 + # Only create the owned directory here for nx-x11-common. + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11 $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX) $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO) -- cgit v1.2.3