summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2018-03-25 01:55:38 +0100
committerGuillem Jover <guillem@debian.org>2018-03-25 05:45:47 +0200
commit3aa636491f02f84efc789f9f2f263d792fa7bd7a (patch)
tree8a67c16a175817ad57739944b00c190f1a83e30e
parent0d9c18d163ca37ef4c0c2127f8ec901f721d1473 (diff)
downloaddpkg-3aa636491f02f84efc789f9f2f263d792fa7bd7a.tar.gz
debian: Add bzip2 and xz-utils to Build-Depends
The functional test suite under t-func/ uses these compression tools to unpack a test .deb package. This has not been a problem up-to-now because dpkg-dev, which gets installed on the build systems, depends also on these packages. But the dependencies are really missing. Prompted-by: Bálint Réczey <balint.reczey@canonical.com>
-rw-r--r--debian/changelog2
-rw-r--r--debian/control3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 15e135548..848ce0c09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -94,6 +94,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
from Dpkg::Source::Package.
Reported by Ian Jackson <ijackson@chiark.greenend.org.uk>.
- Bump Standards-Version to 4.1.1 (no changes needed).
+ - Add bzip2 and xz-utils to Build-Depends, required by the functional test
+ suite, but shadowed by dpkg-dev from the build system pulling those in.
* Test suite:
- Skip Dpkg::OpenPGP test if gpg is not present.
- Check POD in all perl scripts.
diff --git a/debian/control b/debian/control
index ea649eaea..123a8e0e3 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,9 @@ Build-Depends:
liblzma-dev,
libselinux1-dev [linux-any],
libncursesw5-dev,
+# Needed for the functional test.
+ bzip2 <!nocheck>,
+ xz-utils <!nocheck>,
Package: dpkg
Architecture: any