Update release.cli, version to match bundled libodb/sqlite/libpkg-config

2 files changed, 8 insertions, 4 deletions

diff --git a/doc/release.cli b/doc/release.cli
index 8aba681..f02db11 100644
--- a/doc/release.cli
+++ b/doc/release.cli
@@ -139,7 +139,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   \
   # Step 0: make sure b, bpkg, bdep are runnable.
 
-  # Step 1: pull ODB compiler and build it, make sure runnable.
+  # Step 1a: pull CLI compiler and build it, make sure runnable.
+  # Step 1b: pull ODB compiler and build it, make sure runnable.
 
   # Step 2: pull everything in build2 (including brep).
 
@@ -219,6 +220,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
 
     \li|Toolchain introduction: 1, 2 & 3 (use \c{intro} script output for 2).|
 
+    \li|Packaging gude: 2 & 3 (also \c{bdep-new}-generated buildfiles).|
+
     \li|Introduction in the build system manual: 1 (uses \c{bdep-new(1)}
         output).|
 
@@ -999,6 +1002,9 @@ distribution from \c{etc/stage} and add the pre-distributed packages
 
   Consider upgrading to new upstream versions in \c{packaging/}.
 
+  Also, bundled \c{libodb}, \c{libsqlite3}, and \c{libpkg-config} in
+  \c{libbutl}.
+
 \h#upgrade-projects|Upgrade own projects|
 
   Adjust own projects to use any newly available features.
diff --git a/version b/version
index 6ca9af4..10b6760 100755
--- a/version
+++ b/version
@@ -21,15 +21,13 @@ mods=(libbutl libbutl.bash libbpkg libbbot bpkg bpkg-util build2)
 
 odb_ver=2.5.0-b.26.z
 #odb_ver=2.5.0-b.25
-odb_mods=(libodb libodb-sqlite libodb-pgsql)
+odb_mods=(libodb libodb-pgsql) # Note: now only in brep.
 
 #xml_ver=1.1.0-b.10.z
 xml_ver=1.1.0-b.10
 xml_mods=(libstudxml)
 
-# !!! NOTE: libpkg-config version constraint in build2 is updated manually.
 # !!! NOTE: libcmark version constraint in brep is updated manually.
-# !!! NOTE: libsqlite3 version in bpkg, bdep.
 
 all=(libbutl libbutl.bash build2 libbpkg bpkg bpkg-util bdep bdep-util libbbot bbot brep build2-toolchain msvc-linux openssl-agent buildos)