From b76811b1da65dee41bde6154b2cb97d30fa46337 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 26 Feb 2021 08:38:20 +0100 Subject: [PATCH] osmo-release.sh: support epoch Related: OS#5046 Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 --- osmo-release.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/osmo-release.sh b/osmo-release.sh index eea17cf98..c0b0b4a74 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -247,7 +247,24 @@ if [ -f "TODO-RELEASE" ]; then git add TODO-RELEASE fi -gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" +# Add missing epoch (OS#5046) +DEB_VER=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') +NEW_VER_WITH_EPOCH="$NEW_VER" +case "$DEB_VER" in +*:*) + epoch="$(echo "$DEB_VER" | cut -d: -f1)" + NEW_VER_WITH_EPOCH="$epoch:$NEW_VER" + ;; +esac + +gbp dch \ + --debian-tag='%(version)s' \ + --auto \ + --meta \ + --git-author \ + --multimaint-merge \ + --ignore-branch \ + --new-version="$NEW_VER_WITH_EPOCH" dch -r -m --distribution "unstable" "" git add ${GIT_TOPDIR}/debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty