Return to legacy trisquel versioning string, using + for the reminder of this release
This commit is contained in:
parent
2563bff7e0
commit
b19b78a4d1
1 changed files with 12 additions and 5 deletions
|
|
@ -168,11 +168,18 @@ find -maxdepth 1 -type f | xargs rm
|
||||||
cd source
|
cd source
|
||||||
|
|
||||||
UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version)
|
UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version)
|
||||||
if echo $UPSTREAMVERSION | grep -q '-'; then
|
|
||||||
export FULLVERSION=$(dpkg-parsechangelog --show-field Version)+${REVISION}trisquel${VERSION}
|
# This needs to be enabled (and reviewed) as first step of t12 release. Making it break here to force review
|
||||||
else
|
[ "$REVISION" == 12.0 ] && echo Review version string generation before building t12 packages! && exit 1
|
||||||
export FULLVERSION=$(dpkg-parsechangelog --show-field Version)-${REVISION}trisquel${VERSION}
|
export FULLVERSION=$(dpkg-parsechangelog --show-field Version)+${REVISION}trisquel${VERSION}
|
||||||
fi
|
[ "$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
|
# Use 3.0 (native) deb source format
|
||||||
[ -f debian/source/format ] && echo "3 (native)" > debian/source/format
|
[ -f debian/source/format ] && echo "3 (native)" > debian/source/format
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue