From 322e39b79729bc72bd37265949a04962e427ef0a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 30 Jun 2017 13:58:47 +0200 Subject: m4/nx-macros.m4: Add autotools macros derived from X.org and nxcomp* configure.in files. --- debian/copyright | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 607cb2a1d..cce8e17dd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2875,6 +2875,11 @@ Files: mesa-quilt Copyright: Mike Gabriel License: GPL-3+ +Files: m4/nx-macros.m4 +Copyright: 2005, 2006, Oracle and/or its affiliates + 2017, Mike Gabriel +License: Expat + Files: ChangeLog Makefile VERSION -- cgit v1.2.3 From 41ea54b0217175a4b78980671f4c6818eb66b166 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 26 Apr 2017 13:26:47 +0200 Subject: nxproxy: Switch to autoreconf. This also solves the last remnant of overlinking as described in GH issue #133. Fixes ArcticaProject/nx-libs#133. --- debian/copyright | 11 ++++++----- debian/rules | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index cce8e17dd..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 @@ -2912,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 2011-2016, Mike Gabriel */ @@ -2944,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..1400c79bd 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 --with-symbols --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR) --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports -- cgit v1.2.3 From 397d3ac06a83a94606be75daaeb2aba056ad4254 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Jul 2017 11:47:02 +0200 Subject: debian/rules: Drop redundant --with-symbols configure option, '-g' already gets added by debhelper. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 1400c79bd..adfc34e5e 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ 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) --libexecdir=$(LIBEXECDIR)" 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 -- cgit v1.2.3