[SRU][M/L/J/F:linux-meta][PATCH 1/1] UBUNTU: [Packaging] update-version: use meta version for changelog and tag

[Andrea Righi]

Meta version can be different than master version, for example when a
meta only respin happens we bump up the minor version, keeping the ABI
version unchanged.

In this case using the version from master can lead to errors like this:

 New version specified (6.5.0.9.9~22.04.2) is less than
 the current version number (6.5.0.9.11~22.04.1)!  Use -b to force.

In this particular case the previous entry in the debian/changelog was
6.5.0.9.11~22.04.1 and instead of incrementing that to
6.5.0.9.11~22.04.2, update-version went to 6.5.0.9.9~22.04.2 (using the
ABI version from master), causing the new changelog entry to use a
smaller version number.

Fix this by always using the ABI version from meta.

Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
 update-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update-version b/update-version
index 8051cd2..a469b45 100755
--- a/update-version
+++ b/update-version
@@ -68,7 +68,7 @@ master_abi_human=${master_version%.*}
 # Extract the upload number from the _previous_ upload and increment it.
 here_upload=${here_version##*.}
 here_upload=$(( $here_upload + 1 ))
-here_newversion="$master_abi.$here_upload"
+here_newversion="$here_abi.$here_upload"
 
 #echo "here_version<$here_version> here_abi<$here_abi> here_newversion<$here_newversion>"
 #echo "master_version<$master_version> master_abi<$master_abi>"
-- 
2.40.1