From c17668587169c612c6ea4d4b20ea2b78799c7bd2 Mon Sep 17 00:00:00 2001 From: Shengyu Zhang Date: Sat, 18 Dec 2021 11:39:11 +0800 Subject: [PATCH 1/2] Doc(update): changelog for 1.3.1 --- doc/changelog.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/changelog.rst b/doc/changelog.rst index e290fc8b..40c9a8a0 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -30,6 +30,17 @@ Change Log .. _version-latest: +.. _version-1.3.1: + +2021-12-18 Version 1.3.1 +======================== + +- Bug fixes: + + - Fix build of macOS (:pull:`339`), by @SilverRainZ + - Make channel messages with origin out of channels can be shown (:pull:`336`), by @progval + - Rejoin channels after NICKSERV authentication finishes (:issue:`274`), by @SilverRainZ + .. _version-1.3: 2021-09-23 Version 1.3.0 From 551325a7d1d3d13022c8096f95fe2ec05a678569 Mon Sep 17 00:00:00 2001 From: Shengyu Zhang Date: Sat, 18 Dec 2021 11:41:43 +0800 Subject: [PATCH 2/2] Script(update): bump version --- data/metainfo/srain.metainfo.xml.in.in | 3 +++ doc/conf.py | 14 +++++++------- meson.build | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/data/metainfo/srain.metainfo.xml.in.in b/data/metainfo/srain.metainfo.xml.in.in index a35529d4..9aee11da 100644 --- a/data/metainfo/srain.metainfo.xml.in.in +++ b/data/metainfo/srain.metainfo.xml.in.in @@ -68,6 +68,9 @@ + + https://doc.srain.im/en/latest/changelog.html#version-1-3-1 + https://doc.srain.im/en/latest/changelog.html#version-1-3-0 diff --git a/doc/conf.py b/doc/conf.py index 28c9756f..862b8463 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -47,7 +47,7 @@ # General information about the project. project = 'Srain' -copyright = '2017, Shengyu Zhang' +copyright = '2021, Shengyu Zhang' author = 'Shengyu Zhang' # The version info for the project you're documenting, acts as replacement for @@ -55,9 +55,9 @@ # built documents. # # The short X.Y version. -version = '1.3.0' +version = '1.3.1' # The full version, including alpha/beta/rc tags. -release = '1.3.0' +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -175,12 +175,12 @@ extensions.append('sphinx.ext.extlinks') extlinks = { - 'issue': ('https://github.com/SrainApp/srain/issues/%s', 'srain#'), - 'pull': ('https://github.com/SrainApp/srain/pull/%s', 'srain#'), + 'issue': ('https://github.com/SrainApp/srain/issues/%s', '#'), + 'pull': ('https://github.com/SrainApp/srain/pull/%s', '#'), 'commit': ('https://github.com/SrainApp/srain/commit/%s', ''), - 'contrib-issue': ('https://github.com/SrainApp/srain-contrib/issues/%s', 'srain-contrib#'), - 'contrib-pull': ('https://github.com/SrainApp/srain-contrib/pull/%s', 'srain-contrib#'), + 'contrib-issue': ('https://github.com/SrainApp/srain-contrib/issues/%s', 'contrib#'), + 'contrib-pull': ('https://github.com/SrainApp/srain-contrib/pull/%s', 'contrib#'), 'contrib-commit': ('https://github.com/SrainApp/srain/commit/%s', ''), 'people': ('https://github.com/%s', '@'), diff --git a/meson.build b/meson.build index de1da071..9437c9e0 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'srain', 'c', - version: '1.3.0', + version: '1.3.1', license: 'GPL3', meson_version: '>= 0.45.0' )