From 44a244f44a5800fb1c34584325648b00de7ae4be Mon Sep 17 00:00:00 2001 From: Nils Date: Mon, 10 Oct 2022 17:28:32 +0200 Subject: [PATCH] update changelog, version numbers and docs for new bugfix release version 1.6.1 --- CHANGELOG | 1 + docs/api/index.html | 7 ++++++- docs/index.html | 6 +++--- docs/src/api/index.adoc | 4 ++++ docs/src/index.adoc | 2 +- docs/src/jackpatch.1 | 6 +++--- docs/src/non-session-manager.1 | 6 +++--- docs/src/nsm-legacy-gui.1 | 6 +++--- docs/src/nsm-proxy-gui.1 | 6 +++--- docs/src/nsm-proxy.1 | 6 +++--- docs/src/nsmd.1 | 6 +++--- meson.build | 2 +- src/nsmd.cpp | 2 +- 13 files changed, 35 insertions(+), 25 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 634a88b..73f6d03 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ External contributors notice at the end of the line: (LastName, FirstName / nick Absolutely make sure that all clients of the session are closed when closing the session. This solves the invisible, hidden clients still running even after nsmd quit itself. Decrease wait time for such clients at session quit from extreme 60s to very long 30s. +For lockfiles fall back to hardcoded /run/user/ when $XDG_RUNTIME_DIR is not available on the system. ## 2022-04-15 1.6.0 diff --git a/docs/api/index.html b/docs/api/index.html index de23188..50e5fe4 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -783,6 +783,11 @@ same session by different nsm-daemons, and subsequently GUIs.

cleaned by the operating system, preventing sessions to stay locked after e.g. a power failure.

+

If the system is not XDG-compliant nsmd will try to fallback to /run/user/XXXX, which must exist +according to the Linux Filesystem Hierarchy Standard. I this also fails the user has to +set $XDG_RUNTIME_DIR manually to start nsmd.

+
+

The lockfile is named after the simple session name combined with a numeric ID for the session root. It is possible that two nsmd opened two different session roots, both with the same simple session name, e.g. "my song". Lockfiles are able to distinguish between those and will not prevent @@ -1921,7 +1926,7 @@ long-standing FIXME in the code by the original author. Or in other

diff --git a/docs/index.html b/docs/index.html index 57f4432..4dcb194 100644 --- a/docs/index.html +++ b/docs/index.html @@ -441,7 +441,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b

New Session Manager Documentation

Nils Hilbricht
-version 1.6.0 +version 1.6.1
@@ -556,8 +556,8 @@ Documentation and tutorials for software-developers will be added at a later dat
diff --git a/docs/src/api/index.adoc b/docs/src/api/index.adoc index d93dc29..c9191b7 100644 --- a/docs/src/api/index.adoc +++ b/docs/src/api/index.adoc @@ -224,6 +224,10 @@ Therefore each currently open session creates a lockfile under `$XDG_RUNTIME_DIR `/run/user/XXXX/nsm/`) that tells `nsmd` to not open such a locked session. This directory gets cleaned by the operating system, preventing sessions to stay locked after e.g. a power failure. +If the system is not XDG-compliant nsmd will try to fallback to `/run/user/XXXX`, which must exist +according to the Linux Filesystem Hierarchy Standard. I this also fails the user has to +set $XDG_RUNTIME_DIR manually to start nsmd. + The lockfile is named after the simple session name combined with a numeric ID for the session root. It is possible that two `nsmd` opened two different session roots, both with the same simple session name, e.g. "my song". Lockfiles are able to distinguish between those and will not prevent diff --git a/docs/src/index.adoc b/docs/src/index.adoc index 413d542..05f523f 100644 --- a/docs/src/index.adoc +++ b/docs/src/index.adoc @@ -14,7 +14,7 @@ A copy of the license has been provided in the file documentation/LICENSE. :Author: Nils Hilbricht :iconfont-remote!: :!webfonts: -:revnumber: 1.6.0 +:revnumber: 1.6.1 = New Session Manager Documentation diff --git a/docs/src/jackpatch.1 b/docs/src/jackpatch.1 index d61589c..c8c4323 100644 --- a/docs/src/jackpatch.1 +++ b/docs/src/jackpatch.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH JACKPATCH "1" "April 2022" "jackpatch Version 1.6.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH JACKPATCH "1" "October 2022" "jackpatch Version 1.6.1" "User Commands" .SH NAME -jackpatch \- manual page for jackpatch Version 1.6.0 +jackpatch \- manual page for jackpatch Version 1.6.1 .SH DESCRIPTION jackpatch \- Remember and restore the JACK Audio Connection Kit Graph in NSM .PP diff --git a/docs/src/non-session-manager.1 b/docs/src/non-session-manager.1 index 1de64c2..79d6fe4 100644 --- a/docs/src/non-session-manager.1 +++ b/docs/src/non-session-manager.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH NSM-LEGACY-GUI "1" "April 2022" "nsm-legacy-gui Version 1.6.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH NSM-LEGACY-GUI "1" "October 2022" "nsm-legacy-gui Version 1.6.1" "User Commands" .SH NAME -nsm-legacy-gui \- manual page for nsm-legacy-gui Version 1.6.0 +nsm-legacy-gui \- manual page for nsm-legacy-gui Version 1.6.1 .SH DESCRIPTION nsm\-legacy\-gui \- FLTK GUI for the 'New Session Manager' .SS "Usage:" diff --git a/docs/src/nsm-legacy-gui.1 b/docs/src/nsm-legacy-gui.1 index 1de64c2..79d6fe4 100644 --- a/docs/src/nsm-legacy-gui.1 +++ b/docs/src/nsm-legacy-gui.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH NSM-LEGACY-GUI "1" "April 2022" "nsm-legacy-gui Version 1.6.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH NSM-LEGACY-GUI "1" "October 2022" "nsm-legacy-gui Version 1.6.1" "User Commands" .SH NAME -nsm-legacy-gui \- manual page for nsm-legacy-gui Version 1.6.0 +nsm-legacy-gui \- manual page for nsm-legacy-gui Version 1.6.1 .SH DESCRIPTION nsm\-legacy\-gui \- FLTK GUI for the 'New Session Manager' .SS "Usage:" diff --git a/docs/src/nsm-proxy-gui.1 b/docs/src/nsm-proxy-gui.1 index d8fff72..ffa38a1 100644 --- a/docs/src/nsm-proxy-gui.1 +++ b/docs/src/nsm-proxy-gui.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH NSM-PROXY-GUI "1" "April 2022" "nsm-proxy-gui Version 1.6.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH NSM-PROXY-GUI "1" "October 2022" "nsm-proxy-gui Version 1.6.1" "User Commands" .SH NAME -nsm-proxy-gui \- manual page for nsm-proxy-gui Version 1.6.0 +nsm-proxy-gui \- manual page for nsm-proxy-gui Version 1.6.1 .SH DESCRIPTION nsm\-proxy\-gui \- GUI for nsm\-proxy, a wrapper for executables without direct NSM\-Support. .SS "Usage:" diff --git a/docs/src/nsm-proxy.1 b/docs/src/nsm-proxy.1 index dd46d42..d880259 100644 --- a/docs/src/nsm-proxy.1 +++ b/docs/src/nsm-proxy.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH NSM-PROXY "1" "April 2022" "nsm-proxy Version 1.6.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH NSM-PROXY "1" "October 2022" "nsm-proxy Version 1.6.1" "User Commands" .SH NAME -nsm-proxy \- manual page for nsm-proxy Version 1.6.0 +nsm-proxy \- manual page for nsm-proxy Version 1.6.1 .SH DESCRIPTION nsm\-proxy \- Wrapper for executables without direct NSM\-Support. .PP diff --git a/docs/src/nsmd.1 b/docs/src/nsmd.1 index c6b9529..a39e581 100644 --- a/docs/src/nsmd.1 +++ b/docs/src/nsmd.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH NSMD "1" "April 2022" "nsmd Version 1.6.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH NSMD "1" "October 2022" "nsmd Version 1.6.1" "User Commands" .SH NAME -nsmd \- manual page for nsmd Version 1.6.0 +nsmd \- manual page for nsmd Version 1.6.1 .SH DESCRIPTION nsmd \- Daemon and server for the 'New Session Manager' .SS "Usage:" diff --git a/meson.build b/meson.build index a40a34a..ff5364d 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,7 @@ project( 'new-session-manager', 'c', 'cpp', -version : '1.6.0', +version : '1.6.1', license : 'GPLv3', ) diff --git a/src/nsmd.cpp b/src/nsmd.cpp index 1cc9338..0d892f5 100644 --- a/src/nsmd.cpp +++ b/src/nsmd.cpp @@ -69,7 +69,7 @@ static char *daemon_file; #define NSM_API_VERSION_MAJOR 1 #define NSM_API_VERSION_MINOR 1 #define NSM_API_VERSION_PATCH 2 -#define VERSION_STRING "1.6.0" +#define VERSION_STRING "1.6.1" #define ERR_OK 0 #define ERR_GENERAL_ERROR -1