aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-05-28 22:42:45 +0200
committerMihai Moldovan <ionic@ionic.de>2015-05-28 22:42:45 +0200
commitf9303c1c7df9272618f70532c2dd17ed689310c5 (patch)
tree783886859038e3efa5e8819b8740688d8191f521 /debian
parenteda8da43d51936a4c81ad439ad061a5f971f0663 (diff)
downloadnx-libs-f9303c1c7df9272618f70532c2dd17ed689310c5.tar.gz
nx-libs-f9303c1c7df9272618f70532c2dd17ed689310c5.tar.bz2
nx-libs-f9303c1c7df9272618f70532c2dd17ed689310c5.zip
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
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/9900-dxpc-license-history.full+lite.patch6
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index a71851f56..30f81b1a2 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 9666f7ab3..676d0d26f 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\