[Python-modules-commits] r10697 - in packages/python-docutils/trunk/debian (15 files)

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Mon Dec 7 01:48:27 UTC 2009


    Date: Monday, December 7, 2009 @ 01:48:26
  Author: smcv
Revision: 10697

Generate better man pages, using rst2man

Also, pick up Michael Schutte's man page for rst2odt_prepstyles from the
old odtwriter source package.

Added:
  packages/python-docutils/trunk/debian/rst-buildhtml.txt
  packages/python-docutils/trunk/debian/rst2html.txt
  packages/python-docutils/trunk/debian/rst2latex.txt
  packages/python-docutils/trunk/debian/rst2man.txt
  packages/python-docutils/trunk/debian/rst2newlatex.txt
  packages/python-docutils/trunk/debian/rst2odt.txt
  packages/python-docutils/trunk/debian/rst2odt_prepstyles.sgml
  packages/python-docutils/trunk/debian/rst2pseudoxml.txt
  packages/python-docutils/trunk/debian/rst2s5.txt
  packages/python-docutils/trunk/debian/rst2xml.txt
  packages/python-docutils/trunk/debian/rstpep2html.txt
Modified:
  packages/python-docutils/trunk/debian/control
  packages/python-docutils/trunk/debian/python-docutils.copyright
  packages/python-docutils/trunk/debian/python-docutils.manpages
  packages/python-docutils/trunk/debian/rules

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2009-12-07 01:46:16 UTC (rev 10696)
+++ packages/python-docutils/trunk/debian/control	2009-12-07 01:48:26 UTC (rev 10697)
@@ -7,7 +7,9 @@
            Michael Schutte <michi at uiae.at>,
            Ben Finney <ben+debian at benfinney.id.au>
 Build-Depends: debhelper (>= 5.0.37.1), python-setuptools (>= 0.6b3), python (>= 2.3)
-Build-Depends-Indep: xsltproc (>= 1.1.20), python-support (>= 0.6.4)
+Build-Depends-Indep: xsltproc (>= 1.1.20),
+                     python-support (>= 0.6.4),
+                     docbook-to-man
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-docutils/trunk/

Modified: packages/python-docutils/trunk/debian/python-docutils.copyright
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.copyright	2009-12-07 01:46:16 UTC (rev 10696)
+++ packages/python-docutils/trunk/debian/python-docutils.copyright	2009-12-07 01:48:26 UTC (rev 10697)
@@ -34,6 +34,14 @@
       On Debian systems the text of the GNU General Public License version 2
       can be found in /usr/share/common-licenses/GPL-2.
 
+* debian/rst2odt_prepstyles.sgml (taken from the odtwriter source package)
+
+      Copyright: © 2008–2009 Michael Schutte <michi at uiae.at>
+      The Debian packaging work is under the GNU General Public License,
+      version 2 or, at your option, any later version.  On Debian systems, the
+      complete text of the GNU General Public License can be found in
+      “/usr/share/common-licenses/GPL”.
+
 The source package contains additional files with different copyrights
 (all OSI-approved and GPL-compatible). However, these files are not
 included in the python-docutils package.

Modified: packages/python-docutils/trunk/debian/python-docutils.manpages
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.manpages	2009-12-07 01:46:16 UTC (rev 10696)
+++ packages/python-docutils/trunk/debian/python-docutils.manpages	2009-12-07 01:48:26 UTC (rev 10697)
@@ -1,8 +1,11 @@
-debian/rst2html.1
-debian/rst2xml.1
-debian/rst2latex.1
-debian/rst2newlatex.1
-debian/rst2pseudoxml.1
-debian/rst2s5.1
-debian/rstpep2html.1
-debian/rst-buildhtml.1
+debian/man.tmp/rst2html.1
+debian/man.tmp/rst2xml.1
+debian/man.tmp/rst2latex.1
+debian/man.tmp/rst2man.1
+debian/man.tmp/rst2newlatex.1
+debian/man.tmp/rst2odt.1
+debian/man.tmp/rst2odt_prepstyles.1
+debian/man.tmp/rst2pseudoxml.1
+debian/man.tmp/rst2s5.1
+debian/man.tmp/rstpep2html.1
+debian/man.tmp/rst-buildhtml.1

Added: packages/python-docutils/trunk/debian/rst-buildhtml.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst-buildhtml.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst-buildhtml.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+=============
+rst-buildhtml
+=============
+
+-----------------------------------
+convert many reST documents to HTML
+-----------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Added: packages/python-docutils/trunk/debian/rst2html.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst2html.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2html.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+========
+rst2html
+========
+
+-------------------------------
+convert reST documents to XHTML
+-------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Added: packages/python-docutils/trunk/debian/rst2latex.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst2latex.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2latex.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+=========
+rst2latex
+=========
+
+-------------------------------
+convert reST documents to LaTeX
+-------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Added: packages/python-docutils/trunk/debian/rst2man.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst2man.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2man.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+=======
+rst2man
+=======
+
+---------------------------------------------
+generate unix manpages from reStructured text
+---------------------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Added: packages/python-docutils/trunk/debian/rst2newlatex.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst2newlatex.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2newlatex.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,18 @@
+============
+rst2newlatex
+============
+
+----------------------------------------------------
+convert reST documents to LaTeX (deprecated version)
+----------------------------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+UNMAINTAINED
+============
+
+rst2newlatex is not maintained; please use rst2latex instead. It will
+eventually be removed from Debian packages of python-docutils.
+
+

Added: packages/python-docutils/trunk/debian/rst2odt.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst2odt.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2odt.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+=======
+rst2odt
+=======
+
+-------------------------------------------------
+convert reST documents to OpenDocument text (ODT)
+-------------------------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Added: packages/python-docutils/trunk/debian/rst2odt_prepstyles.sgml
===================================================================
--- packages/python-docutils/trunk/debian/rst2odt_prepstyles.sgml	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2odt_prepstyles.sgml	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,62 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.5//EN">
+<refentry id="rst2odt_prepstyles">
+  <refmeta>
+    <refentrytitle>rst2odt_prepstyles</refentrytitle>
+    <manvolnum>1</manvolnum>
+    <refmiscinfo class="date">July 2008</refmiscinfo>
+    <refmiscinfo class="source"></refmiscinfo>
+    <refmiscinfo class="title">odtwriter</refmiscinfo>
+  </refmeta>
+
+  <refnamediv>
+    <refname>rst2odt_prepstyles</refname>
+    <refpurpose>strip paper size specifications off of rst2odt stylesheets</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>rst2odt_prepstyles</command>
+      <arg choice="req"><replaceable>FILE</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>
+      <command>rst2odt(1)</command> uses a stylesheet file as a template
+      for the ODT files it creates.  The stock
+      <filename>styles.odt</filename> file shipped with it comes without
+      page dimensions.  When <command>rst2odt</command> is run and
+      detects that there no paper size is given in the stylesheet, it is
+      automatically determined using <command>paperconf(1)</command>.
+    </para>
+
+    <para>
+      When editing stylesheets with OpenOffice.org Writer (or similar
+      programs), the resulting files always carry a page size.
+      <command>rst2odt</command> respects this setting and ensures that
+      documents processed with custom stylesheets look the same
+      regardless of the host it is running on.  If you want to get the
+      original behavior, i.e. a system-dependent paper size, you can run
+      <command>rst2odt_prepstyles</command> over your custom stylesheet.
+      Remember to re-run the command whenever you change the file with a
+      word processor.
+    </para>
+  </refsect1>
+
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>
+      odtwriter is Copyright &copy; 2006-2008 Dave Kuhlman
+      &lt;<email>dkuhlman at rexx.com</email>&gt;
+    </para>
+
+    <para>
+      This manual page was written by Michael Schutte for the Debian
+      GNU/Linux system (but may be used by others).
+    </para>
+  </refsect1>
+</refentry>
+<!-- vim: set sw=2 sts=2 et tw=72: -->

Added: packages/python-docutils/trunk/debian/rst2pseudoxml.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst2pseudoxml.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2pseudoxml.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+=============
+rst2pseudoxml
+=============
+
+------------------------------------
+convert reST documents to pseudo-XML
+------------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Added: packages/python-docutils/trunk/debian/rst2s5.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst2s5.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2s5.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+======
+rst2s5
+======
+
+-----------------------------------
+convert reST documents to S5 slides
+-----------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Added: packages/python-docutils/trunk/debian/rst2xml.txt
===================================================================
--- packages/python-docutils/trunk/debian/rst2xml.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rst2xml.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+=======
+rst2xml
+=======
+
+-----------------------------
+convert reST documents to XML
+-----------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Added: packages/python-docutils/trunk/debian/rstpep2html.txt
===================================================================
--- packages/python-docutils/trunk/debian/rstpep2html.txt	                        (rev 0)
+++ packages/python-docutils/trunk/debian/rstpep2html.txt	2009-12-07 01:48:26 UTC (rev 10697)
@@ -0,0 +1,12 @@
+===========
+rstpep2html
+===========
+
+-------------------------------------------------
+convert reST Python Enhancement Proposals to HTML
+-------------------------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2009-12-07 01:46:16 UTC (rev 10696)
+++ packages/python-docutils/trunk/debian/rules	2009-12-07 01:48:26 UTC (rev 10697)
@@ -37,7 +37,7 @@
 	$(PYTHON) setup.py clean --all
 	-find -name '*.py[co]' | xargs rm -f
 	rm -f *.html
-	rm -f debian/*.1
+	rm -rf debian/man.tmp
 	find docs -name '*.html' -not -name 'quickref.html' -print0 | \
 		xargs -0 --no-run-if-empty rm
 	-rm -rf docutils.egg-info
@@ -65,54 +65,20 @@
 	install tools/buildhtml.py debian/tmp/usr/bin/rst-buildhtml
 	: # Make the man pages (we want to do this *after* renaming all the
 	: # tools, because their executable name goes into the --help output)
-	PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rst2html --help | \
-	PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
-	$(XSLTPROC) \
-		--stringparam name rst2html \
-		--stringparam oneliner 'convert reST documents to XHTML' \
-		debian/rsthelp2man.xsl - > debian/rst2html.1
-	PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rst2xml --help | \
-	PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
-	$(XSLTPROC) \
-		--stringparam name rst2xml \
-		--stringparam oneliner 'convert reST documents to XML' \
-		debian/rsthelp2man.xsl - > debian/rst2xml.1
-	PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rst2latex --help | \
-	PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
-	$(XSLTPROC) \
-		--stringparam name rst2latex \
-		--stringparam oneliner 'convert reST documents to LaTeX (stable version)' \
-		debian/rsthelp2man.xsl - > debian/rst2latex.1
-	PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rst2newlatex --help | \
-	PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
-	$(XSLTPROC) \
-		--stringparam name rst2newlatex \
-		--stringparam oneliner 'convert reST documents to LaTeX (experimental version)' \
-		debian/rsthelp2man.xsl - > debian/rst2newlatex.1
-	PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rst2pseudoxml --help | \
-	PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
-	$(XSLTPROC) \
-		--stringparam name rst2pseudoxml \
-		--stringparam oneliner 'convert reST documents to pseudo-XML' \
-		debian/rsthelp2man.xsl - > debian/rst2pseudoxml.1
-	PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rst2s5 --help | \
-	PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
-	$(XSLTPROC) \
-		--stringparam name rst2s5 \
-		--stringparam oneliner 'convert reST documents to S5 slides' \
-		debian/rsthelp2man.xsl - > debian/rst2s5.1
-	PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rstpep2html --help | \
-	PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
-	$(XSLTPROC) \
-		--stringparam name rstpep2html \
-		--stringparam oneliner 'convert reST Python Enhancement Proposals to HTML' \
-		debian/rsthelp2man.xsl - > debian/rstpep2html.1
-	PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rst-buildhtml --help | \
-	PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
-	$(XSLTPROC) \
-		--stringparam name rst-buildhtml \
-		--stringparam oneliner 'convert many reST documents to HTML' \
-		debian/rsthelp2man.xsl - > debian/rst-buildhtml.1
+	install -d debian/man.tmp
+	set -e && for exe in rst2html rst2man rst2latex rst2newlatex \
+		rst2pseudoxml rst2s5 rst2xml rst-buildhtml rstpep2html \
+		rst2odt; do \
+		PYTHONPATH=.:extras; \
+		export PYTHONPATH; \
+		cp debian/$$exe.txt debian/man.tmp/$$exe.txt; \
+		$(PYTHON) debian/tmp/usr/bin/$$exe --help \
+			>> debian/man.tmp/$$exe.txt;\
+		$(PYTHON) tools/rst2man.py debian/man.tmp/$$exe.txt \
+			debian/man.tmp/$$exe.1; \
+	done
+	docbook-to-man debian/rst2odt_prepstyles.sgml > \
+		debian/man.tmp/rst2odt_prepstyles.1
 	: # Install documentation
 	rm -f $(d)/usr/share/doc/$(p)/COPYING[-.]*
 	set -e && ( cd docs; find . -name SCCS -prune -o -type d -print ) | \




More information about the Python-modules-commits mailing list