Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 2afdb5c

Browse files
authored
Fix deb build script to set prerelease flag correctly (#10500)
1 parent c167e09 commit 2afdb5c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

changelog.d/10500.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug which caused production debian packages to be incorrectly marked as 'prerelease'.

docker/build_debian.sh

+4-5
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ DIST=`cut -d ':' -f2 <<< $distro`
1111
cp -aT /synapse/source /synapse/build
1212
cd /synapse/build
1313
14-
# add an entry to the changelog for this distribution
15-
dch -M -l "+$DIST" "build for $DIST"
16-
dch -M -r "" --force-distribution --distribution "$DIST"
17-
1814
# if this is a prerelease, set the Section accordingly.
1915
#
2016
# 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"
2319
2420
DEB_VERSION=`dpkg-parsechangelog -SVersion`
2521
case $DEB_VERSION in
26-
*rc*|*a*|*b*|*c*)
22+
*~rc*|*~a*|*~b*|*~c*)
2723
sed -ie '/^Section:/c\Section: prerelease' debian/control
2824
;;
2925
esac
3026
27+
# add an entry to the changelog for this distribution
28+
dch -M -l "+$DIST" "build for $DIST"
29+
dch -M -r "" --force-distribution --distribution "$DIST"
3130
3231
dpkg-buildpackage -us -uc
3332

0 commit comments

Comments
 (0)