CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved package versioning

Browse source
This commit is contained in:
Ruben Rodriguez 2022-10-31 10:42:35 -04:00
parent 3cfd20141a
commit f3871984ae
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
helpers/config
View file

@ -69,11 +69,7 @@ changelog(){
head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME
[ "$BACKPORT" = true ] || [ "$BACKPORTS" = true ] && REPO=${CODENAME}-backports [ "$BACKPORT" = true ] || [ "$BACKPORTS" = true ] && REPO=${CODENAME}-backports
#Name convention issue "+" breaking packages build like console-setup, using "-" instead. #Name convention issue "+" breaking packages build like console-setup, using "-" instead.
if [ "$NAME_CI" = true ];then echo | dch -D $REPO -v $FULLVERSION "$1"
echo | dch -D $REPO -v `pkgversion`-${REVISION}trisquel${VERSION} "$1"
else
echo | dch -D $REPO -v `pkgversion`+${REVISION}trisquel${VERSION} "$1"
fi
# Make sure the changelog file is identical between archs # Make sure the changelog file is identical between archs
/bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info> $DATE/" -i debian/changelog /bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info> $DATE/" -i debian/changelog
@ -171,8 +167,15 @@ dpkg-source --no-check -x --skip-patches *.dsc source
find -maxdepth 1 -type f | xargs rm find -maxdepth 1 -type f | xargs rm
cd source cd source
#disable 3.0 deb source format UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version)
[ -f debian/source/format ] && rm debian/source/format 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
# Use 3.0 (native) deb source format
[ -f debian/source/format ] && echo "3 (native)" > debian/source/format
[ -f debian/source/options ] && rm debian/source/options [ -f debian/source/options ] && rm debian/source/options
grep -lr 'Maintainer:' debian*/control* | \ grep -lr 'Maintainer:' debian*/control* | \
@ -191,7 +194,8 @@ grep -qv '^#' debian/patches/series 2>/dev/null && quilt push -a
fi fi
cd .. cd ..
dpkg-source -b source mv source $PACKAGE-$FULLVERSION
dpkg-source -b $PACKAGE-$FULLVERSION
rm -rf ${LOCAL_APT} rm -rf ${LOCAL_APT}
echo "Trisquel source package built!" echo "Trisquel source package built!"

2
helpers/make-console-setup
View file

@ -25,7 +25,7 @@
VERSION=0 VERSION=0
NETINST=true NETINST=true
NAME_CI=true
. ./config . ./config