aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-12 23:04:03 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-12 23:04:03 +0100
commit96cd4325b07e6062175851c1998f2535e6c948f0 (patch)
treec86ee9109908c90c4d754d8412d58c3a2db27a03
parente40208d7c1ad1c80bf3e591405767a1106efa21f (diff)
downloadnx-libs-96cd4325b07e6062175851c1998f2535e6c948f0.tar.gz
nx-libs-96cd4325b07e6062175851c1998f2535e6c948f0.tar.bz2
nx-libs-96cd4325b07e6062175851c1998f2535e6c948f0.zip
Update/fix patch: 999_nxagent_unbrand-nxagent-brand-x2goagent.patch.
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch10
2 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 10fea951f..f31f2a98a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nx-libs (2:3.5.0.4-0) UNRELEASED; urgency=low
+
+ * Update/fix patch: 999_nxagent_unbrand-nxagent-brand-x2goagent.patch.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 12 Jan 2012 23:03:03 +0100
+
nx-libs (2:3.5.0.3-0) unstable; urgency=low
* Rename nxagent-unbrand patch, so that is the last patch to be applied
diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
index 67e4c5d03..7a5ce5437 100644
--- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
+++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
@@ -284,3 +284,13 @@ Last-Update: 2012-01-11
useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape);
+--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
++++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+@@ -33,6 +33,7 @@
+ extern int nxagentLogoWhite;
+ extern int nxagentLogoRed;
+ extern int nxagentLogoBlack;
++extern int nxagentLogoGray;
+
+ extern Window nxagentSplashWindow;
+