aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-09-04 12:47:27 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-09-04 12:47:27 +0200
commit8d2827b2a375ce945369d0892fdbb1f5d5052dbd (patch)
tree5d3501577a34b6bfcbadc443fd9774c65d668b05 /debian
parent3fdfd5142dc322b6c1f1afd5de853ba301dff02c (diff)
downloadnx-libs-8d2827b2a375ce945369d0892fdbb1f5d5052dbd.tar.gz
nx-libs-8d2827b2a375ce945369d0892fdbb1f5d5052dbd.tar.bz2
nx-libs-8d2827b2a375ce945369d0892fdbb1f5d5052dbd.zip
Refresh patch 200_nxagent_check-binary-x2go-flavour.full.patch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 46c9a1132..58984a927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low
sure x2goagent launches even with pam_tmpdir.so being in use.
* Add VERSION.x2goagent to package x2goagent package so x2goversion command
lists up x2goagent in the list of X2Go server-side packages.
+ * Refresh patch: 200_nxagent_check-binary-x2go-flavour.full.patch.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200
diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
index 635d42878..c69202088 100644
--- a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
+++ b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
@@ -9,7 +9,7 @@ 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
-@@ -180,6 +180,29 @@
+@@ -177,6 +177,29 @@
int nxagentDoFullGeneration = 1;
@@ -39,7 +39,7 @@ Last-Update: 2012-01-11
/*
* Called at X server's initialization.
*/
-@@ -196,6 +219,11 @@
+@@ -193,6 +216,11 @@
#endif
/*