UBUNTU: [Debian] Support sphinx-based kernel documentation

The kernel has been transitioning to using sphinx instead of
DocBook for generating documentation. Starting in 4.13 the old
DocBook support has been completely removed, breaking our
linux-doc build. Update the build deps and copy the html docs
from their new location.

We still need to keep the DocBook build dependency for generating
perf manpages.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 064fa8a26d515147a75c15b566dc86f9c9cb89ec..8d4275a3faf85fce0c94e9d6bb54f4236705ce23 100644 (file)
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -42,6 +42,8 @@ Build-Depends-Indep:
  bzip2 <!stage1>,
  sharutils <!stage1>,
  asciidoc <!stage1>,
+ python-sphinx <!stage1>,
+ python-sphinx-rtd-theme <!stage1>,
 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/zesty
 XS-Testsuite: autopkgtest
 #XS-Testsuite-Depends: gcc-4.7 binutils

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 36cc169e3c0b2aaf44270801240bc801a96163c6..d197cc9defa6b4c7a3f233a73d822295831c41a1 100644 (file)
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -43,14 +43,13 @@ ifeq ($(do_doc_package_content),true)
                install -d $(docdir)/$(doc_pkg_name)-tmp; \
                $(kmake) O=$(docdir)/$(doc_pkg_name)-tmp htmldocs; \
                install -d $(docdir)/html; \
-               rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/DocBook/ \
+               rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/output/ \
                        $(docdir)/html/; \
                rm -rf $(docdir)/$(doc_pkg_name)-tmp; \
        fi
 endif
        # Copy the rest
        cp -a Documentation/* $(docdir)
-       rm -rf $(docdir)/DocBook
        find $(docdir) -name .gitignore | xargs rm -f
 endif