diff --git a/helpers/config b/helpers/config index 26d9b14..fe1cf0b 100755 --- a/helpers/config +++ b/helpers/config @@ -168,11 +168,18 @@ find -maxdepth 1 -type f | xargs rm cd source UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version) -if echo $UPSTREAMVERSION | grep -q '-'; then - export FULLVERSION=$(dpkg-parsechangelog --show-field Version)+${REVISION}trisquel${VERSION} -else - export FULLVERSION=$(dpkg-parsechangelog --show-field Version)-${REVISION}trisquel${VERSION} -fi + +# This needs to be enabled (and reviewed) as first step of t12 release. Making it break here to force review +[ "$REVISION" == 12.0 ] && echo Review version string generation before building t12 packages! && exit 1 +export FULLVERSION=$(dpkg-parsechangelog --show-field Version)+${REVISION}trisquel${VERSION} +[ "$PACKAGE" == "console-setup" ] && export FULLVERSION=$(dpkg-parsechangelog --show-field Version)-${REVISION}trisquel${VERSION} +# This is the proposed method: +#if echo $UPSTREAMVERSION | grep -q '-'; then +# export FULLVERSION=$(dpkg-parsechangelog --show-field Version)+${REVISION}trisquel${VERSION} +#else +# export FULLVERSION=$(dpkg-parsechangelog --show-field Version)-${REVISION}trisquel${VERSION} +#fi +# IMPORTANT: the build watchdog would need to be modified to match any changes done here # Use 3.0 (native) deb source format [ -f debian/source/format ] && echo "3 (native)" > debian/source/format