From 2afdb5c98470ab9d5aa793906c1710a65fb3028c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Sun, 1 Aug 2021 10:47:36 +0100
Subject: [PATCH] Fix deb build script to set prerelease flag correctly
(#10500)
---
changelog.d/10500.misc | 1 +
docker/build_debian.sh | 9 ++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
create mode 100644 changelog.d/10500.misc
diff --git a/changelog.d/10500.misc b/changelog.d/10500.misc
new file mode 100644
index 0000000000..dbaff57364
--- /dev/null
+++ b/changelog.d/10500.misc
@@ -0,0 +1 @@
+Fix a bug which caused production debian packages to be incorrectly marked as 'prerelease'.
diff --git a/docker/build_debian.sh b/docker/build_debian.sh
index f572ed9aa0..801ff45471 100644
--- a/docker/build_debian.sh
+++ b/docker/build_debian.sh
@@ -11,10 +11,6 @@ DIST=`cut -d ':' -f2 <<< $distro`
cp -aT /synapse/source /synapse/build
cd /synapse/build
-# add an entry to the changelog for this distribution
-dch -M -l "+$DIST" "build for $DIST"
-dch -M -r "" --force-distribution --distribution "$DIST"
-
# if this is a prerelease, set the Section accordingly.
#
# When the package is later added to the package repo, reprepro will use the
@@ -23,11 +19,14 @@ dch -M -r "" --force-distribution --distribution "$DIST"
DEB_VERSION=`dpkg-parsechangelog -SVersion`
case $DEB_VERSION in
- *rc*|*a*|*b*|*c*)
+ *~rc*|*~a*|*~b*|*~c*)
sed -ie '/^Section:/c\Section: prerelease' debian/control
;;
esac
+# add an entry to the changelog for this distribution
+dch -M -l "+$DIST" "build for $DIST"
+dch -M -r "" --force-distribution --distribution "$DIST"
dpkg-buildpackage -us -uc
--
GitLab