Merge branch 'gitlab-fix' into 'main'

Do not require versioned dpkg-dev on CI See merge request apt-team/apt!332
wangzhen0518 · Feb 28, 2024 · 0108412 · 0108412
2 parents c193111 + 68ddc4a
commit 0108412
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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')"