From 63bf5e606b24c7343bfe622bf6af2110ee6beabc Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 5 Oct 2021 15:59:43 -0400 Subject: Release 2021.5 --- Makefile-libostree.am | 6 +++--- configure.ac | 2 +- src/libostree/libostree-devel.sym | 6 ------ src/libostree/libostree-released.sym | 6 ++++++ tests/test-symbols.sh | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index d40de48d..6b94f76f 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -173,9 +173,9 @@ endif # USE_GPGME symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym # Uncomment this include when adding new development symbols. -if BUILDOPT_IS_DEVEL_BUILD -symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym -endif +# if BUILDOPT_IS_DEVEL_BUILD +# symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym +# endif # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html wl_versionscript_arg = -Wl,--version-script= diff --git a/configure.ac b/configure.ac index 5678145a..b5a3c82a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([year_version], [2021]) m4_define([release_version], [5]) 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 6b6b5c6c..e3cd14a4 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -22,12 +22,6 @@ - uncomment the include in Makefile-libostree.am */ -LIBOSTREE_2021.5 { -global: - ostree_sepolicy_new_from_commit; - ostree_mutable_tree_new_from_commit; -} LIBOSTREE_2021.4; - /* 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 * source. Replace $LASTSTABLE with the last stable version, and $NEWVERSION diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index 1e359bfb..d38362ba 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -668,6 +668,12 @@ global: ostree_repo_signature_verify_commit_data; } LIBOSTREE_2021.3; +LIBOSTREE_2021.5 { +global: + ostree_sepolicy_new_from_commit; + ostree_mutable_tree_new_from_commit; +} LIBOSTREE_2021.4; + /* 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 0de87be4..a094a944 100755 --- a/tests/test-symbols.sh +++ b/tests/test-symbols.sh @@ -56,7 +56,7 @@ echo 'ok documented symbols' # ONLY update this checksum in release commits! cat > released-sha256.txt < Date: Tue, 5 Oct 2021 16:00:53 -0400 Subject: configure: post-release version bump --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b5a3c82a..554cffb2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ([2.63]) dnl To perform a release, follow the instructions in `docs/CONTRIBUTING.md`. m4_define([year_version], [2021]) -m4_define([release_version], [5]) +m4_define([release_version], [6]) m4_define([package_version], [year_version.release_version]) AC_INIT([libostree], [package_version], [walters@verbum.org]) -is_release_build=yes +is_release_build=no AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([buildutil]) AC_CONFIG_AUX_DIR([build-aux]) -- cgit v1.2.1