From 978bd19f977119e391a7c4ea706eeb4740970757 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 9 Dec 2019 16:10:50 +0000 Subject: [PATCH 1/2] Release 2019.6 Nothing really big here, but let's get a release out so some bigger things like ro-sysroot, signing, sizes can bake in master for a bit. --- configure.ac | 2 +- src/libostree/libostree-devel.sym | 5 ++--- src/libostree/libostree-released.sym | 4 ++++ tests/test-symbols.sh | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2f9579f5..46a900f5 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ m4_define([year_version], [2019]) m4_define([release_version], [6]) 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 646a4a21..a5d15e93 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -18,9 +18,8 @@ ***/ /* Add new symbols here. Release commits should copy this section into -released.sym. */ -LIBOSTREE_2019.6 { - ostree_async_progress_copy_state; -} LIBOSTREE_2019.4; +LIBOSTREE_2019.7 { +} LIBOSTREE_2019.6; /* 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 f6a83b77..e81a6595 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -577,6 +577,10 @@ LIBOSTREE_2019.4 { /* No new symbols in 2019.5 */ +LIBOSTREE_2019.6 { + ostree_async_progress_copy_state; +} LIBOSTREE_2019.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 2287710d..a041ddb1 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 < Date: Mon, 9 Dec 2019 16:18:28 +0000 Subject: [PATCH 2/2] Post-release version bump --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 46a900f5..4a752e55 100644 --- a/configure.ac +++ b/configure.ac @@ -7,10 +7,10 @@ dnl Seed the release notes with `git-shortlog-with-prs ..`. Th dnl `git-evtag` to create the tag and push it. Finally, create a GitHub release and attach dnl the tarball from `make dist`. m4_define([year_version], [2019]) -m4_define([release_version], [6]) +m4_define([release_version], [7]) 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])