From 3c2fe1ace2ce02a02d65d6eeb0ae05b2da395ab1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 28 Dec 2011 23:18:58 +0100 Subject: Change naming scheme of patch files. --- .../002_nxcompshad-build-against-nx-x11-only.patch | 32 ------ .../002_nxcompshad_build-against-nx-x11-only.patch | 32 ++++++ debian/patches/003_nxcompshad-gcc43.patch | 26 ----- debian/patches/003_nxcompshad_gcc43.patch | 26 +++++ .../patches/004_nx-x11-fix-nxcompshad-build.patch | 11 -- .../patches/004_nx-x11_fix-nxcompshad-build.patch | 11 ++ debian/patches/005_add-nxagent-wrapper.patch | 12 --- .../patches/005_nxagent_add-nxagent-wrapper.patch | 12 +++ .../patches/007_nxcompshad-clean-gch-files.patch | 11 -- .../patches/007_nxcompshad_clean-gch-files.patch | 11 ++ debian/patches/008_add-nx-proxy-wrapper.patch | 13 --- .../patches/008_nxproxy_add-nx-proxy-wrapper.patch | 13 +++ debian/patches/009_nxproxy-add-man-page.patch | 30 ------ debian/patches/009_nxproxy_add-man-page.patch | 30 ++++++ .../010_nxauth-fix-binary-name-in-man-page.patch | 114 --------------------- .../010_nxauth_fix-binary-name-in-man-page.patch | 114 +++++++++++++++++++++ debian/patches/011_add-nxauth-wrapper.patch | 13 --- debian/patches/011_nxauth_add-nxauth-wrapper.patch | 13 +++ debian/patches/012_nxcomp-makefile-uninstall.patch | 60 ----------- debian/patches/012_nxcomp_makefile-uninstall.patch | 60 +++++++++++ .../patches/013_nxcompext-makefile-uninstall.patch | 50 --------- .../patches/013_nxcompext_makefile-uninstall.patch | 50 +++++++++ .../014_nxcompshad-makefile-uninstall.patch | 56 ---------- .../014_nxcompshad_makefile-uninstall.patch | 56 ++++++++++ .../patches/015_nxproxy-makefile-uninstall.patch | 35 ------- .../patches/015_nxproxy_makefile-uninstall.patch | 35 +++++++ debian/patches/016_nx-x11-install.patch | 26 ----- debian/patches/016_nx-x11_install-location.patch | 26 +++++ 28 files changed, 489 insertions(+), 489 deletions(-) delete mode 100644 debian/patches/002_nxcompshad-build-against-nx-x11-only.patch create mode 100644 debian/patches/002_nxcompshad_build-against-nx-x11-only.patch delete mode 100644 debian/patches/003_nxcompshad-gcc43.patch create mode 100644 debian/patches/003_nxcompshad_gcc43.patch delete mode 100644 debian/patches/004_nx-x11-fix-nxcompshad-build.patch create mode 100644 debian/patches/004_nx-x11_fix-nxcompshad-build.patch delete mode 100644 debian/patches/005_add-nxagent-wrapper.patch create mode 100644 debian/patches/005_nxagent_add-nxagent-wrapper.patch delete mode 100644 debian/patches/007_nxcompshad-clean-gch-files.patch create mode 100644 debian/patches/007_nxcompshad_clean-gch-files.patch delete mode 100644 debian/patches/008_add-nx-proxy-wrapper.patch create mode 100644 debian/patches/008_nxproxy_add-nx-proxy-wrapper.patch delete mode 100644 debian/patches/009_nxproxy-add-man-page.patch create mode 100644 debian/patches/009_nxproxy_add-man-page.patch delete mode 100644 debian/patches/010_nxauth-fix-binary-name-in-man-page.patch create mode 100644 debian/patches/010_nxauth_fix-binary-name-in-man-page.patch delete mode 100644 debian/patches/011_add-nxauth-wrapper.patch create mode 100644 debian/patches/011_nxauth_add-nxauth-wrapper.patch delete mode 100644 debian/patches/012_nxcomp-makefile-uninstall.patch create mode 100644 debian/patches/012_nxcomp_makefile-uninstall.patch delete mode 100644 debian/patches/013_nxcompext-makefile-uninstall.patch create mode 100644 debian/patches/013_nxcompext_makefile-uninstall.patch delete mode 100644 debian/patches/014_nxcompshad-makefile-uninstall.patch create mode 100644 debian/patches/014_nxcompshad_makefile-uninstall.patch delete mode 100644 debian/patches/015_nxproxy-makefile-uninstall.patch create mode 100644 debian/patches/015_nxproxy_makefile-uninstall.patch delete mode 100644 debian/patches/016_nx-x11-install.patch create mode 100644 debian/patches/016_nx-x11_install-location.patch diff --git a/debian/patches/002_nxcompshad-build-against-nx-x11-only.patch b/debian/patches/002_nxcompshad-build-against-nx-x11-only.patch deleted file mode 100644 index 975e63010..000000000 --- a/debian/patches/002_nxcompshad-build-against-nx-x11-only.patch +++ /dev/null @@ -1,32 +0,0 @@ -Build nxcompshad against own nx-X11 sources instead of the system's X11. ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -48,7 +48,7 @@ - CCDEFINES = - - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 -+LIBS = @LIBS@ -lX11 - - # - # Only if THREADS is defined. -@@ -162,7 +162,7 @@ - -Wl,--enable-auto-import \ - -Wl,--whole-archive ${LIBARCHIVE} \ - -Wl,--no-whole-archive \ -- ${LIBS} -L/usr/X11R6/lib -+ ${LIBS} - - $(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL) - # $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS) ---- a/nxcompshad/configure.in -+++ b/nxcompshad/configure.in -@@ -19,7 +19,7 @@ - - if test -d "../nx-X11/exports/include" ; then - CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" -- LIBS="$LIBS -L../nx-X11/exports/lib" -+ LIBS="-L../nx-X11/exports/lib" - fi - - dnl Check whether --with-ipaq was given. diff --git a/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch b/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch new file mode 100644 index 000000000..975e63010 --- /dev/null +++ b/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch @@ -0,0 +1,32 @@ +Build nxcompshad against own nx-X11 sources instead of the system's X11. +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -48,7 +48,7 @@ + CCDEFINES = + + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 ++LIBS = @LIBS@ -lX11 + + # + # Only if THREADS is defined. +@@ -162,7 +162,7 @@ + -Wl,--enable-auto-import \ + -Wl,--whole-archive ${LIBARCHIVE} \ + -Wl,--no-whole-archive \ +- ${LIBS} -L/usr/X11R6/lib ++ ${LIBS} + + $(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL) + # $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS) +--- a/nxcompshad/configure.in ++++ b/nxcompshad/configure.in +@@ -19,7 +19,7 @@ + + if test -d "../nx-X11/exports/include" ; then + CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" +- LIBS="$LIBS -L../nx-X11/exports/lib" ++ LIBS="-L../nx-X11/exports/lib" + fi + + dnl Check whether --with-ipaq was given. diff --git a/debian/patches/003_nxcompshad-gcc43.patch b/debian/patches/003_nxcompshad-gcc43.patch deleted file mode 100644 index c16a5c154..000000000 --- a/debian/patches/003_nxcompshad-gcc43.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/nxcompshad/Logger.h -+++ b/nxcompshad/Logger.h -@@ -18,8 +18,8 @@ - #ifndef Logger_H - #define Logger_H - --#include --#include -+#include -+#include - - // - // Error handling macros. ---- a/nxcompshad/Misc.h -+++ b/nxcompshad/Misc.h -@@ -20,8 +20,8 @@ - - #include - --#include --#include -+#include -+#include - - using namespace std; - diff --git a/debian/patches/003_nxcompshad_gcc43.patch b/debian/patches/003_nxcompshad_gcc43.patch new file mode 100644 index 000000000..c16a5c154 --- /dev/null +++ b/debian/patches/003_nxcompshad_gcc43.patch @@ -0,0 +1,26 @@ +--- a/nxcompshad/Logger.h ++++ b/nxcompshad/Logger.h +@@ -18,8 +18,8 @@ + #ifndef Logger_H + #define Logger_H + +-#include +-#include ++#include ++#include + + // + // Error handling macros. +--- a/nxcompshad/Misc.h ++++ b/nxcompshad/Misc.h +@@ -20,8 +20,8 @@ + + #include + +-#include +-#include ++#include ++#include + + using namespace std; + diff --git a/debian/patches/004_nx-x11-fix-nxcompshad-build.patch b/debian/patches/004_nx-x11-fix-nxcompshad-build.patch deleted file mode 100644 index 386dfef2e..000000000 --- a/debian/patches/004_nx-x11-fix-nxcompshad-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -1047,7 +1047,7 @@ - #else - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) - cd $(NX_XSHADOWLIBDIR) && \ -- make -+ rm -f *.o && make - #endif - - ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ diff --git a/debian/patches/004_nx-x11_fix-nxcompshad-build.patch b/debian/patches/004_nx-x11_fix-nxcompshad-build.patch new file mode 100644 index 000000000..386dfef2e --- /dev/null +++ b/debian/patches/004_nx-x11_fix-nxcompshad-build.patch @@ -0,0 +1,11 @@ +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1047,7 +1047,7 @@ + #else + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) + cd $(NX_XSHADOWLIBDIR) && \ +- make ++ rm -f *.o && make + #endif + + ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ diff --git a/debian/patches/005_add-nxagent-wrapper.patch b/debian/patches/005_add-nxagent-wrapper.patch deleted file mode 100644 index a2a9f928b..000000000 --- a/debian/patches/005_add-nxagent-wrapper.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- /dev/null -+++ b/bin/nxagent -@@ -0,0 +1,9 @@ -+#!/bin/bash -+ -+NX_LIBS=/usr/lib/nx -+LD_LIBRARY_PATH=/usr/lib/nx -+ -+export NX_LIBS -+export LD_LIBRARY_PATH -+ -+exec /usr/lib/nx/nxagent "$@" diff --git a/debian/patches/005_nxagent_add-nxagent-wrapper.patch b/debian/patches/005_nxagent_add-nxagent-wrapper.patch new file mode 100644 index 000000000..a2a9f928b --- /dev/null +++ b/debian/patches/005_nxagent_add-nxagent-wrapper.patch @@ -0,0 +1,12 @@ +--- /dev/null ++++ b/bin/nxagent +@@ -0,0 +1,9 @@ ++#!/bin/bash ++ ++NX_LIBS=/usr/lib/nx ++LD_LIBRARY_PATH=/usr/lib/nx ++ ++export NX_LIBS ++export LD_LIBRARY_PATH ++ ++exec /usr/lib/nx/nxagent "$@" diff --git a/debian/patches/007_nxcompshad-clean-gch-files.patch b/debian/patches/007_nxcompshad-clean-gch-files.patch deleted file mode 100644 index 97f543e2f..000000000 --- a/debian/patches/007_nxcompshad-clean-gch-files.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -185,7 +185,7 @@ - install.man: - - clean: -- -rm -f *~ *.o *.bak st?????? core core.* *.out.* *.exe.stackdump \ -+ -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe - - distclean: clean diff --git a/debian/patches/007_nxcompshad_clean-gch-files.patch b/debian/patches/007_nxcompshad_clean-gch-files.patch new file mode 100644 index 000000000..97f543e2f --- /dev/null +++ b/debian/patches/007_nxcompshad_clean-gch-files.patch @@ -0,0 +1,11 @@ +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -185,7 +185,7 @@ + install.man: + + clean: +- -rm -f *~ *.o *.bak st?????? core core.* *.out.* *.exe.stackdump \ ++ -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ + $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe + + distclean: clean diff --git a/debian/patches/008_add-nx-proxy-wrapper.patch b/debian/patches/008_add-nx-proxy-wrapper.patch deleted file mode 100644 index 9c208e2e8..000000000 --- a/debian/patches/008_add-nx-proxy-wrapper.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /dev/null -+++ b/bin/nxproxy -@@ -0,0 +1,9 @@ -+#!/bin/bash -+ -+NX_LIBS=/usr/lib/nx -+LD_LIBRARY_PATH=/usr/lib/nx -+ -+export NX_LIBS -+export LD_LIBRARY_PATH -+ -+exec /usr/lib/nx/nxproxy "$@" -\ No newline at end of file diff --git a/debian/patches/008_nxproxy_add-nx-proxy-wrapper.patch b/debian/patches/008_nxproxy_add-nx-proxy-wrapper.patch new file mode 100644 index 000000000..9c208e2e8 --- /dev/null +++ b/debian/patches/008_nxproxy_add-nx-proxy-wrapper.patch @@ -0,0 +1,13 @@ +--- /dev/null ++++ b/bin/nxproxy +@@ -0,0 +1,9 @@ ++#!/bin/bash ++ ++NX_LIBS=/usr/lib/nx ++LD_LIBRARY_PATH=/usr/lib/nx ++ ++export NX_LIBS ++export LD_LIBRARY_PATH ++ ++exec /usr/lib/nx/nxproxy "$@" +\ No newline at end of file diff --git a/debian/patches/009_nxproxy-add-man-page.patch b/debian/patches/009_nxproxy-add-man-page.patch deleted file mode 100644 index f872f846e..000000000 --- a/debian/patches/009_nxproxy-add-man-page.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- /dev/null -+++ b/nxproxy/man/nxproxy.1 -@@ -0,0 +1,27 @@ -+'\" -*- coding: utf-8 -*- -+.if \n(.g .ds T< \\FC -+.if \n(.g .ds T> \\F[\n[.fam]] -+.de URL -+\\$2 \(la\\$1\(ra\\$3 -+.. -+.if \n(.g .mso www.tmac -+.TH nxproxy 1 "Nov 2011" "Version 3.5.0" "NX Proxy" -+.SH NAME -+nxproxy \- NX Proxy Tool -+.SH SYNOPSIS -+'nh -+.fi -+.ad l -+\fBnxproxy\fR -+ -+.SH DESCRIPTION -+\fBnxproxy\fR is a tool that allows to tunnel X sessions through -+the NX compression libraries. \fBnxproxy\fR is a backend application -+utilized by the X2goClient GUI and some other NX/X2go clients. -+.PP -+.SH OPTIONS -+For an insight in \fBnxproxy\fR options use \fBnxproxy --help\fR on the command line. -+.PP -+.SH AUTHOR -+This manual has been written by Mike Gabriel for the X2go project -+(http://www.x2go.org). diff --git a/debian/patches/009_nxproxy_add-man-page.patch b/debian/patches/009_nxproxy_add-man-page.patch new file mode 100644 index 000000000..f872f846e --- /dev/null +++ b/debian/patches/009_nxproxy_add-man-page.patch @@ -0,0 +1,30 @@ +--- /dev/null ++++ b/nxproxy/man/nxproxy.1 +@@ -0,0 +1,27 @@ ++'\" -*- coding: utf-8 -*- ++.if \n(.g .ds T< \\FC ++.if \n(.g .ds T> \\F[\n[.fam]] ++.de URL ++\\$2 \(la\\$1\(ra\\$3 ++.. ++.if \n(.g .mso www.tmac ++.TH nxproxy 1 "Nov 2011" "Version 3.5.0" "NX Proxy" ++.SH NAME ++nxproxy \- NX Proxy Tool ++.SH SYNOPSIS ++'nh ++.fi ++.ad l ++\fBnxproxy\fR ++ ++.SH DESCRIPTION ++\fBnxproxy\fR is a tool that allows to tunnel X sessions through ++the NX compression libraries. \fBnxproxy\fR is a backend application ++utilized by the X2goClient GUI and some other NX/X2go clients. ++.PP ++.SH OPTIONS ++For an insight in \fBnxproxy\fR options use \fBnxproxy --help\fR on the command line. ++.PP ++.SH AUTHOR ++This manual has been written by Mike Gabriel for the X2go project ++(http://www.x2go.org). diff --git a/debian/patches/010_nxauth-fix-binary-name-in-man-page.patch b/debian/patches/010_nxauth-fix-binary-name-in-man-page.patch deleted file mode 100644 index cc4f46e75..000000000 --- a/debian/patches/010_nxauth-fix-binary-name-in-man-page.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- a/nx-X11/programs/nxauth/nxauth.man -+++ b/nx-X11/programs/nxauth/nxauth.man -@@ -27,51 +27,51 @@ - .\" - .TH XAUTH 1 __xorgversion__ - .SH NAME --xauth \- X authority file utility -+nxauth \- NoMachine X authority file utility - .SH SYNOPSIS --.B xauth -+.B nxauth - [ \fB\-f\fP \fIauthfile\fP ] [ \fB\-vqib\fP ] [ \fIcommand arg ...\fP ] - .SH DESCRIPTION - .PP --The \fIxauth\fP program is used to edit and display the authorization -+The \fInxauth\fP program is used to edit and display the authorization - information used in connecting to the X server. This program is usually - used to extract authorization records from one machine and merge them in on - another (as is the case when using remote logins or granting access to - other users). Commands (described below) may be entered interactively, --on the \fIxauth\fP command line, or in scripts. Note that this program -+on the \fInxauth\fP command line, or in scripts. Note that this program - does \fBnot\fP contact the X server except when the generate command is used. --Normally \fIxauth\fP is not used to create the authority file entry in -+Normally \fInxauth\fP is not used to create the authority file entry in - the first place; \fIxdm\fP does that. - .SH OPTIONS --The following options may be used with \fIxauth\fP. They may be given -+The following options may be used with \fInxauth\fP. They may be given - individually (e.g., \fI\-q \-i\|\fP) or may combined (e.g., \fI\-qi\|\fP). - .TP 8 - .B "\-f \fIauthfile\fP" - This option specifies the name of the authority file to use. By default, --\fIxauth\fP will use the file specified by the XAUTHORITY environment variable -+\fInxauth\fP will use the file specified by the nxauthORITY environment variable - or \fI\.Xauthority\fP in the user's home directory. - .TP 8 - .B \-q --This option indicates that \fIxauth\fP should operate quietly and not print --unsolicited status messages. This is the default if an \fIxauth\fP command is -+This option indicates that \fInxauth\fP should operate quietly and not print -+unsolicited status messages. This is the default if an \fInxauth\fP command is - is given on the command line or if the standard output is not directed to a - terminal. - .TP 8 - .B \-v --This option indicates that \fIxauth\fP should operate verbosely and print -+This option indicates that \fInxauth\fP should operate verbosely and print - status messages indicating the results of various operations (e.g., how many --records have been read in or written out). This is the default if \fIxauth\fP -+records have been read in or written out). This is the default if \fInxauth\fP - is reading commands from its standard input and its standard output is - directed to a terminal. - .TP 8 - .B \-i --This option indicates that \fIxauth\fP should ignore any authority file --locks. Normally, \fIxauth\fP will refuse to read or edit any authority files -+This option indicates that \fInxauth\fP should ignore any authority file -+locks. Normally, \fInxauth\fP will refuse to read or edit any authority files - that have been locked by other programs (usually \fIxdm\fP or another --\fIxauth\fP). -+\fInxauth\fP). - .TP 8 - .B \-b --This option indicates that \fIxauth\fP should attempt to break any authority -+This option indicates that \fInxauth\fP should attempt to break any authority - file locks before proceeding. Use this option only to clean up stale locks. - .SH COMMANDS - The following commands may be used to manipulate authority files: -@@ -157,14 +157,14 @@ - authority file. - .TP 8 - .B "source \fIfilename" --The specified file is treated as a script containing \fIxauth\fP commands -+The specified file is treated as a script containing \fInxauth\fP commands - to execute. Blank lines and lines beginning with a sharp sign (#) are - ignored. A single dash may be used to indicate the standard input, if it - hasn't already been read. - .TP 8 - .B "info" - Information describing the authorization file, whether or not any changes --have been made, and from where \fIxauth\fP commands are being read -+have been made, and from where \fInxauth\fP commands are being read - is printed on the standard output. - .TP 8 - .B "exit" -@@ -194,12 +194,12 @@ - local entries for different machines may be stored in one authority file. - .SH EXAMPLE - .PP --The most common use for \fIxauth\fP is to extract the entry for the -+The most common use for \fInxauth\fP is to extract the entry for the - current display, copy it to another machine, and merge it into the - user's authority file on the remote machine: - .sp - .nf -- % xauth extract \- $DISPLAY | rsh otherhost xauth merge \- -+ % nxauth extract \- $DISPLAY | rsh otherhost nxauth merge \- - .fi - .PP - .sp -@@ -207,10 +207,10 @@ - authorization using the MIT-MAGIC-COOKIE-1 protocol. Clients that - connect with this authorization will be untrusted. - .nf -- % xauth generate :0 . -+ % nxauth generate :0 . - .fi - .SH ENVIRONMENT --This \fIxauth\fP program uses the following environment variables: -+This \fInxauth\fP program uses the following environment variables: - .TP 8 - .B XAUTHORITY - to get the name of the authority file to use if the \fI\-f\fP option isn't diff --git a/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch b/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch new file mode 100644 index 000000000..cc4f46e75 --- /dev/null +++ b/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch @@ -0,0 +1,114 @@ +--- a/nx-X11/programs/nxauth/nxauth.man ++++ b/nx-X11/programs/nxauth/nxauth.man +@@ -27,51 +27,51 @@ + .\" + .TH XAUTH 1 __xorgversion__ + .SH NAME +-xauth \- X authority file utility ++nxauth \- NoMachine X authority file utility + .SH SYNOPSIS +-.B xauth ++.B nxauth + [ \fB\-f\fP \fIauthfile\fP ] [ \fB\-vqib\fP ] [ \fIcommand arg ...\fP ] + .SH DESCRIPTION + .PP +-The \fIxauth\fP program is used to edit and display the authorization ++The \fInxauth\fP program is used to edit and display the authorization + information used in connecting to the X server. This program is usually + used to extract authorization records from one machine and merge them in on + another (as is the case when using remote logins or granting access to + other users). Commands (described below) may be entered interactively, +-on the \fIxauth\fP command line, or in scripts. Note that this program ++on the \fInxauth\fP command line, or in scripts. Note that this program + does \fBnot\fP contact the X server except when the generate command is used. +-Normally \fIxauth\fP is not used to create the authority file entry in ++Normally \fInxauth\fP is not used to create the authority file entry in + the first place; \fIxdm\fP does that. + .SH OPTIONS +-The following options may be used with \fIxauth\fP. They may be given ++The following options may be used with \fInxauth\fP. They may be given + individually (e.g., \fI\-q \-i\|\fP) or may combined (e.g., \fI\-qi\|\fP). + .TP 8 + .B "\-f \fIauthfile\fP" + This option specifies the name of the authority file to use. By default, +-\fIxauth\fP will use the file specified by the XAUTHORITY environment variable ++\fInxauth\fP will use the file specified by the nxauthORITY environment variable + or \fI\.Xauthority\fP in the user's home directory. + .TP 8 + .B \-q +-This option indicates that \fIxauth\fP should operate quietly and not print +-unsolicited status messages. This is the default if an \fIxauth\fP command is ++This option indicates that \fInxauth\fP should operate quietly and not print ++unsolicited status messages. This is the default if an \fInxauth\fP command is + is given on the command line or if the standard output is not directed to a + terminal. + .TP 8 + .B \-v +-This option indicates that \fIxauth\fP should operate verbosely and print ++This option indicates that \fInxauth\fP should operate verbosely and print + status messages indicating the results of various operations (e.g., how many +-records have been read in or written out). This is the default if \fIxauth\fP ++records have been read in or written out). This is the default if \fInxauth\fP + is reading commands from its standard input and its standard output is + directed to a terminal. + .TP 8 + .B \-i +-This option indicates that \fIxauth\fP should ignore any authority file +-locks. Normally, \fIxauth\fP will refuse to read or edit any authority files ++This option indicates that \fInxauth\fP should ignore any authority file ++locks. Normally, \fInxauth\fP will refuse to read or edit any authority files + that have been locked by other programs (usually \fIxdm\fP or another +-\fIxauth\fP). ++\fInxauth\fP). + .TP 8 + .B \-b +-This option indicates that \fIxauth\fP should attempt to break any authority ++This option indicates that \fInxauth\fP should attempt to break any authority + file locks before proceeding. Use this option only to clean up stale locks. + .SH COMMANDS + The following commands may be used to manipulate authority files: +@@ -157,14 +157,14 @@ + authority file. + .TP 8 + .B "source \fIfilename" +-The specified file is treated as a script containing \fIxauth\fP commands ++The specified file is treated as a script containing \fInxauth\fP commands + to execute. Blank lines and lines beginning with a sharp sign (#) are + ignored. A single dash may be used to indicate the standard input, if it + hasn't already been read. + .TP 8 + .B "info" + Information describing the authorization file, whether or not any changes +-have been made, and from where \fIxauth\fP commands are being read ++have been made, and from where \fInxauth\fP commands are being read + is printed on the standard output. + .TP 8 + .B "exit" +@@ -194,12 +194,12 @@ + local entries for different machines may be stored in one authority file. + .SH EXAMPLE + .PP +-The most common use for \fIxauth\fP is to extract the entry for the ++The most common use for \fInxauth\fP is to extract the entry for the + current display, copy it to another machine, and merge it into the + user's authority file on the remote machine: + .sp + .nf +- % xauth extract \- $DISPLAY | rsh otherhost xauth merge \- ++ % nxauth extract \- $DISPLAY | rsh otherhost nxauth merge \- + .fi + .PP + .sp +@@ -207,10 +207,10 @@ + authorization using the MIT-MAGIC-COOKIE-1 protocol. Clients that + connect with this authorization will be untrusted. + .nf +- % xauth generate :0 . ++ % nxauth generate :0 . + .fi + .SH ENVIRONMENT +-This \fIxauth\fP program uses the following environment variables: ++This \fInxauth\fP program uses the following environment variables: + .TP 8 + .B XAUTHORITY + to get the name of the authority file to use if the \fI\-f\fP option isn't diff --git a/debian/patches/011_add-nxauth-wrapper.patch b/debian/patches/011_add-nxauth-wrapper.patch deleted file mode 100644 index 231acc6f3..000000000 --- a/debian/patches/011_add-nxauth-wrapper.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /dev/null -+++ b/bin/nxauth -@@ -0,0 +1,9 @@ -+#!/bin/bash -+ -+NX_LIBS=/usr/lib/nx -+LD_LIBRARY_PATH=/usr/lib/nx -+ -+export NX_LIBS -+export LD_LIBRARY_PATH -+ -+exec /usr/lib/nx/nxauth "$@" -\ No newline at end of file diff --git a/debian/patches/011_nxauth_add-nxauth-wrapper.patch b/debian/patches/011_nxauth_add-nxauth-wrapper.patch new file mode 100644 index 000000000..231acc6f3 --- /dev/null +++ b/debian/patches/011_nxauth_add-nxauth-wrapper.patch @@ -0,0 +1,13 @@ +--- /dev/null ++++ b/bin/nxauth +@@ -0,0 +1,9 @@ ++#!/bin/bash ++ ++NX_LIBS=/usr/lib/nx ++LD_LIBRARY_PATH=/usr/lib/nx ++ ++export NX_LIBS ++export LD_LIBRARY_PATH ++ ++exec /usr/lib/nx/nxauth "$@" +\ No newline at end of file diff --git a/debian/patches/012_nxcomp-makefile-uninstall.patch b/debian/patches/012_nxcomp-makefile-uninstall.patch deleted file mode 100644 index 9545a5766..000000000 --- a/debian/patches/012_nxcomp-makefile-uninstall.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: nx-libs/nxcomp/Makefile.in -=================================================================== ---- nx-libs.orig/nxcomp/Makefile.in 2011-12-05 09:16:34.000000000 +0100 -+++ nx-libs/nxcomp/Makefile.in 2011-12-05 09:19:28.000000000 +0100 -@@ -68,6 +68,9 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - - # - # This should be autodetected. -@@ -264,12 +267,44 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx -+ ./mkinstalldirs $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) MD5.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3 -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.a -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXalert.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NX.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXmitshm.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXpack.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXproto.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXrender.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXvars.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/MD5.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/012_nxcomp_makefile-uninstall.patch b/debian/patches/012_nxcomp_makefile-uninstall.patch new file mode 100644 index 000000000..9545a5766 --- /dev/null +++ b/debian/patches/012_nxcomp_makefile-uninstall.patch @@ -0,0 +1,60 @@ +Index: nx-libs/nxcomp/Makefile.in +=================================================================== +--- nx-libs.orig/nxcomp/Makefile.in 2011-12-05 09:16:34.000000000 +0100 ++++ nx-libs/nxcomp/Makefile.in 2011-12-05 09:19:28.000000000 +0100 +@@ -68,6 +68,9 @@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f + + # + # This should be autodetected. +@@ -264,12 +267,44 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ ./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx ++ ./mkinstalldirs $(DESTDIR)$(prefix)/include/nx ++ $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_LINK) libXcomp.so $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_DATA) libXcomp.a $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include/nx ++ $(INSTALL_DATA) MD5.h $(DESTDIR)$(prefix)/include/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3.* ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3 ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.a ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXalert.h ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NX.h ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXmitshm.h ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXpack.h ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXproto.h ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXrender.h ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXvars.h ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/MD5.h ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + @ALL@ diff --git a/debian/patches/013_nxcompext-makefile-uninstall.patch b/debian/patches/013_nxcompext-makefile-uninstall.patch deleted file mode 100644 index f4002a565..000000000 --- a/debian/patches/013_nxcompext-makefile-uninstall.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: nx-libs/nxcompext/Makefile.in -=================================================================== ---- nx-libs.orig/nxcompext/Makefile.in 2011-12-05 09:20:15.000000000 +0100 -+++ nx-libs/nxcompext/Makefile.in 2011-12-05 09:24:37.000000000 +0100 -@@ -60,7 +60,9 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -- -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - # - # This should be autodetected. - # -@@ -147,12 +149,33 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx -+ ./mkinstalldirs $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcompext.so.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlib.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlibint.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/013_nxcompext_makefile-uninstall.patch b/debian/patches/013_nxcompext_makefile-uninstall.patch new file mode 100644 index 000000000..f4002a565 --- /dev/null +++ b/debian/patches/013_nxcompext_makefile-uninstall.patch @@ -0,0 +1,50 @@ +Index: nx-libs/nxcompext/Makefile.in +=================================================================== +--- nx-libs.orig/nxcompext/Makefile.in 2011-12-05 09:20:15.000000000 +0100 ++++ nx-libs/nxcompext/Makefile.in 2011-12-05 09:24:37.000000000 +0100 +@@ -60,7 +60,9 @@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ +- ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f + # + # This should be autodetected. + # +@@ -147,12 +149,33 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ ./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx ++ ./mkinstalldirs $(DESTDIR)$(prefix)/include/nx ++ $(INSTALL_DATA) libXcompext.so.* $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_LINK) libXcompext.so $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so.* ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlib.h ++ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlibint.h ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + @ALL@ diff --git a/debian/patches/014_nxcompshad-makefile-uninstall.patch b/debian/patches/014_nxcompshad-makefile-uninstall.patch deleted file mode 100644 index 43dd17345..000000000 --- a/debian/patches/014_nxcompshad-makefile-uninstall.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -76,8 +76,13 @@ - VPATH = @srcdir@ - - INSTALL = @INSTALL@ -+INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f -+RM_DIR = rmdir -p --ignore-fail-on-non-empty - - # - # This should be autodetected. -@@ -178,12 +183,38 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcompshad.so.3.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) *.a $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) *.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3 -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.a -+ for header in *.h; do $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/$$header; done -+ $(RM_DIR) $(DESTDIR)$(prefix)/lib/nx/ -+ $(RM_DIR) $(DESTDIR)$(prefix)/include/nx/ -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/debian/patches/014_nxcompshad_makefile-uninstall.patch b/debian/patches/014_nxcompshad_makefile-uninstall.patch new file mode 100644 index 000000000..43dd17345 --- /dev/null +++ b/debian/patches/014_nxcompshad_makefile-uninstall.patch @@ -0,0 +1,56 @@ +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -76,8 +76,13 @@ + VPATH = @srcdir@ + + INSTALL = @INSTALL@ ++INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f ++RM_DIR = rmdir -p --ignore-fail-on-non-empty + + # + # This should be autodetected. +@@ -178,12 +183,38 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ $(INSTALL_DIR) $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_DIR) $(DESTDIR)$(prefix)/include/nx ++ $(INSTALL_DATA) libXcompshad.so.3.* $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_DATA) *.a $(DESTDIR)$(prefix)/lib/nx ++ $(INSTALL_DATA) *.h $(DESTDIR)$(prefix)/include/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3.* ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3 ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so ++ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.a ++ for header in *.h; do $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/$$header; done ++ $(RM_DIR) $(DESTDIR)$(prefix)/lib/nx/ ++ $(RM_DIR) $(DESTDIR)$(prefix)/include/nx/ ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ + $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/debian/patches/015_nxproxy-makefile-uninstall.patch b/debian/patches/015_nxproxy-makefile-uninstall.patch deleted file mode 100644 index 4c349fb7e..000000000 --- a/debian/patches/015_nxproxy-makefile-uninstall.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/nxproxy/Makefile.in -+++ b/nxproxy/Makefile.in -@@ -41,6 +41,8 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+DESTDIR = -+RM_FILE = rm -f - - # - # This should be autodetected. -@@ -87,11 +89,20 @@ - install: install.bin install.man - - install.bin: $(PROGRAM) -- $(srcdir)/mkinstalldirs $(bindir) -- $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) - - install.man: -- $(srcdir)/mkinstalldirs $(man1dir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) -+ $(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1 -+ -+uninstall: uninstall.bin uninstall.man -+ -+uninstall.bin: -+ $(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM) -+ -+uninstall.man: -+ $(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1 - - clean: - -rm -f *~ *.o *.bak st?????? core core.* *.out.* \ diff --git a/debian/patches/015_nxproxy_makefile-uninstall.patch b/debian/patches/015_nxproxy_makefile-uninstall.patch new file mode 100644 index 000000000..4c349fb7e --- /dev/null +++ b/debian/patches/015_nxproxy_makefile-uninstall.patch @@ -0,0 +1,35 @@ +--- a/nxproxy/Makefile.in ++++ b/nxproxy/Makefile.in +@@ -41,6 +41,8 @@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++DESTDIR = ++RM_FILE = rm -f + + # + # This should be autodetected. +@@ -87,11 +89,20 @@ + install: install.bin install.man + + install.bin: $(PROGRAM) +- $(srcdir)/mkinstalldirs $(bindir) +- $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) + + install.man: +- $(srcdir)/mkinstalldirs $(man1dir) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) ++ $(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1 ++ ++uninstall: uninstall.bin uninstall.man ++ ++uninstall.bin: ++ $(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM) ++ ++uninstall.man: ++ $(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1 + + clean: + -rm -f *~ *.o *.bak st?????? core core.* *.out.* \ diff --git a/debian/patches/016_nx-x11-install.patch b/debian/patches/016_nx-x11-install.patch deleted file mode 100644 index fecde7648..000000000 --- a/debian/patches/016_nx-x11-install.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -820,12 +820,12 @@ - - #ifndef UsrLibDir - #ifdef ProjectRoot --#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) -+#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir YES - #endif - #else --#define UsrLibDir Concat3(/usr,/,LibDirName) -+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir NO - #endif -@@ -863,7 +863,7 @@ - #endif - #ifndef IncRoot - #ifdef ProjectRoot --#define IncRoot Concat(ProjectRoot,/include) -+#define IncRoot Concat(ProjectRoot,/include/nx) - #ifndef AlternateIncRoot - #define AlternateIncRoot YES - #endif diff --git a/debian/patches/016_nx-x11_install-location.patch b/debian/patches/016_nx-x11_install-location.patch new file mode 100644 index 000000000..fecde7648 --- /dev/null +++ b/debian/patches/016_nx-x11_install-location.patch @@ -0,0 +1,26 @@ +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -820,12 +820,12 @@ + + #ifndef UsrLibDir + #ifdef ProjectRoot +-#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) ++#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir Concat3(/usr,/,LibDirName) ++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif +@@ -863,7 +863,7 @@ + #endif + #ifndef IncRoot + #ifdef ProjectRoot +-#define IncRoot Concat(ProjectRoot,/include) ++#define IncRoot Concat(ProjectRoot,/include/nx) + #ifndef AlternateIncRoot + #define AlternateIncRoot YES + #endif -- cgit v1.2.3