Drop NX agent unbrand patch from FreeNX.

debian/changelog

@@ -2,6 +2,7 @@ nx-libs (2:3.5.0.2-1) UNRELEASED; urgency=low
 
   * Rename nxagent-unbrand patch, so that is the last patch to be applied
     (999_<patchname>).
+  * Drop NX agent unbrand patch from FreeNX.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 11 Jan 2012 15:30:36 +0100
 

debian/patches/999_nxagent_unbrand-agent.patch

-Description: Unbrand NX Agent Startup Screen
- By design this patch is probably not interesting to
- NX upstream.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2012-12-31
---- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
-@@ -1754,7 +1754,20 @@
-       #ifdef TEST
-       fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n",
-                   nxagentDefaultWindows[pScreen->myNum]);
-+      
-+      fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n",
-+                  nxagentDefaultWindows[pScreen->myNum]);      
-       #endif
-+      
-+      XClassHint hint;
-+      hint.res_name=malloc(strlen(HINT)+1);
-+      hint.res_class=malloc(strlen(HINT)+1);
-+      strcpy(hint.res_name,HINT);
-+      strcpy(hint.res_class,HINT);
-+      XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint);
-+      free(hint.res_name);
-+      free(hint.res_class);
-+      
- 
-       if (nxagentOption(Fullscreen))
-       {
---- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
-@@ -36,6 +36,8 @@
- #define MIN_NXAGENT_HEIGHT 60
- #define NXAGENT_FRAME_WIDTH 2000
- 
-+#define HINT "NXAgent"
-+
- #define nxagentSetPrintGeometry(screen) \
-     nxagentPrintGeometryFlags = (1 << (screen));
-     
---- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
-@@ -204,6 +204,7 @@
- 
-   nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth);
- 
-+  return;
-   if (!nxagentPixmapLogo)
-   {
-     return;
---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
-@@ -1919,7 +1919,7 @@
-   XlibPixmap IconPixmap;
-   XlibPixmap IconShape;
- 
--  snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME);
-+  snprintf(default_path, PATH_MAX-1, "/usr/share/pixmaps/%s", NXAGENT_ICON_NAME);
- 
-   if ((icon_fp = fopen(default_path, "r")) == NULL)
-   {

debian/patches/series

@@ -29,4 +29,7 @@
 108_nxagent_wine-close-delay.patch
 109_nxagent_locale-utf8-compound-text.patch
 110_nxagent_createpixmap-bounds-check.patch
-999_nxagent_unbrand-agent.patch
+200_nxagent_check-binary-x2go-flavour.patch
+201_nxagent_set-x2go-icon-if-x2goagent-flavour.patch
+300_nxagent_set-wm-class.patch
+999_nxagent_unbrand-nxagent-brand-x2goagent.patch
\ No newline at end of file