[linux] 03/04: Remove support for upstream DocBook-based documentation

[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 c8e760ebac91647b8ac0302264ae32726fc59040
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Aug 13 16:39:42 2017 +0100

    Remove support for upstream DocBook-based documentation
    
    It has finally been removed after all docs were converted to ReST format.
    As there is no longer a way to build manpages, remove the linux-manual
    package.
---
 debian/changelog                   |  2 ++
 debian/rules.real                  | 11 +----------
 debian/templates/control.docs.in   | 19 -------------------
 debian/templates/control.source.in |  1 -
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44594e0..14115d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ linux (4.13~rc4-1~exp1) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * cpupower: Add/update definition of MSRHEADER macro for turbostat and
     x86_energy_perf_policy
+  * Remove support for upstream DocBook-based documentation, including the
+    linux-manual package
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 13 Aug 2017 14:10:41 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 296459c..7581993 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -67,7 +67,6 @@ binary-arch-flavour: install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
 ifneq ($(DO_DOCS),False)
   binary-indep: install-doc
-  binary-indep: install-manual
   build-indep: $(STAMPS_DIR)/build-doc
 endif
 binary-indep: install-source
@@ -232,19 +231,11 @@ install-doc: $(STAMPS_DIR)/build-doc
 		-name 'Makefile*' -prune -o \
 		-print | \
 	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)'
-# Some HTML pages are generated by xmlto from DocBook XML and some by
-# Sphinx from reStructedText.  Unfortunately these each generate their
-# own top level index.html, so we put them in two separate
-# subdirectories until the conversion to RST is complete.
-	set -o pipefail; \
-	cd $(DIR)/Documentation/DocBook; \
-	find * -name '*.html' -print | \
-	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html/oldstyle'
 	set -o pipefail; \
 	cd $(DIR)/Documentation/output; \
 	find * -name '*.rst' -prune -o -name objects.inv -prune \
 		-o -name xml -prune -o -print | \
-	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html/newstyle'
+	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html'
 	find $(OUT_DIR)/Documentation -type f | xargs gzip -9n
 # Fix up symlinks to gzipped docs
 	cd $(OUT_DIR)/Documentation; \
diff --git a/debian/templates/control.docs.in b/debian/templates/control.docs.in
index 9b16f09..a0886d5 100644
--- a/debian/templates/control.docs.in
+++ b/debian/templates/control.docs.in
@@ -12,22 +12,3 @@ Description: Linux kernel specific documentation for version @version@
  /usr/share/doc/linux-doc- at version@/Documentation/00-INDEX
  for the detailed description of the contents.
 
-Package: @source_package at -manual-@version@
-Build-Profiles: <!stage1 !nodoc>
-Architecture: all
-Depends: ${misc:Depends}
-Section: doc
-Provides: linux-manual
-Conflicts: linux-manual
-Replaces: linux-manual
-Multi-Arch: foreign
-Description: Linux kernel API manual pages for version @version@
- This package provides the Kernel Hacker's Guide in the form of
- manual pages, describing the kernel API functions.  They
- are installed into section 9 of the manual.
- .
- As the files containing manual pages for different kernel versions
- are installed in the same location, only one linux-manual package
- may be installed at a time.  The linux-doc package containing the
- documentation in other formats is free from such restriction.
-
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 8c524d8..a6e2e70 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -64,7 +64,6 @@ Build-Depends-Indep:
  graphviz <!stage1 !nodoc>,
  python-sphinx <!stage1 !nodoc>,
  python-sphinx-rtd-theme <!stage1 !nodoc>,
- xmlto <!stage1 !nodoc>,
 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