From c45cab1ba5a6ffe3832039d89c26a6d11068d417 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:52:04 +0100 Subject: Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with nx-X11 internal naming schemes (and use /usr//nx/X11 rather than /usr//nx-X11). --- debian/nxagent.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/nxagent.install b/debian/nxagent.install index 75e72fcde..5f6a9de35 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -4,7 +4,7 @@ usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent -usr/lib/*/nx-X11/ +usr/lib/*/nx/X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard -- cgit v1.2.3 From 4a01be659888c4a6a0eeb8396a3521ee759a7e20 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:53:25 +0100 Subject: debian/rules: Don't manually override SHLIBDIR via the dh_auto_build call. The default in the main Makefile should work fine. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index d30574c07..180de6984 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ override_dh_auto_install: override_dh_auto_build: - PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' SHLIBDIR="$(LIBDIR)" + PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- cgit v1.2.3 From a474b9f931a2e22ce5d6255f1179c3b0cd00dd85 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 19:02:16 +0100 Subject: debian/patches: Update 016_nx-X11_install-location.debian.patch. Adapt path to recent upstream changes. --- debian/patches/016_nx-X11_install-location.debian.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index ee5bb66cf..d8a63a6c0 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -6,16 +6,16 @@ Author: Mike Gabriel Last-Update: 2012-12-31 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -749,7 +749,7 @@ +@@ -730,7 +730,7 @@ #define AlternateUsrLibDir YES #endif #else --#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) -+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) +-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) ++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -767,7 +767,7 @@ +@@ -748,7 +748,7 @@ #define AlternateUsrDataDir YES #endif #else @@ -26,7 +26,7 @@ Last-Update: 2012-12-31 #endif --- a/nx-X11/config/cf/site.def +++ b/nx-X11/config/cf/site.def -@@ -72,7 +72,7 @@ +@@ -69,7 +69,7 @@ #ifdef AfterVendorCF #ifndef ProjectRoot -- cgit v1.2.3 From 52760b6e8727032dd1845359f3ac9d2c147872bb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Feb 2017 16:31:00 +0100 Subject: debian/patches: Update comment header of 016_nx-X11_install-location.debian.patch. --- debian/patches/016_nx-X11_install-location.debian.patch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index d8a63a6c0..c758a3cfe 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -1,9 +1,17 @@ Description: FHS adaptation for Debian packaging - On Debian, NX libraries and binaries are installed to - /usr/lib/nx. +Abstract: + On Debian, binaries are installed to /usr//nx. + . + Also, a fake-libX11 library symlink is placed into + /usr//nx/X11. + . + The given paths will be overridden by the Debian packaging + and modified into multi-arch paths. + Forwarded: not-needed Author: Mike Gabriel -Last-Update: 2012-12-31 +Last-Update: 2017-02-08 + --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -730,7 +730,7 @@ -- cgit v1.2.3