aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-02-10 00:47:32 +0100
committerMihai Moldovan <ionic@ionic.de>2017-02-10 00:47:32 +0100
commit0a7df07702c6f56b708a22c666077a3b90c7542c (patch)
tree760707ab65b4e2ab39ac744d740af03f854dd9b0 /debian
parent0a314adfa63669155299c77e479ed68c349643bd (diff)
parent99c130f153b88fb9c779b0fd1f91d78cc4e75d01 (diff)
downloadnx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.tar.gz
nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.tar.bz2
nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.zip
Merge branch 'sunweaver-pr/use-rpath-for-nxagent' into 3.6.x
Attributes GH PR #313: https://github.com/ArcticaProject/nx-libs/pull/313
Diffstat (limited to 'debian')
-rw-r--r--debian/nxagent.install2
-rw-r--r--debian/patches/016_nx-X11_install-location.debian.patch24
-rwxr-xr-xdebian/rules2
3 files changed, 18 insertions, 10 deletions
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
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch
index ee5bb66cf..c758a3cfe 100644
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ b/debian/patches/016_nx-X11_install-location.debian.patch
@@ -1,21 +1,29 @@
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/<lib>/nx.
+ .
+ Also, a fake-libX11 library symlink is placed into
+ /usr/<lib>/nx/X11.
+ .
+ The given paths will be overridden by the Debian packaging
+ and modified into multi-arch paths.
+
Forwarded: not-needed
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2012-12-31
+Last-Update: 2017-02-08
+
--- 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 +34,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
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