aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/control2
-rw-r--r--debian/patches-pending-evaluation/fix-icon-and-clipboard.patch2
-rw-r--r--debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index 3e1f45e5d..d7e6f9a2c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends:
pkg-config,
x11proto-core-dev,
expat,
- libpixman-1-dev,
+ libpixman-1-dev (>= 0.13.2),
Standards-Version: 3.9.6
Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
Vcs-Git: git://code.x2go.org/nx-libs.git
diff --git a/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch b/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch
index e4faef051..d6ecf8f19 100644
--- a/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch
+++ b/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch
@@ -323,7 +323,7 @@ index 862f75a..5405568 100644
x.u.u.type = SelectionRequest;
x.u.selectionRequest.time = GetTimeInMillis();
x.u.selectionRequest.owner = lastOwnerWindow;
- x.u.selectionRequest.requestor = WindowTable[0]->drawable.id;
+ x.u.selectionRequest.requestor = screenInfo.screens[0]->root->drawable.id;
- x.u.selectionRequest.selection = XA_PRIMARY;
+/* My changes */
+/*
diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
index 0d11f2f0a..cc95c8153 100644
--- a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
+++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
@@ -8,7 +8,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2012-01-12
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
-@@ -86,7 +86,7 @@
+@@ -78,7 +78,7 @@
#ifdef NXAGENT_SERVER