This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch master
in repository dpkg.

commit 3aa636491f02f84efc789f9f2f263d792fa7bd7a
Author: Guillem Jover <guil...@debian.org>
Date:   Sun Mar 25 01:55:38 2018 +0100

    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.rec...@canonical.com>
---
 debian/changelog | 2 ++
 debian/control   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 15e1355..848ce0c 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 <ijack...@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 ea649ea..123a8e0 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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/dpkg/dpkg.git

Reply via email to