From 9d39e7d91e8497987cad69a3fbed5c5fc91eebdc Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 25 Sep 2019 09:37:48 -0400 Subject: [PATCH] Release 2019.4 Tiny release. Just want to get out the important bugfixes instead of backporting patches (notably the gpg-agent stuff and `ostree-finalize-staged.service` ordering). Closes: #1927 Approved by: cgwalters --- configure.ac | 2 +- src/libostree/libostree-devel.sym | 3 --- src/libostree/libostree-released.sym | 4 ++++ tests/test-symbols.sh | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 069bab0175..cd3cfd1079 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ m4_define([year_version], [2019]) m4_define([release_version], [4]) m4_define([package_version], [year_version.release_version]) AC_INIT([libostree], [package_version], [walters@verbum.org]) -is_release_build=no +is_release_build=yes AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([buildutil]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym index 58d35f5556..9339c0fd66 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -18,9 +18,6 @@ ***/ /* Add new symbols here. Release commits should copy this section into -released.sym. */ -LIBOSTREE_2019.4 { - ostree_repo_mark_commit_partial_reason; -} LIBOSTREE_2019.3; /* Stub section for the stable release *after* this development one; don't * edit this other than to update the year. This is just a copy/paste diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index fbcb2d56d6..ec9eec6673 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -571,6 +571,10 @@ global: ostree_kernel_args_to_string; } LIBOSTREE_2018.9; +LIBOSTREE_2019.4 { + ostree_repo_mark_commit_partial_reason; +} LIBOSTREE_2019.3; + /* NOTE: Only add more content here in release commits! See the * comments at the top of this file. */ diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh index 5ec06d7248..32285bdc18 100755 --- a/tests/test-symbols.sh +++ b/tests/test-symbols.sh @@ -54,7 +54,7 @@ echo 'ok documented symbols' # ONLY update this checksum in release commits! cat > released-sha256.txt <