summaryrefslogtreecommitdiff
path: root/prepare-release
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-08-16 15:46:19 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-08-17 09:52:32 +0200
commit19fdf93d7363261227811a62157063081b9f1a5d (patch)
treeb3c7b4c734fcbdf11ad38785886652310b2772f2 /prepare-release
parentd6e9ec719e2824db0b90f344f71b6e853df05627 (diff)
downloadapt-19fdf93d7363261227811a62157063081b9f1a5d.tar.gz
add the gpg-classic variant to the gpgv/gnupg or-group
We need to support partial upgrades anyhow, so we have to deal with the different versions and your tests try to ensure that we do, so we shouldn't make any explicit higher requirements.
Diffstat (limited to 'prepare-release')
-rwxr-xr-xprepare-release5
1 files changed, 3 insertions, 2 deletions
diff --git a/prepare-release b/prepare-release
index df1b0a2cf..1e434a305 100755
--- a/prepare-release
+++ b/prepare-release
@@ -158,8 +158,9 @@ elif [ "$1" = 'buildlog' ]; then
shift
done
elif [ "$1" = 'travis-ci' ]; then
- apt-get install -qy --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' -e 's#<.*>##g' | tr -d ',')
- apt-get install -qy --no-install-recommends $(sed -n 's#^Depends: .*@, \(.*\)$#\1#p' debian/tests/control | tr -d ',')
+ apt-get install -qy --no-install-recommends dctrl-tools
+ apt-get install -qy --no-install-recommends $(grep-dctrl -S -s Build-Depends,Build-Depends-Indep,Build-Depends-Arch apt ./debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\|-Arch\)\?: ##' -e 's#<.*>##g' | tr -s '\n,' ' ')
+ apt-get install -qy --no-install-recommends $(grep-dctrl -F Tests -s Depends run-tests ./debian/tests/control | tr -s '\n,' ' ' | cut -d'@' -f 4- | sed -e 's#gnupg1#gnupg2#' -e 's#gpgv1#gpgv2#')
elif [ "$1" = 'coverage' ]; then
DIR="${2:-./coverage}"
git clean -dfX # remove ignored build artefacts for a clean start