[X2go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.3-1-g96cd432
X2go dev team
git-admin at x2go.org
Thu Jan 12 23:04:11 CET 2012
The branch, master has been updated
via 96cd4325b07e6062175851c1998f2535e6c948f0 (commit)
from e40208d7c1ad1c80bf3e591405767a1106efa21f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 96cd4325b07e6062175851c1998f2535e6c948f0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jan 12 23:04:03 2012 +0100
Update/fix patch: 999_nxagent_unbrand-nxagent-brand-x2goagent.patch.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 ++++++
...9_nxagent_unbrand-nxagent-brand-x2goagent.patch | 10 ++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 10fea95..f31f2a9 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 at 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 67e4c5d..7a5ce54 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;
+
hooks/post-receive
--
nx-libs.git (NX libraries (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX libraries (redistributed)).
More information about the x2go-commits
mailing list