From: David Bremner Date: Sun, 18 Jan 2015 16:55:10 +0000 (+0100) Subject: [PATCH] doc: remove support for rst2man X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8245c9921b323b9e8aeddd9fd1c6d7d278d450ce;p=notmuch-archives.git [PATCH] doc: remove support for rst2man --- diff --git a/e8/c9ea0c48dddcfca905de8d1a1f929792b1a5fb b/e8/c9ea0c48dddcfca905de8d1a1f929792b1a5fb new file mode 100644 index 000000000..1641d5e50 --- /dev/null +++ b/e8/c9ea0c48dddcfca905de8d1a1f929792b1a5fb @@ -0,0 +1,284 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 4312F431FB6 + for ; Sun, 18 Jan 2015 08:56:11 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id rYHZkS1ABWhk for ; + Sun, 18 Jan 2015 08:56:08 -0800 (PST) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id E0381431FAF + for ; Sun, 18 Jan 2015 08:56:07 -0800 (PST) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1YCt8I-0007jp-1t; Sun, 18 Jan 2015 16:55:26 +0000 +Received: (nullmailer pid 20082 invoked by uid 1000); Sun, 18 Jan 2015 + 16:55:12 -0000 +From: David Bremner +To: David Bremner , "notmuch@notmuchmail.org" + +Subject: [PATCH] doc: remove support for rst2man +Date: Sun, 18 Jan 2015 17:55:10 +0100 +Message-Id: <1421600110-19988-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <87k312x4i2.fsf@maritornes.cs.unb.ca> +References: <87k312x4i2.fsf@maritornes.cs.unb.ca> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 18 Jan 2015 16:56:11 -0000 + +It was becoming increasingly complicated to support rst2man, and there +were apparently not many people that relied on it. +--- + +Now's your chance to tell us how useful rst2man support is to you. + + INSTALL | 7 ++---- + NEWS | 6 +++++ + configure | 20 +++-------------- + doc/INSTALL | 13 ----------- + doc/Makefile.local | 7 ++---- + doc/prerst2man.py | 64 ------------------------------------------------------ + 6 files changed, 13 insertions(+), 104 deletions(-) + delete mode 100644 doc/prerst2man.py + +diff --git a/INSTALL b/INSTALL +index b543c50..eaccd93 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -75,14 +75,11 @@ Talloc, and zlib which are each described below: + Building Documentation + ---------------------- + +-By default the documentation for notmuch is built using sphinx. ++To build the documentation for notmuch you need at least version 1.0 ++of sphinx (Jul. 2010). + + Sphinx is available from www.sphinx-doc.org. + +-If you prefer, you can build the man pages using rst2man, from the +-python docutils package. See doc/INSTALL for details. +- +- + Installing Dependencies from Packages + ------------------------------------- + +diff --git a/NEWS b/NEWS +index abb5ad7..53e06aa 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,11 @@ + Notmuch 0.20 (UNRELEASED) + ++Documentation ++------------- ++ ++Support for using rst2man in place of sphinx to build the ++docmumentation has been removed. ++ + Contrib + ------- + +diff --git a/configure b/configure +index 137acea..a6b49ae 100755 +--- a/configure ++++ b/configure +@@ -447,19 +447,9 @@ printf "Checking if sphinx is available and supports nroff output... " + if hash sphinx-build > /dev/null 2>&1 && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then + printf "Yes.\n" + have_sphinx=1 +- have_rst2man=0 + else +- printf "No (falling back to rst2man).\n" ++ printf "No (so will not install man pages).\n" + have_sphinx=0 +- +- printf "Checking if rst2man is available... " +- if rst2man -V > /dev/null 2>&1; then +- printf "Yes.\n" +- have_rst2man=1 +- else +- printf "No (so will not install man pages).\n" +- have_rst2man=0 +- fi + fi + + libdir_in_ldconfig=0 +@@ -848,9 +838,6 @@ HAVE_EMACS = ${have_emacs} + # Whether there's a sphinx-build binary available for building documentation + HAVE_SPHINX=${have_sphinx} + +-# Whether there's a rst2man binary available for building documentation +-HAVE_RST2MAN=${have_rst2man} +- + # Whether there's a doxygen binary available for building api documentation + HAVE_DOXYGEN=${have_doxygen} + +@@ -978,9 +965,8 @@ cat > sh.config <