[X2Go-Commits] [nx-libs] 03/03: release 3.5.99.12

[git-admin at x2go.org]

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

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

commit 2b9025f797ee322e21077e100c2ee27c2e7fa0e0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 15 12:40:31 2017 +0100

    release 3.5.99.12
---
 ChangeLog                                        | 22 +++++++++++++++++-----
 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, 28 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b049dc3..362d5c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,24 @@
-2017-12-15 11:20:52 +0100 Mike Gabriel (5f673977a)
+2017-12-15 12:40:31 +0100 Mike Gabriel (c3e284b96)
 
-	* release 3.5.99.11 (HEAD -> 3.6.x)
+	* release 3.5.99.12 (HEAD -> 3.6.x)
+
+2017-12-15 12:05:16 +0100 Mike Gabriel (4fb495432)
+
+	* Xserver/hw/nxagent/Image.c: Fix regression FTBFS after d4465b71 got
+          merged in. (origin/HEAD, origin/3.6.x)
+
+2017-12-15 12:02:36 +0100 Mike Gabriel (cfbb03820)
+
+	* debian/changelog: post-release version bump to 3.5.99.11
+          (origin/release-builds/3.6.x, release-builds/3.6.x)
+
+2017-12-15 11:20:52 +0100 Mike Gabriel (b213c8eba)
+
+	* release 3.5.99.11 (tag: 3.5.99.11)
 
 2017-12-15 11:15:22 +0100 Mike Gabriel (4cca1b4bd)
 
 	* Merge branch 'sunweaver-pr/more-X-memory-macro-fixes' into 3.6.x
-          (origin/HEAD, origin/3.6.x)
 
 2017-12-14 11:27:35 +0100 Mike Gabriel (5597f2ea5)
 
@@ -720,8 +733,7 @@
 
 2017-09-15 14:57:56 +0200 Mike Gabriel (6557c0043)
 
-	* release 3.5.99.10 (tag: 3.5.99.10, origin/release-builds/3.6.x,
-          release-builds/3.6.x)
+	* release 3.5.99.10 (tag: 3.5.99.10)
 
 2017-09-14 07:45:45 +0200 Mihai Moldovan (4405c6a6b)
 
diff --git a/VERSION b/VERSION
index 0246204..2129e69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.99.11
+3.5.99.12
diff --git a/debian/changelog b/debian/changelog
index 810c28e..c37029b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nx-libs (2:3.5.99.12-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for nx-libs.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 15 Dec 2017 12:23:12 +0100
+
 nx-libs (2:3.5.99.11-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 ce406af..28f397c 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 "Dec 2017" "Version 3.5.99.11" "NX Agent (Xserver)"
+.TH nxagent 1 "Dec 2017" "Version 3.5.99.12" "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 dfa556f..480d08b 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:           nx-libs
-Version:        3.5.99.11
+Version:        3.5.99.12
 Release:        0.0build1%{?dist}
 Summary:        NX X11 protocol compression libraries
 
diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1
index 6543bc8..4c0d563 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 "Dec 2017" "Version 3.5.99.11" "NX Proxy"
+.TH nxproxy 1 "Dec 2017" "Version 3.5.99.12" "NX Proxy"
 .SH NAME
 nxproxy \- NX Proxy Tool
 .SH SYNOPSIS

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git