release 3.5.99.163.5.99.16

6 files changed, 84 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 91472869d..fe316f020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,81 @@
-2018-03-07 23:46:48 +0100 Mike Gabriel (9f62b26c2)
+2018-03-16 23:52:03 +0100 Mike Gabriel (ec23e1dad)
 
-	* release 3.5.99.15 (HEAD -> 3.6.x)
+	* release 3.5.99.16 (HEAD -> 3.6.x)
+
+2018-03-15 21:30:43 +0100 Mike Gabriel (3b05d0de6)
+
+	* Merge branch 'Ionic-feature/use-libtirpc' into 3.6.x (origin/HEAD,
+          origin/3.6.x)
+
+2018-03-15 12:46:12 +0100 Mihai Moldovan (2e1e9158e)
+
+	* nx-libs.spec: stop needlessly exporting variables that we pass down
+          directly anyway. (Ionic-feature/use-libtirpc)
+
+2018-03-09 09:11:06 +0100 Mihai Moldovan (9b1d00d30)
+
+	* nx-libs.spec: force usage of libtirpc on Fedora > 27 and OpenSuSE
+          Tumbleweed+ (soon to be Leap 15).
+
+2018-03-09 09:09:05 +0100 Mihai Moldovan (0cd1392de)
+
+	* nx-X11/config/cf/README: document new UseTIRPC macro.
+
+2018-03-09 09:08:35 +0100 Mihai Moldovan (25cc6fce5)
+
+	* nx-X11/programs/Xserver/{,os/}Imakefile: implement libtirpc forcing
+          via UseTIRPC.
+
+2018-03-09 09:06:11 +0100 Mihai Moldovan (090d4d19b)
+
+	* nx-X11/config/cf/Imake.tmpl: implement new UseTIRPC macro,
+          defaulting to NO.
+
+2018-03-15 12:18:21 +0100 Mihai Moldovan (daebc8b6a)
+
+	* nx-X11/programs/Xserver/Imakefile: move $(PIXMANLIB) to
+          NXAGENTSYSLIBS, since libXcompext doesn't actually need
+          it.
+
+2018-03-09 09:07:15 +0100 Mihai Moldovan (32dac66c6)
+
+	* nx-X11/programs/Xserver/Imakefile: use printf with no trailing
+          newline instead of echo for variable value.
+
+2018-03-15 12:15:27 +0100 Mihai Moldovan (7a901039c)
+
+	* Makefile: pass down IMAKE_DEFINES to nx-X11/programs/Xserver build
+          system.
+
+2018-03-10 02:04:25 +0100 Mihai Moldovan (63a359313)
+
+	* nx-X11/programs/Xserver/Imakefile: drop system libraries out of
+          target list for nxagent regeneration.
+
+2018-03-09 09:04:32 +0100 Mihai Moldovan (a47a73872)
+
+	* nx-libs.spec: sync removed files with debian/rules.
+
+2018-03-15 08:45:54 +0100 Mihai Moldovan (15e955545)
+
+	* nx-X11/programs/Xserver/hw/nxagent/Screen.c: do not try to set a
+          NULL mode if the output was disconnected before.
+
+2018-03-15 08:45:00 +0100 Mihai Moldovan (6f8cdebc6)
+
+	* nx-X11/programs/Xserver/hw/nxagent/Screen.c: initialize pointers to
+          NULL to avoid referencing random data.
+
+2018-03-07 23:46:48 +0100 Mike Gabriel (63e113de9)
+
+	* release 3.5.99.15 (tag: 3.5.99.15, origin/release-builds/3.6.x,
+          release-builds/3.6.x)
 
 2018-03-07 21:55:36 +0100 Mihai Moldovan (18630e5dd)
 
 	* Merge branch
           'sunweaver-pr/saver-unvalidated-lengths-ProcScreenSaverUnsetAttributes'
-          into 3.6.x (origin/HEAD, origin/3.6.x)
+          into 3.6.x
 
 2018-03-05 11:01:49 +0100 Nathan Kidd (7017c22c2)
 
@@ -80,8 +149,7 @@
 
 2018-02-28 10:53:45 +0100 Mike Gabriel (153be794d)
 
-	* release 3.5.99.14 (tag: 3.5.99.14, origin/release-builds/3.6.x,
-          release-builds/3.6.x)
+	* release 3.5.99.14 (tag: 3.5.99.14)
 
 2018-02-28 01:03:53 +0100 Mihai Moldovan (5c4777b2d)
 
diff --git a/VERSION b/VERSION
index 75b4cda02..23ee2e7e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.99.15
+3.5.99.16
diff --git a/debian/changelog b/debian/changelog
index b2030173f..6adcab958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nx-libs (2:3.5.99.16-1) unstable; urgency=medium
+
+  * Upstream-provided Debian package for nx-libs.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 16 Mar 2018 23:51:34 +0100
+
 nx-libs (2:3.5.99.15-0) 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 9794c0855..7ba24a4b5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .ds q \N'34'
-.TH nxagent 1 "Mar 2018" "Version 3.5.99.15" "NX Agent (Xserver)"
+.TH nxagent 1 "Mar 2018" "Version 3.5.99.16" "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 3298473cc..3f4e9784c 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:           nx-libs
-Version:        3.5.99.15
+Version:        3.5.99.16
 Release:        0.0build1%{?dist}
 Summary:        NX X11 protocol compression libraries
 
diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1
index c69ebb483..8cf68e23f 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 "Mar 2018" "Version 3.5.99.15" "NX Proxy"
+.TH nxproxy 1 "Mar 2018" "Version 3.5.99.16" "NX Proxy"
 .SH NAME
 nxproxy \- NX Proxy Tool
 .SH SYNOPSIS