[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-server/3.5.0.8-6-g3467d6b

[X2Go dev team]

The branch, build-main has been updated
       via  3467d6b762bd56ea728c64bab322263ce73e605d (commit)
      from  3c0e43a41b660d50b71f917dfb767f5deca16a59 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    5 -----
 .../patches/202_nx-x11_enable-xinerama.full.patch  |   15 ++++-----------
 2 files changed, 4 insertions(+), 16 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c621277..f56b3a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,7 @@
 nx-libs (2:3.5.0.9-0) UNRELEASED; urgency=low
 
-  [ Mike Gabriel ]
   * Continue development...
 
-  [ Oleksandr Shneyder ]
-  * Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama
-    extension if NX_XINERAMA_CONF not exists
-
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 23 Jan 2012 00:04:57 +0100
 
 nx-libs (2:3.5.0.8-0) unstable; urgency=low
diff --git a/debian/patches/202_nx-x11_enable-xinerama.full.patch b/debian/patches/202_nx-x11_enable-xinerama.full.patch
index 089df25..f097f0b 100644
--- a/debian/patches/202_nx-x11_enable-xinerama.full.patch
+++ b/debian/patches/202_nx-x11_enable-xinerama.full.patch
@@ -31,24 +31,17 @@ Last-Update: 2012-01-13
  #define BuildDmxDevelTools	NO
 --- a/nx-X11/lib/Xinerama/Xinerama.c
 +++ b/nx-X11/lib/Xinerama/Xinerama.c
-@@ -249,6 +249,16 @@
+@@ -249,6 +249,9 @@
      xXineramaIsActiveReq  	*req;
      XExtDisplayInfo 		*info = find_display (dpy);
  
 +
-+    FILE* fptr;
-+    if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))!=NULL) {
-+	fclose(fptr);
-+	return True;
-+    }
-+    else {
-+	return False;
-+    }
++    return True;
 +
      if(!XextHasExtension(info))
  	return False;  /* server doesn't even have the extension */
  
-@@ -279,39 +289,72 @@
+@@ -279,39 +282,72 @@
      xXineramaQueryScreensReq	*req;
      XineramaScreenInfo		*scrnInfo = NULL;
  
@@ -193,7 +186,7 @@ Last-Update: 2012-01-13
  	else
  #endif
 -	    result = (ProcXvStopVideo(client)); break;
-+	    result = (ProcXvStopVideo(client));
++	    result = (ProcXvStopVideo(client)); 
 +            break;
      case xv_SetPortAttribute: 
  #ifdef PANORAMIX


hooks/post-receive
-- 
nx-libs.git (NX (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 (redistributed)).