[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-client/3.5.0.10-8-gec72377

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:25:03 CEST 2013


The branch, build-baikal has been updated
       via  ec72377982314efccbc8597a65ec364b8b75d251 (commit)
      from  4eae840bd56bda22b7bf6c9a55f1118ed62461e4 (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                                  |    2 --
 debian/patches/111_nxcomp_byerace.full+lite.patch |   21 ---------------------
 debian/patches/series                             |    1 -
 3 files changed, 24 deletions(-)
 delete mode 100644 debian/patches/111_nxcomp_byerace.full+lite.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0c2c3ca..012c7bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
 
   * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,
     make build stanza work for nx-libs-full and nx-libs-lite.
-  * Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in
-    qtnx and libnxcl.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 07 Feb 2012 13:48:19 +0100
 
diff --git a/debian/patches/111_nxcomp_byerace.full+lite.patch b/debian/patches/111_nxcomp_byerace.full+lite.patch
deleted file mode 100644
index ff0f41c..0000000
--- a/debian/patches/111_nxcomp_byerace.full+lite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -7321,6 +7321,18 @@
-           << logofs_flush;
-   #endif
- 
-+  // Henning Heinold
-+  // fix up error from libnxcl where bye can be in front of NXPROXY
-+  if (strncmp(options, "bye", strlen("bye")) == 0)
-+  {
-+	  int bye_length = strlen("bye");
-+	  char *moo = &options[bye_length+1];
-+
-+	  memmove(options, moo, DEFAULT_REMOTE_OPTIONS_LENGTH-bye_length-1);
-+	  *logofs << "Loop: Cleanded the bye in options, options now looks '"
-+		              << options << "'.\n" << logofs_flush;
-+  }
-+
-   if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
-   {
-     #ifdef PANIC
diff --git a/debian/patches/series b/debian/patches/series
index 434e86a..9133bf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,7 +33,6 @@
 108_nxagent_wine-close-delay.full.patch
 109_nxagent_locale-utf8-compound-text.full.patch
 110_nxagent_createpixmap-bounds-check.full.patch
-111_nxcomp_byerace.full+lite.patch
 200_nxagent_check-binary-x2go-flavour.full.patch
 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
 202_nx-x11_enable-xinerama.full.patch


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)).




More information about the x2go-commits mailing list