From 6557c0043da97efcade165265f74f8e8901cd412 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 15 Sep 2017 14:57:56 +0200 Subject: release 3.5.99.10 --- ChangeLog | 65 ++++++++++++++++++++++-- VERSION | 2 +- debian/changelog | 7 +++ nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- nx-libs.spec | 2 +- nxproxy/man/nxproxy.1 | 2 +- 6 files changed, 71 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21e8126c0..75b92d380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,62 @@ -2017-08-30 19:33:55 +0200 Mike Gabriel (6cf56efe7) +2017-09-15 14:57:56 +0200 Mike Gabriel (e6998288d) - * release 3.5.99.9 (HEAD -> 3.6.x) + * release 3.5.99.10 (HEAD -> 3.6.x) + +2017-09-14 07:45:45 +0200 Mihai Moldovan (4405c6a6b) + + * Merge branch + 'sunweaver-pr/assure-that-Mesa-includes-headers-from-libNX_X11' + into 3.6.x (origin/HEAD, origin/3.6.x) + +2017-09-13 13:06:34 +0200 Mike Gabriel (f9c23b51e) + + * Assure that headers from libNX_X11 are always included from + $(INCDIR)/nx-X11/. + (gh-sunweaver/pr/assure-that-Mesa-includes-headers-from-libNX_X11, + pr/assure-that-Mesa-includes-headers-from-libNX_X11) + +2017-09-13 11:50:40 +0200 Mihai Moldovan (0815fb06f) + + * nx-X11/programs/Xserver/hw/nxagent/Render.c: use macros obtaining + values from _XPrivDisplay instead of the other Display + structure directly. + +2017-09-06 10:25:19 +0200 Mihai Moldovan (81569ad6b) + + * Merge branch 'sunweaver-pr/sun-path-is-104-on-debian-kfreebsd' into + 3.6.x + +2017-08-31 18:17:31 +0200 Mike Gabriel (96ba6190d) + + * nxcomp/src/{Loop,Proxy}.cpp: On Debian/kFreeBSD (and other *BSD + variants) the sockaddr_un.sun_path property is 104 chars + long, not 108. Hard-coding Unix domain sockets in nxcomp + the string length 104. + (gh-sunweaver/pr/sun-path-is-104-on-debian-kfreebsd, + pr/sun-path-is-104-on-debian-kfreebsd) + +2017-08-30 22:36:05 +0200 Mike Gabriel (d3f97cea2) + + * Mesa.patches: Shrink over-zealous 5001 patch. Only patch files that + we use during build. + +2017-08-30 22:07:46 +0200 Mike Gabriel (055f52b03) + + * roll-tarball.sh: Drop m4/nx-xtrans.m4 from nx-libs-lite tarball. + +2017-08-30 22:07:28 +0200 Mike Gabriel (1047cda6d) + + * roll-tarball.sh: Some more .gitignore files to remove. + +2017-08-30 22:07:02 +0200 Mike Gabriel (bbf69e0a6) + + * roll-tarball.sh: Use -f with rm everywhere, also when tweaking the + Mesa/ dir. + +2017-08-30 19:33:55 +0200 Mike Gabriel (f4afa5a56) + + * release 3.5.99.9 (tag: 3.5.99.9, origin/release-builds/3.6.x, + release-builds/3.6.x) 2017-08-30 19:29:58 +0200 Mike Gabriel (13264ea7f) @@ -32,7 +88,7 @@ 2017-08-28 08:33:58 +0200 Mihai Moldovan (709bce6cf) * Merge branch 'sunweaver-pr/drop-nxcompshad-cygwin-support' into - 3.6.x (origin/HEAD, origin/3.6.x) + 3.6.x 2017-07-17 12:49:47 +0200 Mike Gabriel (d9e2822f5) @@ -374,8 +430,7 @@ 2017-06-30 21:21:49 +0200 Mike Gabriel (3b15804ce) - * release 3.5.99.8 (tag: 3.5.99.8, origin/release-builds/3.6.x, - release-builds/3.6.x) + * release 3.5.99.8 (tag: 3.5.99.8) 2017-06-30 20:59:27 +0200 Mihai Moldovan (4c7641a1f) diff --git a/VERSION b/VERSION index 8560aadcd..479da61ea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.99.9 +3.5.99.10 diff --git a/debian/changelog b/debian/changelog index d92eb702d..ea0c2db2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.10-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 15 Sep 2017 14:57:20 +0200 + nx-libs (2:3.5.99.9-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index cf73e84b9..85dd412b3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .ds q \N'34' -.TH nxagent 1 "Aug 2017" "Version 3.5.99.9" "NX Agent (Xserver)" +.TH nxagent 1 "Sep 2017" "Version 3.5.99.10" "NX Agent (Xserver)" .SH NAME nxagent \- nested Xserver optimized for remote computing .SH SYNOPSIS diff --git a/nx-libs.spec b/nx-libs.spec index 7ccd03b39..de1f0092d 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: nx-libs -Version: 3.5.99.9 +Version: 3.5.99.10 Release: 0.0build1%{?dist} Summary: NX X11 protocol compression libraries diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index e6c152025..e48bd9d64 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH nxproxy 1 "Aug 2017" "Version 3.5.99.9" "NX Proxy" +.TH nxproxy 1 "Sep 2017" "Version 3.5.99.10" "NX Proxy" .SH NAME nxproxy \- NX Proxy Tool .SH SYNOPSIS -- cgit v1.2.3