From cb12cbb7eee96c345db38fe7b3630601a1bbd0cf Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sat, 6 Feb 2021 04:04:07 +0100 Subject: Install text-only FAQ into zsh-doc, too, for now. See #980903 debhelper currently has a bug when dh_installdocs is called with -p and the documents for a doc-base registration are split over multiple packages (https://bugs.debian.org/980903) which is exactly what I did in the previous commit. So lets skip splitting the FAQ over two packages and install it only into zsh-doc until #980903 is fixed in debhelper. Once #980903 is fixed in debhelper, please do the following: * Revert this commit. * Add according Breaks and Replaces headers against zsh-doc to zsh-common. * Add a build-dependency on debhelper >= the fixed version. * Refer to #961757 in the debian/changelog entry (aka first line of a commit message). --- debian/zsh-common.doc-base | 13 ------------- debian/zsh-common.docs | 1 - debian/zsh-doc.doc-base.faq | 4 ++++ debian/zsh-doc.docs | 1 + 4 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 debian/zsh-common.doc-base diff --git a/debian/zsh-common.doc-base b/debian/zsh-common.doc-base deleted file mode 100644 index 2b719364e..000000000 --- a/debian/zsh-common.doc-base +++ /dev/null @@ -1,13 +0,0 @@ -Document: zsh-faq -Title: Z Shell FAQ -Author: Peter Stephenson -Abstract: This document contains a list of frequently-asked (or - otherwise significant) questions concerning the Z-shell, a command - interpreter for many UNIX systems which is freely available to anyone - with FTP access. Zsh is among the most powerful freely available - Bourne-like shells for interactive use. -Section: Shells - -Format: Text -Index: /usr/share/doc/zsh-common/FAQ.gz -Files: /usr/share/doc/zsh-common/FAQ.gz diff --git a/debian/zsh-common.docs b/debian/zsh-common.docs index 9e8d2806d..e31e29544 100644 --- a/debian/zsh-common.docs +++ b/debian/zsh-common.docs @@ -12,4 +12,3 @@ MACHINES META-FAQ NEWS README -obj/Etc/FAQ diff --git a/debian/zsh-doc.doc-base.faq b/debian/zsh-doc.doc-base.faq index 841205324..f2b9641e5 100644 --- a/debian/zsh-doc.doc-base.faq +++ b/debian/zsh-doc.doc-base.faq @@ -11,3 +11,7 @@ Section: Shells Format: HTML Index: /usr/share/doc/zsh-common/html/FAQ.html Files: /usr/share/doc/zsh-common/html/FAQ*.html + +Format: Text +Index: /usr/share/doc/zsh-common/FAQ.gz +Files: /usr/share/doc/zsh-common/FAQ.gz diff --git a/debian/zsh-doc.docs b/debian/zsh-doc.docs index 60cb2382a..1996b078f 100644 --- a/debian/zsh-doc.docs +++ b/debian/zsh-doc.docs @@ -1 +1,2 @@ obj/Doc/zsh.pdf +obj/Etc/FAQ -- cgit v1.2.3