summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2019-03-07 19:10:17 +0100
committerMax Kellermann <max@musicpd.org>2019-03-07 19:10:17 +0100
commitf300ea62dc5934c9b36bdaeebf10324dd9edbff0 (patch)
treea0275551a4ef7410fa8e5acdbb54c88fda81f8e9
parentc5df879cf97b24caac1d34272066ae46caa98df9 (diff)
meson.build: increment version number to 0.22
Time to create a new unstable branch; stable development will now continue in the branch v0.21.x
-rw-r--r--NEWS2
-rw-r--r--doc/conf.py4
-rw-r--r--meson.build4
3 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 37c351447..a093ff0e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ver 0.22 (not yet released)
+
ver 0.21.6 (not yet released)
* protocol
- allow loading playlists specified as absolute filesystem paths
diff --git a/doc/conf.py b/doc/conf.py
index 1d486ae48..6a4d89c1d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -30,7 +30,7 @@ master_doc = 'index'
# General information about the project.
project = 'Music Player Daemon'
-copyright = '2003-2018 The Music Player Daemon Project'
+copyright = '2003-2019 The Music Player Daemon Project'
author = 'Max Kellermann'
# The version info for the project you're documenting, acts as replacement for
@@ -38,7 +38,7 @@ author = 'Max Kellermann'
# built documents.
#
# The short X.Y version.
-version = '0.21.6'
+version = '0.22'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/meson.build b/meson.build
index 8e092a4c6..93ce3db58 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project(
'mpd',
['c', 'cpp'],
- version: '0.21.6',
+ version: '0.22~git',
meson_version: '>= 0.47.2',
default_options: [
'c_std=c99',
@@ -20,7 +20,7 @@ conf.set_quoted('PACKAGE', meson.project_name())
conf.set_quoted('PACKAGE_NAME', meson.project_name())
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
conf.set_quoted('VERSION', meson.project_version())
-conf.set_quoted('PROTOCOL_VERSION', '0.21.4')
+conf.set_quoted('PROTOCOL_VERSION', '0.22.0')
conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
common_cppflags = [