[linux] 01/01: debian/control: Revert change to asciidoc build-dependency

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch jessie-backports
in repository linux.

commit 82e0098aae0ba0706c485326c3c3d4b6fc25f74b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jan 17 20:21:05 2017 +0000

    debian/control: Revert change to asciidoc build-dependency
    
    wanna-build doesn't look past the first alternative, and since
    asciidoc-base is not available in jessie-backports it has marked linux
    as BD-Uninstallable.  Strangely, this isn't a problem for the openssl
    dependency (does wanna-build also ignore versions?).  sbuild as
    configured for backports certainly *does* look past the first
    alternative.
---
 debian/changelog                   | 7 +++++++
 debian/templates/control.source.in | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c092570..5a19c38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.8.15-2~bpo8+2) jessie-backports; urgency=medium
+
+  * debian/control: Revert change to asciidoc build-dependency, which confuses
+    wanna-build
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 17 Jan 2017 20:18:03 +0000
+
 linux (4.8.15-2~bpo8+1) jessie-backports; urgency=medium
 
   [ Ben Hutchings ]
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 01375c3..1190a63 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -26,7 +26,7 @@ Build-Depends:
 #   not have M-A: allowed but need unqualified name for newer versions
  openssl (>= 1.1.0-1~) <!stage1> | openssl:native <!stage1>,
 # used by upstream to build perf documentation
- asciidoc-base <!stage1 !nodoc !pkg.linux.notools> | asciidoc <!stage1 !nodoc !pkg.linux.notools>,
+ asciidoc <!stage1 !nodoc !pkg.linux.notools>,
  xmlto <!stage1 !nodoc !pkg.linux.notools>,
 # used by upstream to build perf
  bison <!stage1 !pkg.linux.notools !nopython>,

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