[PATCH] UBUNTU: [Debian] Update for leader included in BACKPORT_SUFFIX

[Seth Forshee]

BugLink: https://bugs.launchpad.net/bugs/1902957

Currently a ~ is always added to the version string before
BACKPORT_SUFFIX. Now we will also doing forward-ports to
development releases, which works exactly the same as a
backport, but we want to use + as the leader instead.

Our kernel source doesn't contain the information to determine
which leader is appropriate, but that information is available
when generating update.conf. Therefore the leader will be added
as part of BACKPORT_SUFFIX, and our packaging should not insert
any leader.

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian/rules.d/1-maintainer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 75e7647510ea..956829027e0f 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -142,7 +142,7 @@ startnewrelease:
 	dh_testdir
 	@[ -f "$(DEBIAN)/etc/update.conf" ] && . "$(DEBIAN)/etc/update.conf"; \
 	if [ -n "$$BACKPORT_SUFFIX" ]; then \
-		ver="$$(dpkg-parsechangelog -l"$$DEBIAN_MASTER/changelog" -SVersion)~$${BACKPORT_SUFFIX}.1"; \
+		ver="$$(dpkg-parsechangelog -l"$$DEBIAN_MASTER/changelog" -SVersion)$${BACKPORT_SUFFIX}.1"; \
 		prev_ver="$$(dpkg-parsechangelog -l"$(DEBIAN)/changelog" -SVersion)"; \
 		if [ "$${ver%.*}" = "$${prev_ver%.*}" ]; then \
 			ver="$${ver%.*}.$$(( $${prev_ver##*.} +1 ))"; \
-- 
2.27.0