[linux] 01/01: debian/control: Correct build-dependency on xz-utils, needed on all arches

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit c2de3cfb2045991e949145c64694a7edd856e750
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Aug 21 13:01:49 2015 +0200

    debian/control: Correct build-dependency on xz-utils, needed on all arches
    
    Currently we have xz-utils in build-depends-indep as we explicitly
    use xz to compress files in linux-source.  We also have a build-
    dependency on lzma (now a virtual package provided by xz-utils),
    but only on armel which was the first architecture for which we
    set CONFIG_KERNEL_XZ=y.
    
    However, since 3.7 we've set CONFIG_KERNEL_XZ for all architectures so
    xz-utils is needed everywhere.  Currently we get away with this
    because dpkg-dev depends on xz-utils, but this could change in future.
    Build-depend on xz-utils without qualification.
---
 debian/changelog                   | 3 +++
 debian/templates/control.source.in | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f681f1..8cd4d5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ linux (4.2~rc7-1~exp1) UNRELEASED; urgency=medium
   * [mips,mips64] Remove r4k-ip22, r5k-ip32 and sb1-bcm91250a flavours.
   * [mipsel,mips64el] Remove sb1-bcm91250a flavour.
 
+  [ Ben Hutchings ]
+  * debian/control: Correct build-dependency on xz-utils, needed on all arches
+
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 17 Aug 2015 10:28:46 +0200
 
 linux (4.2~rc6-1~exp1) experimental; urgency=medium
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 8f966f4..dcaf8b1 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -3,8 +3,8 @@ Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.9.5
-Build-Depends: debhelper, cpio, kmod, python, python-six, lzma [armel], kernel-wedge, quilt, patchutils, bc
-Build-Depends-Indep: xz-utils, xmlto
+Build-Depends: debhelper, cpio, kmod, python, python-six, xz-utils, kernel-wedge, quilt, patchutils, bc
+Build-Depends-Indep: xmlto
 Vcs-Git: https://anonscm.debian.org/git/kernel/linux.git
 Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux.git
 Homepage: https://www.kernel.org/

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