[linux] 10/18: debian/control: Remove obsolete workarounds and alternate build deps

[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 112ad0c27fabd402f07bf04fa19e0bd8bbfaaa0a
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Sep 30 14:39:46 2017 +0100

    debian/control: Remove obsolete workarounds and alternate build deps
    
    The dpkg bugs affecting libssl-dev build deps were fixed in 1.18.8.
    The various non-M-A packages for which we used :native qualification
    were fixed before stretch release.  So neither unstable nor
    stretch-backports needs these.
---
 debian/changelog                   |  1 +
 debian/templates/control.source.in | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fd7f04..580bcc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium
     - Install copyright file (and some other documentation) when the nodoc
       profile is used
   * debian/control: Move many build dependencies to Build-Depends-Arch field
+  * debian/control: Remove obsolete workarounds and alternate build deps
 
   [ Uwe Kleine-König ]
   * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 27d5284..1b6bb02 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -23,18 +23,15 @@ Build-Depends-Arch:
 # used by upstream to build include/generated/timeconst.h
  bc <!stage1>,
 # used by upstream to build signing tools and to process certificates
-# - libssl-dev arch-qualification is a workaround for #827628 and #827633
- libssl-dev:native <!stage1>, libssl-dev [linux-any] <!stage1 !pkg.linux.notools cross>,
-# - openssl needs to run on the host; need :native for older versions that do
-#   not have M-A: allowed but need unqualified name for newer versions
- openssl (>= 1.1.0-1~) <!stage1> | openssl:native <!stage1>,
+ libssl-dev:native <!stage1>, libssl-dev <!stage1 !pkg.linux.notools cross>,
+ openssl (>= 1.1.0-1~) <!stage1>,
 # used by upstream to build perf documentation
- asciidoc-base <!stage1 !nodoc !pkg.linux.notools> | asciidoc <!stage1 !nodoc !pkg.linux.notools>,
+ asciidoc-base <!stage1 !nodoc !pkg.linux.notools>,
  xmlto <!stage1 !nodoc !pkg.linux.notools>,
 # used by upstream to build perf
  bison <!stage1 !pkg.linux.notools !nopython>,
 # - flex needs to run on the host; we have the same problem as for openssl
- flex (>= 2.6.1-1.1~) <!stage1 !pkg.linux.notools !nopython> | flex:native <!stage1 !pkg.linux.notools !nopython>,
+ flex (>= 2.6.1-1.1~) <!stage1 !pkg.linux.notools !nopython>,
  gcc-multilib [amd64 ppc64 s390x sparc64] <!stage1 !pkg.linux.notools !nopython>,
  libaudit-dev <!stage1 !pkg.linux.notools !nopython>,
  libbabeltrace-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,

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