[Python-modules-commits] r3628 - in /packages/python-docutils/trunk/debian: changelog control patches/00list python-docutils.manpages rst2html.1 rules

smcv-guest at users.alioth.debian.org smcv-guest at users.alioth.debian.org
Fri Nov 16 11:54:43 UTC 2007 

Author: smcv-guest
Date: Fri Nov 16 11:54:43 2007
New Revision: 3628

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3628
Log:
* debian/rules, debian/rsthelp2man.xsl, debian/control:
  Generate better man pages from the tools' own --help output using rst2xml
  and (new build dependency) xsltproc (Closes: #430947)
* debian/rst2html.1: Remove, the generated man page is better
* debian/rules, debian/unpep263.py: Mangle languages/*.py from UTF-8 into
  equivalent ASCII with \uXXXX escapes, so we can install into
  python2.x-minimal (which lacks the encodings machinery) (Closes: #379709)
* debian/patches/15_emacs_debian_paths.dpatch, debian/patches/00list:
  In rst.el, expect executables to not have .py suffix (Closes: #438667)
* debian/patches/16_emacs_jit_lock.dpatch, debian/patches/00list:
  Apply patch to rst.el from Justin Mazzola Paluska <jmp at MIT.EDU> to use
  jit-lock instead of lazy-lock for Emacs 22 compatibility (Closes: #418446)
* debian/patches/00list: Actually apply 10_doc_debian_paths.dpatch, to
  improve documentation
* debian/control: Set Homepage

Modified:
    packages/python-docutils/trunk/debian/changelog
    packages/python-docutils/trunk/debian/control
    packages/python-docutils/trunk/debian/patches/00list
    packages/python-docutils/trunk/debian/python-docutils.manpages
    packages/python-docutils/trunk/debian/rst2html.1
    packages/python-docutils/trunk/debian/rules

Modified: packages/python-docutils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/changelog?rev=3628&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/changelog (original)
+++ packages/python-docutils/trunk/debian/changelog Fri Nov 16 11:54:43 2007
@@ -1,11 +1,29 @@
 python-docutils (0.4-5) UNRELEASED; urgency=low
 
+  [ Bernd Zeimetz ]
   * debian/watch:
     - Adding file
   * debian/control:
     - Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now)
 
- -- Bernd Zeimetz <bernd at bzed.de>  Sat,  6 Oct 2007 23:47:05 +0200
+  [ Simon McVittie ]
+  * debian/rules, debian/rsthelp2man.xsl, debian/control:
+    Generate better man pages from the tools' own --help output using rst2xml
+    and (new build dependency) xsltproc (Closes: #430947)
+  * debian/rst2html.1: Remove, the generated man page is better
+  * debian/rules, debian/unpep263.py: Mangle languages/*.py from UTF-8 into
+    equivalent ASCII with \uXXXX escapes, so we can install into
+    python2.x-minimal (which lacks the encodings machinery) (Closes: #379709)
+  * debian/patches/15_emacs_debian_paths.dpatch, debian/patches/00list:
+    In rst.el, expect executables to not have .py suffix (Closes: #438667)
+  * debian/patches/16_emacs_jit_lock.dpatch, debian/patches/00list:
+    Apply patch to rst.el from Justin Mazzola Paluska <jmp at MIT.EDU> to use
+    jit-lock instead of lazy-lock for Emacs 22 compatibility (Closes: #418446)
+  * debian/patches/00list: Actually apply 10_doc_debian_paths.dpatch, to
+    improve documentation
+  * debian/control: Set Homepage
+
+ -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Fri, 16 Nov 2007 10:35:08 +0000
 
 python-docutils (0.4-4) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/control?rev=3628&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/control (original)
+++ packages/python-docutils/trunk/debian/control Fri Nov 16 11:54:43 2007
@@ -4,10 +4,11 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: martin f. krafft <madduck at debian.org>, Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
 Build-Depends: debhelper (>= 5.0.37.1), dpatch, python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1)
-Build-Depends-Indep: python-dev, python (>= 2.3)
+Build-Depends-Indep: python-dev, python (>= 2.3), xsltproc (>= 1.1.20)
 Standards-Version: 3.7.2.0
 XS-Python-Version: >= 2.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-docutils/trunk/
+Homepage: http://docutils.sourceforge.net/
 
 Package: python-docutils
 Architecture: all

Modified: packages/python-docutils/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/00list?rev=3628&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/patches/00list (original)
+++ packages/python-docutils/trunk/debian/patches/00list Fri Nov 16 11:54:43 2007
@@ -1,5 +1,8 @@
 01_upstream_04_branch_r4646.dpatch
+10_doc_debian_paths.dpatch
 11_not_usrbinenv_python.dpatch
 12_remove_unnecessary_hashbang.dpatch
 13_nodes_namespace.dpatch
 14_distutils_setup.dpatch
+15_emacs_debian_paths.dpatch
+16_emacs_jit_lock.dpatch

Modified: packages/python-docutils/trunk/debian/python-docutils.manpages
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/python-docutils.manpages?rev=3628&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/python-docutils.manpages (original)
+++ packages/python-docutils/trunk/debian/python-docutils.manpages Fri Nov 16 11:54:43 2007
@@ -1,1 +1,8 @@
 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

Modified: packages/python-docutils/trunk/debian/rst2html.1
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/rst2html.1?rev=3628&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/rst2html.1 (original)
+++ packages/python-docutils/trunk/debian/rst2html.1 Fri Nov 16 11:54:43 2007
@@ -1,52 +1,0 @@
-.TH RST2HTML 1
-.SH NAME
-rst2html, rst2latex etc. \- convert reST documents to various formats
-.SH SYNOPSIS
-rst2html [options] < input.txt > output.xhtml
-.br
-rst2html [options] input.txt output.xhtml
-.br
-rstpep2html [options] pep-NNNN.txt output.html
-.br
-rst2s5 [options] input.txt output.xhtml
-.br
-rst2latex [options] input.txt output.tex
-.br
-rst2newlatex [options] input.txt output.tex
-.br
-rst2xml [options] input.txt output.xml
-.br
-rst2pseudoxml [options] input.txt output.txt
-.br
-rst-buildhtml [options] [<directory> ...]
-.SH DESCRIPTION
-These programs convert reST documents to HTML, S5/HTML, LaTeX, XML or docutils'
-own "pseudo-XML" format.
-.PP
-Please use the
-.B --help
-option for a complete list of options, or see the documentation for these
-tools in
-.B /usr/share/doc/python-docutils/docs/user/tools.html
-and
-.B tools.txt
-\.
-.SH BUGS
-See <http://bugs.debian.org/python-docutils> for known bugs, or use
-.B reportbug python-docutils
-to report bugs.
-.SH AUTHOR
-David Goodger <goodger at users.sourceforge.net>
-.PP
-This manual page was written by Matthias Urlichs <smurf at debian.org>
-and Simon McVittie <smcv at ianadd.pseudorandom.co.uk> for the Debian GNU/Linux
-system.
-.SH MAINTAINERS
-Martin F. Krafft <madduck at debian.org> and
-Simon McVittie <smcv at ianadd.pseudorandom.co.uk>.
-.SH "SEE ALSO"
-The Docutils documentation <file:///usr/share/doc/python-docutils/>
-.br
-The docutils homepage <http://docutils.sourceforge.net>
-.br
-The reST standard <http://docutils.sourceforge.net/rst.html>

Modified: packages/python-docutils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/rules?rev=3628&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/rules (original)
+++ packages/python-docutils/trunk/debian/rules Fri Nov 16 11:54:43 2007
@@ -66,6 +66,12 @@
 	mv debian/tmp/usr/share/pycentral/python-docutils/site-packages/roman.py \
 		debian/tmp/usr/share/pycentral/python-roman/site-packages/roman.py
 	
+	# get rid of PEP-0263 to be nice to python2.5-minimal (#379709)
+	for f in docutils/languages/*.py; do
+	    python debian/unpep263.py < $$f \
+	    > debian/tmp/usr/share/pycentral/python-docutils/site-packages/$$f
+	done
+	
 	# share Egg dir
 	mv debian/tmp/usr/share/pycentral/$(p)/site-packages/docutils-$(DEB_UPSTREAM_VERSION)-py$(PYVER).egg-info \
 	   debian/tmp/usr/share/pycentral/$(p)/site-packages/docutils-$(DEB_UPSTREAM_VERSION).egg-info
@@ -91,6 +97,64 @@
 
 	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=. $(PYTHON) debian/tmp/usr/bin/rst2html --help | \
+	PYTHONPATH=. $(PYTHON) tools/rst2xml.py | \
+	xsltproc \
+		--stringparam name rst2html \
+		--stringparam date "`date +'%B %Y'`" \
+		--stringparam oneliner 'convert reST documents to XHTML' \
+		debian/rsthelp2man.xsl - > debian/rst2html.1
+	PYTHONPATH=. $(PYTHON) debian/tmp/usr/bin/rst2xml --help | \
+	PYTHONPATH=. $(PYTHON) tools/rst2xml.py | \
+	xsltproc \
+		--stringparam name rst2xml \
+		--stringparam date "`date +'%B %Y'`" \
+		--stringparam oneliner 'convert reST documents to XML' \
+		debian/rsthelp2man.xsl - > debian/rst2xml.1
+	PYTHONPATH=. $(PYTHON) debian/tmp/usr/bin/rst2latex --help | \
+	PYTHONPATH=. $(PYTHON) tools/rst2xml.py | \
+	xsltproc \
+		--stringparam name rst2latex \
+		--stringparam date "`date +'%B %Y'`" \
+		--stringparam oneliner 'convert reST documents to LaTeX (stable version)' \
+		debian/rsthelp2man.xsl - > debian/rst2latex.1
+	PYTHONPATH=. $(PYTHON) debian/tmp/usr/bin/rst2newlatex --help | \
+	PYTHONPATH=. $(PYTHON) tools/rst2xml.py | \
+	xsltproc \
+		--stringparam name rst2newlatex \
+		--stringparam date "`date +'%B %Y'`" \
+		--stringparam oneliner 'convert reST documents to LaTeX (experimental version)' \
+		debian/rsthelp2man.xsl - > debian/rst2newlatex.1
+	PYTHONPATH=. $(PYTHON) debian/tmp/usr/bin/rst2pseudoxml --help | \
+	PYTHONPATH=. $(PYTHON) tools/rst2xml.py | \
+	xsltproc \
+		--stringparam name rst2pseudoxml \
+		--stringparam date "`date +'%B %Y'`" \
+		--stringparam oneliner 'convert reST documents to pseudo-XML' \
+		debian/rsthelp2man.xsl - > debian/rst2pseudoxml.1
+	PYTHONPATH=. $(PYTHON) debian/tmp/usr/bin/rst2s5 --help | \
+	PYTHONPATH=. $(PYTHON) tools/rst2xml.py | \
+	xsltproc \
+		--stringparam name rst2s5 \
+		--stringparam date "`date +'%B %Y'`" \
+		--stringparam oneliner 'convert reST documents to S5 slides' \
+		debian/rsthelp2man.xsl - > debian/rst2s5.1
+	PYTHONPATH=. $(PYTHON) debian/tmp/usr/bin/rstpep2html --help | \
+	PYTHONPATH=. $(PYTHON) tools/rst2xml.py | \
+	xsltproc \
+		--stringparam name rstpep2html \
+		--stringparam date "`date +'%B %Y'`" \
+		--stringparam oneliner 'convert reST Python Enhancement Proposals to HTML' \
+		debian/rsthelp2man.xsl - > debian/rstpep2html.1
+	PYTHONPATH=. $(PYTHON) debian/tmp/usr/bin/rst-buildhtml --help | \
+	PYTHONPATH=. $(PYTHON) tools/rst2xml.py | \
+	xsltproc \
+		--stringparam name rst-buildhtml \
+		--stringparam date "`date +'%B %Y'`" \
+		--stringparam oneliner 'convert many reST documents to HTML' \
+		debian/rsthelp2man.xsl - > debian/rst-buildhtml.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