diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-02-28 18:32:32 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-02-28 18:32:32 +0100 |
| commit | 68ddc4a20fe7cbf53e22c7a8bbc35db597b87313 (patch) | |
| tree | 66f9b4a40302a600d6b9f521ed8ccb289942df9d | |
| parent | c19311102a283edae54c23c447153ebf2072bb1e (diff) | |
Do not require versioned dpkg-dev on CI
Annotate the Build-Depends with a <!pkg.apt.ci> profile and use
that in prepare-release when doing build-dep.
| -rw-r--r-- | debian/control | 3 | ||||
| -rwxr-xr-x | prepare-release | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 0082f0cd7..ada4f6cdf 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Uploaders: Michael Vogt <mvo@debian.org>, David Kalnischkies <donkult@debian.org> Rules-Requires-Root: no Standards-Version: 4.1.1 -Build-Depends: dpkg-dev (>= 1.22.5), cmake (>= 3.4), +Build-Depends: dpkg-dev (>= 1.22.5) <!pkg.apt.ci>, + cmake (>= 3.4), debhelper-compat (= 12), docbook-xml <!nodoc>, docbook-xsl <!nodoc>, diff --git a/prepare-release b/prepare-release index 988ccabad..85c56721d 100755 --- a/prepare-release +++ b/prepare-release @@ -178,7 +178,7 @@ elif [ "$1" = 'buildlog' ]; then shift done elif [ "$1" = 'travis-ci' ]; then - apt-get build-dep -qy . + apt-get build-dep -P pkg.apt.ci -qy . apt-get install -qy --no-install-recommends dctrl-tools for t in $(grep '^Tests: ' debian/tests/control | cut -d':' -f 2- | tr ',' '\n'); do apt-get satisfy -qy --no-install-recommends "base-files,$(grep-dctrl -ns Depends -F Tests $t ./debian/tests/control | sed -e 's#@[^,<>()@]*@\s*,\s*##g' -e 's#@\s*,\s*##g')" |