[X2Go-Commits] [nx-libs] 01/01: nxcomp/Misc.cpp: fix build failure introduced in a27a8aae3ca7a3f70e05152ac3d347942e11159d.

git-admin at x2go.org git-admin at x2go.org
Thu May 28 22:43:12 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.

commit f9303c1c7df9272618f70532c2dd17ed689310c5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu May 28 22:42:45 2015 +0200

    nxcomp/Misc.cpp: fix build failure introduced in a27a8aae3ca7a3f70e05152ac3d347942e11159d.
    
    Backported from Arctica GH 3.6.x branch.
    
    Affects:
      - 9900-dxpc-license-history.full+lite.patch
---
 debian/changelog                                   |    5 +++++
 .../9900-dxpc-license-history.full+lite.patch      |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a71851f..30f81b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -158,6 +158,11 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
       v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan)
       Changes:
       + 1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch
+  * nxcomp/Misc.cpp: fix build failure introduced in
+    a27a8aae3ca7a3f70e05152ac3d347942e11159d.
+    Backported from Arctica GH 3.6.x branch.
+    Affects:
+    - 9900-dxpc-license-history.full+lite.patch
 
   [ Bernard Cafarelli ]
   * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'.
diff --git a/debian/patches/9900-dxpc-license-history.full+lite.patch b/debian/patches/9900-dxpc-license-history.full+lite.patch
index 9666f7a..676d0d2 100644
--- a/debian/patches/9900-dxpc-license-history.full+lite.patch
+++ b/debian/patches/9900-dxpc-license-history.full+lite.patch
@@ -3889,9 +3889,9 @@ index 0095eaa..5d53524 100644
 -are copyright of NoMachine. Redistribution and use of the present\n\
 -software is allowed according to terms specified in the file LICENSE\n\
 -which comes in the source distribution.\n\
-+are copyright of NoMachine. Redistribution (modified or unmodified) and
-+use of the present\n\ software is allowed according to terms specified in
-+the file LICENSE\n\ which comes in the source distribution.\n\
++are copyright of NoMachine. Redistribution (modified or unmodified) and\n\
++use of the present software is allowed according to terms specified in\n\
++the file LICENSE which comes in the source distribution.\n\
  \n\
  Check http://www.nomachine.com/licensing.html for applicability.\n\
  \n\

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list