8 files changed, 4 insertions, 48 deletions
diff --git a/debian/nxagent.install b/debian/nxagent.install
index 7635a5edf..a2d05b332 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,5 +1,5 @@
-nx-X11/programs/Xserver/nxagent    usr/lib/nx
-bin/nxagent                        usr/bin
+nx-X11/programs/Xserver/nxagent                usr/lib/nx
+debian/bin/nxagent                             usr/bin
 debian/rgb                                     usr/share/nx
 debian/nxagent.keyboard                        etc/nxagent
 nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps
 \ No newline at end of file
diff --git a/debian/nxauth.install b/debian/nxauth.install
index 52d801c6b..d5e28ec2b 100644
--- a/debian/nxauth.install
+++ b/debian/nxauth.install
@@ -1,2 +1,2 @@
 nx-X11/programs/nxauth/nxauth                    usr/lib/nx/
-bin/nxauth                                       usr/bin
+debian/bin/nxauth                                usr/bin
diff --git a/debian/nxproxy.install b/debian/nxproxy.install
index 42a49f25b..4db97ca53 100644
--- a/debian/nxproxy.install
+++ b/debian/nxproxy.install
@@ -1,3 +1,3 @@
 nxproxy/nxproxy                    usr/lib/nx
-bin/nxproxy                        usr/bin
+debian/bin/nxproxy                 usr/bin
 
diff --git a/debian/patches/005_nxagent_add-nxagent-wrapper.patch b/debian/patches/005_nxagent_add-nxagent-wrapper.patch
deleted file mode 100644
index 2d0123bcc..000000000
--- a/debian/patches/005_nxagent_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:/usr/lib/nx/X11:$LD_LIBRARY_PATH
-+
-+export NX_LIBS
-+export LD_LIBRARY_PATH
-+
-+exec /usr/lib/nx/nxagent "$@"
diff --git a/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch b/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch
deleted file mode 100644
index 0d9077f5d..000000000
--- a/debian/patches/008_nxproxy_add-nxproxy-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:/usr/lib/nx/X11:$LD_LIBRARY_PATH
-+
-+export NX_LIBS
-+export LD_LIBRARY_PATH
-+
-+exec /usr/lib/nx/nxproxy "$@"
-\ 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
deleted file mode 100644
index 1a731b6a5..000000000
--- a/debian/patches/011_nxauth_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:/usr/lib/nx/X11:$LD_LIBRARY_PATH
-+
-+export NX_LIBS
-+export LD_LIBRARY_PATH
-+
-+exec /usr/lib/nx/nxauth "$@"
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 57938c157..4c1431a84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,13 +2,9 @@
 002_nxcompshad_build-against-nx-x11-only.patch
 003_nxcompshad_gcc43.patch
 004_nx-x11_fix-nxcompshad-build.patch
-005_nxagent_add-nxagent-wrapper.patch
-#006_remove-configure-files.patch
 007_nxcompshad_clean-gch-files.patch
-008_nxproxy_add-nxproxy-wrapper.patch
 009_nxproxy_add-man-page.patch
 010_nxauth_fix-binary-name-in-man-page.patch
-011_nxauth_add-nxauth-wrapper.patch
 012_nxcomp_makefile-uninstall.patch
 013_nxcompext_makefile-uninstall.patch
 014_nxcompshad_makefile-uninstall.patch
diff --git a/debian/rules b/debian/rules
index 44ea97188..09b5ec27e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,6 @@ override_dh_auto_install:
 
 override_dh_quilt_patch:
 	dh_quilt_patch
-	chmod a+x bin/nxagent
-	chmod a+x bin/nxproxy
 
 override_dh_quilt_unpatch:
 	dh_quilt_unpatch