diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-07-12 23:56:42 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-07-12 23:56:42 +0200 |
| commit | 06bf2a492daa0a95b0faa58f2e0508f2ed262f92 (patch) | |
| tree | ac8470b67015f42fc031839a9ff700bca5cec7d3 /debian | |
| parent | e17207f183ea031d21a65ba31b026f9d0178afb6 (diff) | |
| parent | 397d3ac06a83a94606be75daaeb2aba056ad4254 (diff) | |
| download | nx-libs-06bf2a492daa0a95b0faa58f2e0508f2ed262f92.tar.gz nx-libs-06bf2a492daa0a95b0faa58f2e0508f2ed262f92.tar.bz2 nx-libs-06bf2a492daa0a95b0faa58f2e0508f2ed262f92.zip | |
Merge branch 'sunweaver-pr/nxproxy-autoreconf' into 3.6.x
Attributes GH PR #473: https://github.com/ArcticaProject/nx-libs/pull/473
Fixes: ArcticaProject/nx-libs#133
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/copyright | 16 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 13 insertions, 6 deletions
diff --git a/debian/copyright b/debian/copyright index 607cb2a1d..b08ec0335 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2756,7 +2756,7 @@ Files: nx-X11/programs/Xserver/os/xdmcp.c Copyright: 1989, Network Computing Devices, Inc., Mountain View, California License: MIT~VeryOldStyle~NCD -Files: nxproxy/Main.c +Files: nxproxy/src/Main.c Copyright: 2001, 2011, NoMachine, http://www.nomachine.com/. License: GPL-2 @@ -2875,6 +2875,11 @@ Files: mesa-quilt Copyright: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-3+ +Files: m4/nx-macros.m4 +Copyright: 2005, 2006, Oracle and/or its affiliates + 2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: Expat + Files: ChangeLog Makefile VERSION @@ -2907,10 +2912,13 @@ Files: ChangeLog nxcompshad/VERSION nxcompshad/configure.in nxcompshad/nxcompshad.pc.in - nxproxy/Makefile.in nxproxy/VERSION - nxproxy/configure.in nxproxy/man/nxproxy.1 + nxproxy/Makefile.am + nxproxy/configure.ac + nxproxy/m4/.placeholder + nxproxy/man/Makefile.am + nxproxy/src/Makefile.am Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) 2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> 2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/ @@ -2939,13 +2947,11 @@ Comment: Contributions by Daniel Stone have been licensed under MIT~X11. Files: nxcomp/mkinstalldirs - nxproxy/mkinstalldirs Copyright: *No copyright* License: public-domain Files: nxcomp/install-sh nxcompshad/install-sh - nxproxy/install-sh Copyright: 1994, X Consortium License: Expat~NoAdvert Comment: diff --git a/debian/rules b/debian/rules index 707bdec54..adfc34e5e 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,11 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" +export LIBEXECDIR = "$(LIBDIR)/nx/bin" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" %: - CONFIGURE="./configure --with-symbols --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR)" dh $@ --with quilt + CONFIGURE="./configure --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR) --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports |