aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch64
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 65 deletions
diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
deleted file mode 100644
index c69202088..000000000
--- a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Detect nxagent/x2goagent flavour
- Whether the agent runs in X2Go or NX mode is decide by the
- name of the binary that executes the code.
- .
- Binary name equal to nxagent -> (Free)NX flavour
- Binary name equal to x2goagent -> X2Go flavour
-Forwarded: not-needed
-Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
-Last-Update: 2012-01-11
---- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
-@@ -177,6 +177,29 @@
-
- int nxagentDoFullGeneration = 1;
-
-+ /*
-+ * 1 if agent running as X2goAgent
-+ * 0 if NX Agent
-+ */
-+int nxagentX2go;
-+
-+/*
-+ * Checking if agent is x2go agent
-+ */
-+
-+void checkX2goAgent()
-+{
-+ extern const char *__progname;
-+ if( strcasecmp(__progname,"x2goagent") == 0)
-+ {
-+ fprintf(stderr, "\nrunning as X2Go Agent\n");
-+ nxagentX2go=1;
-+ }
-+ else
-+ nxagentX2go=0;
-+}
-+
-+
- /*
- * Called at X server's initialization.
- */
-@@ -193,6 +216,11 @@
- #endif
-
- /*
-+ * Check if we running as X2Go Agent
-+ */
-+ checkX2goAgent();
-+
-+ /*
- * Print our pid and version information.
- */
-
---- a/nx-X11/programs/Xserver/hw/nxagent/Init.h
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h
-@@ -37,6 +37,8 @@
- extern int nxagentBackingStore;
- extern int nxagentSaveUnder;
-
-+extern int nxagentX2go;
-+
- extern ServerGrabInfoRec nxagentGrabServerInfo;
-
- #endif /* __Init_H__ */
diff --git a/debian/patches/series b/debian/patches/series
index 5a5a30e08..f1c8a87b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-200_nxagent_check-binary-x2go-flavour.full.patch
201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
202_nx-X11_enable-xinerama.full.patch
203_nxagent_disable-rootless-exit.full.patch