integrate nx*/x2go* shell wrappers into debian/wrappers

No longer add them as quilt patch, as they are much easier to edit this
way. This, of course, requires adjustments to the roll-tarballs.sh script

5 files changed, 0 insertions, 147 deletions

diff --git a/debian/patches/020_add-nxagent-wrapper.full.patch b/debian/patches/020_add-nxagent-wrapper.full.patch
deleted file mode 100644
index 6e98cb8cf..000000000
--- a/debian/patches/020_add-nxagent-wrapper.full.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- /dev/null
-+++ b/bin/nxagent
-@@ -0,0 +1,32 @@
-+#!/bin/bash
-+
-+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see http://www.gnu.org/licenses/.
-+
-+NXAPP=nxagent
-+NX_LIBS=/usr/lib/nx
-+NX_LOCAL_LIBS=/usr/local/lib/nx
-+
-+# make sure nxagent starts properly with pam_tmpdir.so being in use
-+NX_TEMP=${NX_TEMP:-/tmp}
-+export NX_TEMP
-+
-+LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
-+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-+
-+export LD_LIBRARY_PATH
-+
-+exec $NX_LIBS/bin/$NXAPP "$@"
diff --git a/debian/patches/021_add-nxauth-wrapper.full.patch b/debian/patches/021_add-nxauth-wrapper.full.patch
deleted file mode 100644
index caa1a71c8..000000000
--- a/debian/patches/021_add-nxauth-wrapper.full.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- /dev/null
-+++ b/bin/nxauth
-@@ -0,0 +1,32 @@
-+#!/bin/bash
-+
-+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see http://www.gnu.org/licenses/.
-+
-+NXAPP=nxauth
-+NX_LIBS=/usr/lib/nx
-+NX_LOCAL_LIBS=/usr/local/lib/nx
-+
-+# make sure nxagent starts properly with pam_tmpdir.so being in use
-+NX_TEMP=${NX_TEMP:-/tmp}
-+export NX_TEMP
-+
-+LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
-+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-+
-+export LD_LIBRARY_PATH
-+
-+exec $NX_LIBS/bin/$NXAPP "$@"
-\ No newline at end of file
diff --git a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
deleted file mode 100644
index 20a1e6823..000000000
--- a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- /dev/null
-+++ b/bin/nxproxy
-@@ -0,0 +1,32 @@
-+#!/bin/bash
-+
-+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see http://www.gnu.org/licenses/.
-+
-+NXAPP=nxproxy
-+NX_LIBS=/usr/lib/nx
-+NX_LOCAL_LIBS=/usr/local/lib/nx
-+
-+# make sure nxagent starts properly with pam_tmpdir.so being in use
-+NX_TEMP=${NX_TEMP:-/tmp}
-+export NX_TEMP
-+
-+LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
-+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-+
-+export LD_LIBRARY_PATH
-+
-+exec $NX_LIBS/bin/$NXAPP "$@"
-\ No newline at end of file
diff --git a/debian/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch
deleted file mode 100644
index b3be89434..000000000
--- a/debian/patches/023_add-x2goagent-wrapper.full.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- /dev/null
-+++ b/bin/x2goagent
-@@ -0,0 +1,32 @@
-+#!/bin/bash
-+
-+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see http://www.gnu.org/licenses/.
-+
-+NXAPP=x2goagent
-+NX_LIBS=/usr/lib/nx
-+NX_LOCAL_LIBS=/usr/local/lib/nx
-+
-+# make sure nxagent starts properly with pam_tmpdir.so being in use
-+NX_TEMP=${NX_TEMP:-/tmp}
-+export NX_TEMP
-+
-+LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
-+test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-+test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-+
-+export LD_LIBRARY_PATH
-+
-+exec $NX_LIBS/../x2go/bin/$NXAPP "$@"
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 01ce809fa..5099b997d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,10 +17,6 @@
 017_nx-X11_update-autotools-helper-files.full.patch
 018_nx-X11_update-libtool-ltmain-script.full.patch
 019_nx-X11_expat-build-against-system-libxmltok.full.patch
-020_add-nxagent-wrapper.full.patch
-021_add-nxauth-wrapper.full.patch
-022_add-nxproxy-wrapper.full+lite.patch
-023_add-x2goagent-wrapper.full.patch
 024_fix-make-clean.full.patch
 024_fix-make-clean.full+lite.patch
 026_nxcompext_honour-optflags.full.patch