[Python-modules-commits] r1106 - in /packages/python-docutils/trunk/debian: ./ patches/

smcv-guest at users.alioth.debian.org smcv-guest at users.alioth.debian.org
Sun Jul 2 17:07:18 UTC 2006


Author: smcv-guest
Date: Sun Jul  2 17:07:14 2006
New Revision: 1106

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1106
Log:
Load newtrunk into packages/python-docutils/trunk.

Added:
    packages/python-docutils/trunk/debian/
    packages/python-docutils/trunk/debian/README.Debian
    packages/python-docutils/trunk/debian/changelog
    packages/python-docutils/trunk/debian/compat
    packages/python-docutils/trunk/debian/control
    packages/python-docutils/trunk/debian/emacs-start.el
    packages/python-docutils/trunk/debian/patches/
    packages/python-docutils/trunk/debian/patches/00list
    packages/python-docutils/trunk/debian/patches/01_upstream_04_branch_r4646.dpatch   (with props)
    packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch
    packages/python-docutils/trunk/debian/patches/11_not_usrbinenv_python.dpatch   (with props)
    packages/python-docutils/trunk/debian/patches/12_remove_unnecessary_hashbang.dpatch   (with props)
    packages/python-docutils/trunk/debian/patches/13_nodes_namespace.dpatch   (with props)
    packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch   (with props)
    packages/python-docutils/trunk/debian/patches/99_old-diffs.dpatch
    packages/python-docutils/trunk/debian/python-docutils.copyright
    packages/python-docutils/trunk/debian/python-docutils.manpages
    packages/python-docutils/trunk/debian/python-roman.copyright
    packages/python-docutils/trunk/debian/python-roman.override
    packages/python-docutils/trunk/debian/rst2html.1
    packages/python-docutils/trunk/debian/rules   (with props)

Added: packages/python-docutils/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/README.Debian?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/README.Debian (added)
+++ packages/python-docutils/trunk/debian/README.Debian Sun Jul  2 17:07:14 2006
@@ -1,0 +1,17 @@
+python-docutils for Debian
+--------------------------
+
+This is relelease 0.4 of the docutils package.
+
+
+Note that the 'correct' file extension for ReST documents is, at least
+in the opinion of the Upstream authors, 'none' or '.txt', not '.rst'.
+
+Thus, while appropriate Emacs files are installed, auto-switching to
+ReST mode is accomplished by a comment like
+
+	.. Hey emacs, switch to -*- rst-mode -*-
+
+and not by file extension. (You can enable that feature, if you want,
+in the file '/etc/emacs/site-start.d/50python-docutils.el'.)
+

Added: packages/python-docutils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/changelog?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/changelog (added)
+++ packages/python-docutils/trunk/debian/changelog Sun Jul  2 17:07:14 2006
@@ -1,0 +1,301 @@
+python-docutils (0.4-2~smcv20060702) UNRELEASED; urgency=low
+
+  * New maintainers Martin F. Krafft, Simon McVittie and the python-modules
+    team.
+    - Acknowledge Martin's NMU now he's a co-maintainer (closes: #315285).
+  * Switch to dpatch:
+    * Update from upstream Subversion repository, docutils-0.4 branch:
+      * Unquoted targets beginning with an underscore
+        (.. __target: URI) are no longer accepted
+      * tools/editors/emacs/rst.el changed license to GPL
+      * assorted documentation changes
+    * Remove patch bands consisting only of $Date$, $Revision$
+  * Migrate to new Python policy, and python-central (closes: #373529).
+  * Remove circular dependency during policy migration (closes: #362172).
+  * Install tools as e.g. /usr/bin/rst2html only - do not install any
+    executables with a .py extension, as pycentral thinks it should
+    byte-compile them. Also, Policy section 10.4.
+    - Install buildhtml as /usr/bin/rst-buildhtml to avoid namespace pollution.
+    - Don't install quicktest.py and the "dev" tools, which appear to be
+      intended for docutils developers only.
+  * Move some of the documentation from /usr/share/doc/python-docutils
+    to /u/s/d/p-d/docs, and compile all the documentation to HTML,
+    to avoid broken hyperlinks (closes: #312305).
+    - In debian/rules, tell buildhtml.py to give us the full Python
+      traceback when it fails, so FTBFSs can be diagnosed.
+  * Amend upstream documentation to reflect how this package installs things
+    (closes: #293504). debian/patches/10_doc_debian_paths.dpatch
+  * Replace all the man pages with a slightly more informative combined man
+    page which gets the names right (closes: #325300, #368601).
+  * Incorporate rst-mode again, hopefully. Thanks to Sylvain Ferriol for the
+    patch. (Closes: #353661)
+  * Move debhelper, used in debian/rules clean, from Build-Depends-Indep to
+    Build-Depends, per Policy section 7.6.
+  * Upgrade to debhelper compat level 5 and Policy 3.7.2.0.
+  * Lintian nitpicking: Remove spurious #! line from
+    docutils.readers.python.pynodes module.
+    debian/patches/12_remove_unnecessary_hashbang.dpatch
+  * Stop applying some optparse-related patches which appear to serve no
+    purpose. debian/patches/99_old-diffs.dpatch
+
+ -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Sun,  2 Jul 2006 16:25:03 +0100
+
+python-docutils (0.4-1) unstable; urgency=low
+
+  * New upstream version
+    - including changes in the current maintainance branch
+  * Drop python2.1/python2.2 binary packages
+  * debian/NEWS.Debian: Removed
+  * Drop the compatibility rest2* binary names.
+  * Thanks to Matthias Klose <doko at debian.org>
+    for help with preparing this release (and prodding me).
+
+ -- Matthias Urlichs <smurf at debian.org>  Fri,  3 Feb 2006 10:22:56 +0100
+
+python-docutils (0.3.9-0.1) unstable; urgency=low
+
+  * Non-maintainer upload (received OK from maintainer).
+  * New upstream release (closes: #315285).
+
+ -- martin f. krafft <madduck at debian.org>  Sat, 27 Aug 2005 11:03:06 +0200
+
+python-docutils (0.3.7-2) unstable; urgency=low
+
+  * Fix dependency on Python 2.3 -- still the default. :-/
+    Closes:#288873.
+
+ -- Matthias Urlichs <smurf at debian.org>  Thu,  6 Jan 2005 07:50:31 +0100
+
+python-docutils (0.3.7-1) unstable; urgency=low
+
+  * Update to latest Upstream version.
+    Thanks for the release work!
+  * Fixed tool names.
+    - Closes:#284822
+  * Don't compress the shipped HTML documentation.
+    - Browsers don't display the files if they are compressed,
+      links don't work, ...
+  * Add copyright file for the 2.4 package (doko's fault ;-)
+    - fix typos in the other docutils copyright files
+  * Add extras subdir to PYTHONPATH, in debian/rules
+  * Simplify build-dependencies.
+
+ -- Matthias Urlichs <smurf at debian.org>  Tue,  4 Jan 2005 07:58:58 +0100
+
+python-docutils (0.3.5.20041217-0ubuntu1) hoary; urgency=low
+
+  * Snapshot taken from CVS.
+  * Support python2.4 as default python version.
+
+ -- Matthias Klose <m at klose.in-berlin.de>  Fri, 17 Dec 2004 11:05:40 +0100
+
+python-docutils (0.3.5-5) unstable; urgency=medium
+
+  * Add support for Python 2.4.
+
+ -- Matthias Urlichs <smurf at debian.org>  Sun, 12 Dec 2004 20:11:24 +0100
+
+python-docutils (0.3.5-4) unstable; urgency=medium
+
+  * Also use the official tool names.
+    - Patch by Jeff Breidenbach <jbreiden at parc.com>.
+    - Closes:#284822
+
+ -- Matthias Urlichs <smurf at debian.org>  Thu,  9 Dec 2004 11:35:23 +0100
+
+python-docutils (0.3.5-3) unstable; urgency=high
+
+  * Allow setting the namespace
+    necessary for building cerebrum's documentation
+    fix from Andreas Schuldei <andreas at schuldei.org>
+
+ -- Matthias Urlichs <smurf at debian.org>  Tue, 30 Nov 2004 13:32:32 +0100
+
+python-docutils (0.3.5-2) unstable; urgency=medium
+
+  * Fix bad symlinks. Closes: #280838
+  * Change #!env python => #!python. Closes: #281175
+
+ -- Matthias Urlichs <smurf at debian.org>  Tue, 16 Nov 2004 16:31:27 +0100
+
+python-docutils (0.3.5-1) unstable; urgency=low
+
+  * New Upstream release.
+    - Many additions and some bug fixes.
+    - The documentation was rearranged.
+
+ -- Matthias Urlichs <smurf at debian.org>  Fri,  5 Nov 2004 23:20:00 +0100
+
+python-docutils (0.3.3-1) unstable; urgency=low
+
+  * New Upstream release.
+    - Closes: #249246
+  * De-right-aligned the Closes: entries in the changelog.
+
+ -- Matthias Urlichs <smurf at debian.org>  Tue, 18 May 2004 08:36:50 +0200
+
+python-docutils (0.3+cvs20040328-1) unstable; urgency=low
+
+  * New Upstream snapshot:
+    - The parsed document tree gained some arrtibutes to facilitate writing
+	  external translators. See HISTORY.txt for details.
+    - various not-so-important changes
+
+ -- Matthias Urlichs <smurf at debian.org>  Sun, 28 Mar 2004 20:47:14 +0200
+
+python-docutils (0.3+cvs20040209-1) unstable; urgency=low
+
+  * Updated Maintainer email address.
+  * New Upstream snapshot:
+    - Added FilterMessages transform
+    - Updated language mappings: eo es it.
+      (That's Esperanto, Spanish, and Italian.)
+  * removed cruft (patch applied twice) from debian/rules.
+  * Install the documentation.
+    - Closes: #228167
+  * forgot to close: #226607 in September. :-/
+
+ -- Matthias Urlichs <smurf at debian.org>  Mon,  9 Feb 2004 16:32:33 +0100
+
+python-docutils (0.3+cvs20040114-1) unstable; urgency=low
+
+  * New Upstream snapshot.
+
+ -- Matthias Urlichs <smurf at debian.org>  Thu, 15 Jan 2004 15:03:26 +0100
+
+python-docutils (0.3+cvs20031107-2) unstable; urgency=low
+
+  * Install Emacs files where Emacs can find them
+    - autoload 'rst-mode'
+    - Closes: #223315
+
+ -- Matthias Urlichs <smurf at debian.org>  Mon,  8 Dec 2003 14:37:45 +0100
+
+python-docutils (0.3+cvs20031107-1) unstable; urgency=low
+
+  * New upstream snapshot.
+    - Some LaTeX fixes.
+    - Fix: having too wide tables in sidebars.
+    - Propogate align attribute of a non-inline image
+      to the surrounding <p> tag
+
+ -- Matthias Urlichs <smurf at debian.org>  Thu,  2 Oct 2003 15:15:41 +0200
+
+python-docutils (0.3+cvs20030928-1) unstable; urgency=low
+
+  * New upstream snapshot.
+    - Path(s) to configuration file(s) can be specified 
+      with the DOCUTILSCONFIG environment variable.
+    - The LaTeX stylesheet now defaults to "no stylesheet".
+
+ -- Matthias Urlichs <smurf at debian.org>  Thu,  2 Oct 2003 15:15:41 +0200
+
+python-docutils (0.3+cvs20030901-2) unstable; urgency=low
+
+  * Fix a bad symlink.
+    - Finally closes: #204352
+
+ -- Matthias Urlichs <smurf at debian.org>  Sat, 13 Sep 2003 00:45:20 +0200
+
+python-docutils (0.3+cvs20030901-1) unstable; urgency=low
+
+  * Acknowledge NMU.
+  * New upstream snapshot.
+    - The configuration file format has changed.
+  * New maintainer's email address. ;-)
+  * Explicitly depend on Python and debhelper >= 4.1.67.
+    4.1.60 might be possible, but the work to find out exactly
+    is better spent elsewhere.
+
+ -- Matthias Urlichs <smurf at debian.org>  Thu, 11 Sep 2003 11:32:56 +0200
+
+python-docutils (0.3+cvs20030803-1.1) unstable; urgency=low
+
+  * NMU
+  * Use python2.3 as the default python version.
+    - Closes: #205739
+  * Rename python-diffutils to python2.1-diffutils, rename python-textwrap to
+    python2.1-textwrap and python2.2-textwrap.
+  * Change section to python.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 27 Aug 2003 08:31:10 +0200
+
+python-docutils (0.3+cvs20030803-1) unstable; urgency=low
+
+  * The "SourceForge needed more CVS servers" release.  :-/
+  * Update to current CVS snapshot (finally).
+  * Package python-textwrap, required for python << 2.3
+    (included upstream).
+  * Cleaned up the setup*.py scripts.
+  * Removed "extras" from setup.py;
+    the extra modules have their own setup scripts.
+  * Added a Lintian override for python-roman.copyright,
+    which mentions the GPL but isn't.
+  * Completed the transition to debhelper v4,
+    some files were stuck in debian/tmp.
+    - Closes: #204352
+  * Explicitly use Python 2.3 for installation.
+    - Closes: #198302
+  * Updated maintainer email address.
+  * Updated Standards-Version to 3.6.0 (no changes).
+
+ -- Matthias Urlichs <smurf at smurf.noris.de>  Mon,  4 Aug 2003 01:44:12 +0200
+
+python-docutils (0.2.8+cvs20030324-6) unstable; urgency=low
+
+  * difflib.py, roman.py:
+    Include a copy of the Python license
+
+ -- Matthias Urlichs <smurf at noris.de>  02 May 2003 09:01:31 +0200
+
+python-docutils (0.2.8+cvs20030324-5) unstable; urgency=low
+
+  * Fixed requirements:
+    Require optik >= 1.4
+    Require xmlbase
+    Build-Require python-dev
+
+ -- Matthias Urlichs <smurf at noris.de>  07 Apr 2003 08:36:46 +0200
+
+python-docutils (0.2.8+cvs20030324-4) unstable; urgency=low
+
+  * Ready for upload.
+    - Closes: #186658
+  * Added /usr/bin symlinks where appropriate.
+
+ -- Matthias Urlichs <smurf at noris.de>  06 Apr 2003 13:03:01 +0200
+
+python-docutils (0.2.8+cvs20030324-3) unstable; urgency=low
+
+  * debian/rules:
+    Set path to python
+    use dh_movefiles
+    skip SCCS directories when installing documentation
+
+ -- Matthias Urlichs <smurf at noris.de>  30 Mar 2003 17:56:53 +0200
+
+python-docutils (0.2.8+cvs20030324-2) unstable; urgency=low
+
+  * Use a simple text in "copyright";
+    install the original notice in "COPYING.orig.txt"
+  * debian/control:
+    depend on debhelper 4
+    update descriptions
+
+ -- Matthias Urlichs <smurf at noris.de>  30 Mar 2003 17:51:19 +0200
+
+python-docutils (0.2.8+cvs20030324-1) unstable; urgency=low
+
+  * Cleanup
+  * Split into three binary packages
+  * Prefer "optparse" to "optik"
+  * Deleted example files from debian/
+  * Changed maintainer
+
+ -- Matthias Urlichs <smurf at noris.de>  29 Mar 2003 13:07:49 +0200
+
+python-docutils (0.2cvs021013-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 12 Oct 2002 15:05:38 +0200

Added: packages/python-docutils/trunk/debian/compat
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/compat?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/compat (added)
+++ packages/python-docutils/trunk/debian/compat Sun Jul  2 17:07:14 2006
@@ -1,0 +1,1 @@
+5

Added: packages/python-docutils/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/control?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/control (added)
+++ packages/python-docutils/trunk/debian/control Sun Jul  2 17:07:14 2006
@@ -1,0 +1,40 @@
+Source: python-docutils
+Section: python
+Priority: optional
+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
+Build-Depends-Indep: python-dev, python (>= 2.3)
+Standards-Version: 3.7.2.0
+XS-Python-Version: >= 2.3
+
+Package: python-docutils
+Architecture: all
+Depends: ${python:Depends}, python-roman
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: Utilities for the documentation of Python modules
+ The purpose of the Docutils project is to create a set of tools for
+ processing plaintext documentation into useful formats, such as HTML,
+ XML, and TeX.
+ .
+ The package includes the reStructuredText parser, the Python
+ Docstring Processing System project, and documentation in HTML and
+ (gzipped) reST formats.
+
+Package: python-roman
+Architecture: all
+Depends: ${python:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: A module for generating/analyzing Roman numerals
+ This module converts from and to Roman numerals. It can convert numbers
+ from 1 to 4999 and understands the common shortcuts (IX == 9), but not
+ illegal ones (MIM == 1999).
+ .
+ This module is part of "Dive Into Python", a free Python tutorial for
+ experienced programmers.  Visit http://diveintopython.org/ for the
+ latest version.
+ .
+ It is maintained in Debian as part of the python-docutils package.
+

Added: packages/python-docutils/trunk/debian/emacs-start.el
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/emacs-start.el?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/emacs-start.el (added)
+++ packages/python-docutils/trunk/debian/emacs-start.el Sun Jul  2 17:07:14 2006
@@ -1,0 +1,10 @@
+;; autoload support for reStructuredText, from python-docutils
+(autoload 'rst-mode "rst" "mode for editing reStructuredText documents" t)
+
+;; The following lines are not enabled by default because the 'correct'
+;; extension for reStructuredText files, according to the ReST
+;; documentation, is '.txt'.  (Or nothing, for that matter.)
+;;
+;;(setq auto-mode-alist
+;;       (append '(("\\.rst$" . rst-mode)
+;;                 ("\\.rest$" . rst-mode)) auto-mode-alist))

Added: packages/python-docutils/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/00list?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/patches/00list (added)
+++ packages/python-docutils/trunk/debian/patches/00list Sun Jul  2 17:07:14 2006
@@ -1,0 +1,5 @@
+01_upstream_04_branch_r4646.dpatch
+11_not_usrbinenv_python.dpatch
+12_remove_unnecessary_hashbang.dpatch
+13_nodes_namespace.dpatch
+14_distutils_setup.dpatch

Added: packages/python-docutils/trunk/debian/patches/01_upstream_04_branch_r4646.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/01_upstream_04_branch_r4646.dpatch?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/patches/01_upstream_04_branch_r4646.dpatch (added)
+++ packages/python-docutils/trunk/debian/patches/01_upstream_04_branch_r4646.dpatch Sun Jul  2 17:07:14 2006
@@ -1,0 +1,1845 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_upstream_04_branch_r4646.dpatch by Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
+# vim:set ft=diff:
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream changes from the docutils-0.4 branch:
+## DP: <http://svn.berlios.de/svnroot/repos/docutils/branches/docutils-0.4>
+## DP: Checked out with TZ=Europe/Paris svn co ... to avoid spurious
+## DP: timestamp changes.
+
+ at DPATCH@
+
+diff -ur docutils-0.4/COPYING.txt docutils-0.4-branch/COPYING.txt
+--- docutils-0.4/COPYING.txt	2005-12-09 04:21:34.000000000 +0000
++++ docutils-0.4-branch/COPYING.txt	2006-07-02 16:10:39.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ :Author: David Goodger
+ :Contact: goodger at users.sourceforge.net
+-:Date: $Date: 2005-12-09 05:21:34 +0100 (Fri, 09 Dec 2005) $
++:Date: $Date: 2006-04-01 03:06:59 +0200 (Sat, 01 Apr 2006) $
+ :Web site: http://docutils.sourceforge.net/
+ :Copyright: This document has been placed in the public domain.
+ 
+@@ -95,27 +95,18 @@
+ 
+   __ licenses/python-2-2.txt
+ 
+-* tools/pep2html.py, copyright by the Python Software Foundation,
+-  released under the `Python 2.2 license`_ (`local copy`__).
+-
+-  __ licenses/python-2-2.txt
+-
+-* tools/editors/emacs/rst-html.el, copyright by Martin Blais, released
+-  under the `GNU General Public License`_ (`local copy`__).
+-
+-  __ licenses/gpl.txt
+-
+-* tools/editors/emacs/rst-mode.el, copyright by Stefan Merten,
+-  released under the `GNU General Public License`_ (`local copy`__).
++* tools/editors/emacs/rst.el, copyright by Martin Blais, Stefan
++  Merten, and David Goodger, released under the `GNU General Public
++  License`_ (`local copy`__).
+ 
+   __ licenses/gpl.txt
+ 
+ (Disclaimer: I am not a lawyer.)  The BSD license and the Python
+-licenses are OSI-approved_ and GPL-compatible_.  Although complicated
+-by multiple owners and lots of legalese, the Python license basically
+-lets you copy, use, modify, and redistribute files as long as you keep
+-the copyright attribution intact, note any changes you make, and don't
+-use the owner's name in vain.  The BSD license is similar.
++licenses are OSI-approved_ and GPL-compatible_.  The BSD license
++basically lets you copy, use, modify, and redistribute files as long
++as you keep the copyright attribution intact, note any changes you
++make, and don't use the owner's name in vain.  Although complicated by
++multiple owners and lots of legalese, the Python license is similar.
+ 
+ Plaintext versions of all the linked-to licenses are provided in the
+ licenses_ directory.
+diff -ur docutils-0.4/docs/dev/policies.txt docutils-0.4-branch/docs/dev/policies.txt
+--- docutils-0.4/docs/dev/policies.txt	2005-11-14 18:11:32.000000000 +0000
++++ docutils-0.4-branch/docs/dev/policies.txt	2006-07-02 16:10:32.000000000 +0100
+@@ -4,8 +4,8 @@
+ 
+ :Author: David Goodger; open to all Docutils developers
+ :Contact: goodger at python.org
+-:Date: $Date: 2005-11-14 19:11:32 +0100 (Mon, 14 Nov 2005) $
+-:Revision: $Revision: 4048 $
++:Date: $Date: 2006-04-01 03:04:58 +0200 (Sat, 01 Apr 2006) $
++:Revision: $Revision: 4470 $
+ :Copyright: This document has been placed in the public domain.
+ 
+ .. contents::
+@@ -456,11 +456,11 @@
+ distributed as part of Docutils releases.  Feel free to check in code
+ to the sandbox; that way people can try it out but you won't have to
+ worry about it working 100% error-free, as is the goal of the Docutils
+-core.  Each developer who wants to play in the sandbox should create
+-either a project-specific subdirectory or personal subdirectory
+-(suggested name: SourceForge ID, nickname, or given name + family
+-initial).  It's OK to make a mess in your personal space!  But please,
+-play nice.
++core.  A project-specific subdirectory should be created for each new
++project.  Any developer who wants to play in the sandbox may do so,
++but project directories are recommended over personal directories,
++which discourage collaboration.  It's OK to make a mess in the
++sandbox!  But please, play nice.
+ 
+ Please update the `sandbox README`_ file with links and a brief
+ description of your work.
+@@ -471,31 +471,29 @@
+ 
+     sandbox/
+         project_name/ # For a collaborative project.
+-                      # Structure as in userid/component_name below.
+-        userid/       # For personal space.
+-            component_name/ # A verbose name is best.
+-                README.txt  # Please explain the requirements,
+-                            # purpose/goals, and usage.
+-                docs/
+-                    ...
+-                component.py    # The component is a single module.
++            README.txt  # Describe the requirements, purpose/goals, usage,
++                        # and list the maintainers.
++            docs/
++                ...
++            component.py    # The component is a single module.
+                             # *OR* (but *not* both)
+-                component/  # The component is a package.
+-                    __init__.py  # Contains the Reader/Writer class.
+-                    other1.py    # Other modules and data files used
+-                    data.txt     # by this component.
+-                    ...
+-                test/       # Test suite.
+-                    ...
+-                tools/      # For front ends etc.
+-                    ...
+-                setup.py    # Use Distutils to install the component
+-                            # code and tools/ files into the right
+-                            # places in Docutils.
++            component/      # The component is a package.
++                __init__.py  # Contains the Reader/Writer class.
++                other1.py    # Other modules and data files used
++                data.txt     # by this component.
++                ...
++            test/       # Test suite.
++                ...
++            tools/      # For front ends etc.
++                ...
++            setup.py    # Use Distutils to install the component
++                        # code and tools/ files into the right
++                        # places in Docutils.
++        userid/       # For *temporary* personal space.
+ 
+-Some sandbox projects are destined to become Docutils components once
++Some sandbox projects are destined to move to the Docutils core once
+ completed.  Others, such as add-ons to Docutils or applications of
+-Docutils, graduate to become `parallel projects`_.
++Docutils, may graduate to become `parallel projects`_.
+ 
+ .. _sandbox README: http://docutils.sf.net/sandbox/README.html
+ .. _sandbox directory:
+diff -ur docutils-0.4/docs/dev/pysource.dtd docutils-0.4-branch/docs/dev/pysource.dtd
+--- docutils-0.4/docs/dev/pysource.dtd	2004-06-05 20:32:15.000000000 +0100
++++ docutils-0.4-branch/docs/dev/pysource.dtd	2006-07-02 16:10:32.000000000 +0100
+@@ -4,8 +4,8 @@
+ ======================================================================
+ :Author: David Goodger
+ :Contact: goodger at users.sourceforge.net
+-:Revision: $Revision: 2223 $
+-:Date: $Date: 2004-06-05 21:32:15 +0200 (Sat, 05 Jun 2004) $
++:Revision: $Revision: 4480 $
++:Date: $Date: 2006-04-01 03:33:44 +0200 (Sat, 01 Apr 2006) $
+ :Copyright: This DTD has been placed in the public domain.
+ :Filename: pysource.dtd
+ 
+@@ -60,6 +60,7 @@
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ 
++<!-- package's namespace == __init__.py module's namespace -->
+ <!ELEMENT package_section
+     (package, fullname?, import_list?, %structure.model;)>
+ <!ATTLIST package_section %basic.atts;>
+diff -ur docutils-0.4/docs/dev/repository.txt docutils-0.4-branch/docs/dev/repository.txt
+--- docutils-0.4/docs/dev/repository.txt	2005-11-06 16:50:19.000000000 +0000
++++ docutils-0.4-branch/docs/dev/repository.txt	2006-07-02 16:10:32.000000000 +0100
+@@ -4,8 +4,8 @@
+ 
+ :Author: Felix Wiemann
+ :Contact: Felix.Wiemann at ososo.de
+-:Revision: $Revision: 4002 $
+-:Date: $Date: 2005-11-06 17:50:19 +0100 (Sun, 06 Nov 2005) $
++:Revision: $Revision: 4609 $
++:Date: $Date: 2006-06-05 22:19:55 +0200 (Mon, 05 Jun 2006) $
+ :Copyright: This document has been placed in the public domain.
+ 
+ .. _Docutils: http://docutils.sourceforge.net/
+@@ -90,10 +90,10 @@
+         docutils
+ 
+ If you previously had an anonymous working copy and gained developer
+-access, you can switch the URL associated with your working copy by
+-typing ::
++access, you can switch the URL associated with your working copy with
++this command (executed in the root of your working copy) ::
+ 
+-    svn switch --relocate svn://svn.berlios.de/docutils/trunk/docutils \
++    svn switch --relocate svn://svn.berlios.de/docutils \
+         svn+ssh://<user>@svn.berlios.de/svnroot/repos/docutils
+ 
+ (Again, ``<user>`` is your BerliOS user account name.)
+diff -ur docutils-0.4/docs/ref/doctree.txt docutils-0.4-branch/docs/ref/doctree.txt
+--- docutils-0.4/docs/ref/doctree.txt	2005-10-28 17:12:56.000000000 +0100
++++ docutils-0.4-branch/docs/ref/doctree.txt	2006-07-02 16:10:31.000000000 +0100
+@@ -7,8 +7,8 @@
+ 
+ :Author: David Goodger
+ :Contact: goodger at users.sourceforge.net
+-:Revision: $Revision: 3963 $
+-:Date: $Date: 2005-10-28 18:12:56 +0200 (Fri, 28 Oct 2005) $
++:Revision: $Revision: 4611 $
++:Date: $Date: 2006-06-05 22:22:36 +0200 (Mon, 05 Jun 2006) $
+ :Copyright: This document has been placed in the public domain.
+ 
+ 
+@@ -4432,7 +4432,7 @@
+ 
+ `Attribute type`_: ``NMTOKENS``.  Default value: none.
+ 
+-The ``classes`` attribute is a list containing one or more names used
++The ``classes`` attribute is a list containing zero or more names used
+ to classify an element.  The purpose of the attribute is to indicate
+ an "is-a" variant relationship, to allow an extensible way of defining
+ sub-classes of existing elements.  It can be used to carry context
+diff -ur docutils-0.4/docs/ref/docutils.dtd docutils-0.4-branch/docs/ref/docutils.dtd
+--- docutils-0.4/docs/ref/docutils.dtd	2005-10-28 17:12:56.000000000 +0100
++++ docutils-0.4-branch/docs/ref/docutils.dtd	2006-07-02 16:10:31.000000000 +0100
+@@ -4,8 +4,8 @@
+ ======================================================================
+ :Author: David Goodger
+ :Contact: goodger at users.sourceforge.net
+-:Revision: $Revision: 3963 $
+-:Date: $Date: 2005-10-28 18:12:56 +0200 (Fri, 28 Oct 2005) $
++:Revision: $Revision: 4465 $
++:Date: $Date: 2006-04-01 02:46:27 +0200 (Sat, 01 Apr 2006) $
+ :Copyright: This DTD has been placed in the public domain.
+ :Filename: docutils.dtd
+ 
+@@ -549,6 +549,7 @@
+ <!-- Can also be a body element, when it contains an "image" element. -->
+ <!ELEMENT reference %text.model;>
+ <!ATTLIST reference
++    name      CDATA     #IMPLIED
+     %basic.atts;
+     %reference.atts;
+     %anonymous.att;>
+diff -ur docutils-0.4/docs/ref/rst/directives.txt docutils-0.4-branch/docs/ref/rst/directives.txt
+--- docutils-0.4/docs/ref/rst/directives.txt	2005-12-22 23:46:04.000000000 +0000
++++ docutils-0.4-branch/docs/ref/rst/directives.txt	2006-07-02 16:10:31.000000000 +0100
+@@ -3,8 +3,8 @@
+ =============================
+ :Author: David Goodger
+ :Contact: goodger at python.org
+-:Revision: $Revision: 4228 $
+-:Date: $Date: 2005-12-23 00:46:04 +0100 (Fri, 23 Dec 2005) $
++:Revision: $Revision: 4610 $
++:Date: $Date: 2006-06-05 22:21:34 +0200 (Mon, 05 Jun 2006) $
+ :Copyright: This document has been placed in the public domain.
+ 
+ .. contents::
+@@ -126,7 +126,7 @@
+ This is a generic, titled admonition.  The title may be anything the
+ author desires.
+ 
+-The author-supplied title is also used as a "class" attribute value
++The author-supplied title is also used as a "classes" attribute value
+ after being converted into a valid identifier form (down-cased;
+ non-alphanumeric characters converted to single hyphens; "admonition-"
+ prefixed).  For example, this admonition::
+@@ -138,7 +138,7 @@
+ becomes the following document tree (pseudo-XML)::
+ 
+     <document source="test data">
+-        <admonition class="admonition-and-by-the-way">
++        <admonition classes="admonition-and-by-the-way">
+             <title>
+                 And, by the way...
+             <paragraph>
+@@ -147,7 +147,7 @@
+ The following option is recognized:
+ 
+ ``class`` : text
+-    Override the computed "class" attribute value.  See the class_
++    Override the computed "classes" attribute value.  See the class_
+     directive below.
+ 
+ 
+@@ -243,7 +243,7 @@
+     reference name with underscore suffix (e.g. ``name_``).
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the image element.  See the
++    Set a "classes" attribute value on the image element.  See the
+     class_ directive below.
+ 
+ 
+@@ -317,7 +317,7 @@
+         +---------------------------+
+ 
+ ``figclass`` : text
+-    Set a "class" attribute value on the figure element.  See the
++    Set a "classes" attribute value on the figure element.  See the
+     class_ directive below.
+ 
+ ``align`` : "left", "center", or "right"
+@@ -362,7 +362,7 @@
+ The following option is recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the topic element.  See the
++    Set a "classes" attribute value on the topic element.  See the
+     class_ directive below.
+ 
+ 
+@@ -403,7 +403,7 @@
+     The sidebar's subtitle.
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the sidebar element.  See the
++    Set a "classes" attribute value on the sidebar element.  See the
+     class_ directive below.
+ 
+ 
+@@ -447,7 +447,7 @@
+ The following option is recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the line_block element.  See the
++    Set a "classes" attribute value on the line_block element.  See the
+     class_ directive below.
+ 
+ 
+@@ -488,7 +488,7 @@
+ The following option is recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the literal_block element.  See
++    Set a "classes" attribute value on the literal_block element.  See
+     the class_ directive below.
+ 
+ 
+@@ -516,7 +516,7 @@
+ The following option is recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the rubric element.  See the
++    Set a "classes" attribute value on the rubric element.  See the
+     class_ directive below.
+ 
+ 
+@@ -544,7 +544,7 @@
+ 
+ becomes this document tree fragment::
+ 
+-    <block_quote class="epigraph">
++    <block_quote classes="epigraph">
+         <paragraph>
+             No matter where you go, there you are.
+         <attribution>
+@@ -638,7 +638,7 @@
+ The following option is recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the compound element.  See the
++    Set a "classes" attribute value on the compound element.  See the
+     class_ directive below.
+ 
+ 
+@@ -655,8 +655,8 @@
+ 
+ The "container" directive surrounds its contents (arbitrary body
+ elements) with a generic block-level "container" element.  Combined
+-with the optional "class_" attribute argument(s), this is an extension
+-mechanism for users & applications.  For example::
++with the optional "classes_" attribute argument(s), this is an
++extension mechanism for users & applications.  For example::
+ 
+     .. container:: custom
+ 
+@@ -710,7 +710,7 @@
+ The following option is recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the table element.  See the
++    Set a "classes" attribute value on the table element.  See the
+     class_ directive below.
+ 
+ 
+@@ -775,7 +775,7 @@
+ The following options are recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the table element.  See the
++    Set a "classes" attribute value on the table element.  See the
+     class_ directive below.
+ 
+ ``widths`` : integer [, integer...]
+@@ -873,7 +873,7 @@
+ The following options are recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the table element.  See the
++    Set a "classes" attribute value on the table element.  See the
+     class_ directive below.
+ 
+ ``widths`` : integer [integer...]
+@@ -951,7 +951,7 @@
+     entries, the table of contents itself, or generate no backlinks.
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the topic element.  See the
++    Set a "classes" attribute value on the topic element.  See the
+     class_ directive below.
+ 
+ 
+@@ -1077,7 +1077,7 @@
+ The following option is recognized:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on all footnote_reference elements.
++    Set a "classes" attribute value on all footnote_reference elements.
+     See the class_ directive below.
+ 
+ 
+@@ -1455,6 +1455,8 @@
+     Defaults to the document's encoding (if specified).
+ 
+ 
++.. _classes:
++
+ Class
+ =====
+ 
+@@ -1466,15 +1468,15 @@
+ :Directive Content: Optional.  If present, it is interpreted as body
+                     elements.
+ 
+-The "class" directive sets the "class" attribute value on its content
++The "class" directive sets the "classes" attribute value on its content
+ or on the first immediately following non-comment element [#]_.  For
+-details of the "class" attribute, see `its entry`__ in `The Docutils
++details of the "classes" attribute, see `its entry`__ in `The Docutils
+ Document Tree`_.  The directive argument consists of one or more
+ space-separated class names, which are converted to lowercase and all
+ non-alphanumeric characters are converted to hyphens.  (For the
+ rationale, see below.)
+ 
+-__ ../doctree.html#class
++__ ../doctree.html#classes
+ 
+ Examples::
+ 
+@@ -1497,36 +1499,38 @@
+ 
+ The text above is parsed and transformed into this doctree fragment::
+ 
+-    <paragraph class="special">
++    <paragraph classes="special">
+         This is a "special" paragraph.
+-    <section class="exceptional remarkable">
++    <section classes="exceptional remarkable">
+         <title>
+             An Exceptional Section
+         <paragraph>
+             This is an ordinary paragraph.
+-        <paragraph class="multiple">
++        <paragraph classes="multiple">
+             First paragraph.
+-        <paragraph class="multiple">
++        <paragraph classes="multiple">
+             Second paragraph.
+ 
+-.. [#] To set a "class" attribute value on a block quote, the "class"
+-   directive must be followed by an empty comment::
++.. [#] To set a "classes" attribute value on a block quote, the
++   "class" directive must be followed by an empty comment::
+ 
+        .. class:: highlights
+        ..
+ 
+            Block quote text.
+ 
+-   The directive doesn't allow content, therefore an empty comment is
+-   required to terminate the directive.  Without the empty comment,
+-   the block quote text would be interpreted as the "class"
+-   directive's content, and the parser would complain.
++   An empty comment is required to terminate the directive to allow
++   the indented text to be parsed as a block quote.  Without the empty
++   comment, the indented text would be interpreted as the "class"
++   directive's content, and the classes would be applied to each
++   element (paragraphi, in this case) individually, instead of to the
++   block quote as a whole.
+ 
+-.. topic:: Rationale for Class Attribute Value Conversion
++.. topic:: Rationale for "classes" Attribute Value Conversion
+ 
+     Docutils identifiers are converted to conform to the regular
+     expression ``[a-z](-?[a-z0-9]+)*``.  For CSS compatibility,
+-    identifiers (the "class" and "id" attributes) should have no
++    identifiers (the "classes" and "id" attributes) should have no
+     underscores, colons, or periods.  Hyphens may be used.
+ 
+     - The `HTML 4.01 spec`_ defines identifiers based on SGML tokens:
+@@ -1539,7 +1543,7 @@
+     - However the `CSS1 spec`_ defines identifiers based on the "name"
+       token, a tighter interpretation ("flex" tokenizer notation
+       below; "latin1" and "escape" 8-bit characters have been replaced
+-      with entities)::
++      with XML entities)::
+ 
+           unicode     \\[0-9a-f]{1,4}
+           latin1      [&iexcl;-&yuml;]
+@@ -1548,7 +1552,7 @@
+           name        {nmchar}+
+ 
+     The CSS1 "nmchar" rule does not include underscores ("_"), colons
+-    (":"), or periods ("."), therefore "class" and "id" attributes
++    (":"), or periods ("."), therefore "classes" and "id" attributes
+     should not contain these characters.  They should be replaced with
+     hyphens ("-").  Combined with HTML's requirements (the first
+     character must be a letter; no "unicode", "latin1", or "escape"
+@@ -1586,7 +1590,7 @@
+ 
+     <paragraph>
+         An example of using
+-        <inline class="custom">
++        <inline classes="custom">
+             interpreted text
+ 
+ The role must be declared in a document before it can be used.
+@@ -1601,15 +1605,15 @@
+ The parsed result is as follows::
+ 
+     <paragraph>
+-        <emphasis class="custom">
++        <emphasis classes="custom">
+             text
+ 
+ If no base role is explicitly specified, a generic custom role is
+ automatically used.  Subsequent interpreted text will produce an
+-"inline" element with a "class" attribute, as in the first example
++"inline" element with a "classes" attribute, as in the first example
+ above.
+ 
+-With most roles, the ":class:" option can be used to set a "class"
++With most roles, the ":class:" option can be used to set a "classes"
+ attribute that is different from the role name.  For example::
+ 
+     .. role:: custom
+@@ -1620,7 +1624,7 @@
+ This is the parsed result::
+ 
+     <paragraph>
+-        <inline class="special">
++        <inline classes="special">
+             interpreted text
+ 
+ .. _role class:
+@@ -1629,9 +1633,9 @@
+ base roles:
+ 
+ ``class`` : text
+-    Set a "class" attribute value on the element produced (``inline``,
+-    or element associated with a base class) when the custom
+-    interpreted text role is used.  If no directive options are
++    Set the "classes" attribute value on the element produced
++    (``inline``, or element associated with a base class) when the
++    custom interpreted text role is used.  If no directive options are
+     specified, a "class" option with the directive argument (role
+     name) as the value is implied.  See the class_ directive above.
+ 
+diff -ur docutils-0.4/docs/user/links.txt docutils-0.4-branch/docs/user/links.txt
+--- docutils-0.4/docs/user/links.txt	2005-11-08 21:48:57.000000000 +0000
++++ docutils-0.4-branch/docs/user/links.txt	2006-07-02 16:10:37.000000000 +0100
+@@ -4,8 +4,8 @@
+ 
+ :Author: Felix Wiemann
+ :Contact: Felix.Wiemann at ososo.de
+-:Revision: $Revision: 4020 $
+-:Date: $Date: 2005-11-08 22:48:57 +0100 (Tue, 08 Nov 2005) $
++:Revision: $Revision: 4479 $
++:Date: $Date: 2006-04-01 03:32:19 +0200 (Sat, 01 Apr 2006) $
+ :Copyright: This document has been placed in the public domain.
+ 
+ .. title:: Docutils Links
+@@ -33,8 +33,16 @@
+ 
+ * For Blogs (Weblogs), please see the `FAQ entry about Blogs`_.
+ 
++* ReSTedit_ by Bill Bumgarner is a Docutils GUI for Mac OS X.
++
++* There is an `ASCII art to SVG converter`_ (aafigure), developed by
++  Chris Liechti.
++
+ * Alberto Berti is developing an `OpenDocument writer`_.
+ 
++* Jens J. Mortensen developed `LaTeX math for reST`_, which writes to
++  LaTeX or to MathML.
++
+ * xml2rst_, an XSLT stylesheet written by Stefan Merten, converts XML
+   dumps of the document tree (e.g. created with rst2xml.py) back to
+   reStructuredText.
+@@ -110,7 +118,11 @@
+ .. _Docutils: http://docutils.sourceforge.net/
+ .. _FAQ entry about Wikis: http://docutils.sf.net/FAQ.html#are-there-any-wikis-that-use-restructuredtext-syntax
+ .. _FAQ entry about Blogs: http://docutils.sf.net/FAQ.html#are-there-any-weblog-blog-projects-that-use-restructuredtext-syntax
+-.. _OpenDocument writer: http://thread.gmane.org/gmane.text.docutils.devel/3388
++.. _ReSTedit: http://www.friday.com/bbum/index.php?s=restedit
++.. _ASCII art to SVG converter: http://docutils.sf.net/sandbox/cliechti/aafigure/
++.. _OpenDocument writer: http://thread.gmane.org/gmane.text.docutils.devel/3613
++.. _LaTeX math for reST:
++   http://docutils.sourceforge.net/sandbox/jensj/latex_math/
+ .. _xml2rst: http://www.merten-home.de/FreeSoftware/xml2rst/index.html
+ .. _rst2ht: http://www.rutherfurd.net/articles/rst-ht2html.html
+ .. _ht2html: http://ht2html.sourceforge.net/
+diff -ur docutils-0.4/docs/user/rst/cheatsheet.txt docutils-0.4-branch/docs/user/rst/cheatsheet.txt
+--- docutils-0.4/docs/user/rst/cheatsheet.txt	2005-12-22 23:47:07.000000000 +0000
++++ docutils-0.4-branch/docs/user/rst/cheatsheet.txt	2006-07-02 16:10:36.000000000 +0100
+@@ -3,8 +3,8 @@
+ =====================================================
+ :Info: See <http://docutils.sf.net/rst.html> for introductory docs.
+ :Author: David Goodger <goodger at python.org>
+-:Date: $Date: 2005-12-23 00:47:07 +0100 (Fri, 23 Dec 2005) $
+-:Revision: $Revision: 4230 $
++:Date: $Date: 2006-04-01 02:51:34 +0200 (Sat, 01 Apr 2006) $
++:Revision: $Revision: 4467 $
+ :Description: This is a "docinfo block", or bibliographic field list
+ 
+ Section Structure
+@@ -56,6 +56,8 @@
+ Directive ("::")  .. image:: images/biohazard.png
+ Substitution Def  .. |substitution| replace:: like an inline directive
+ Comment           .. is anything else
++Empty Comment     (".." on a line by itself, with blank lines before & after,
++                  used to separate indentation contexts)
+ ================  ============================================================
+ 
+ Inline Markup
+diff -ur docutils-0.4/docs/user/rst/quickref.html docutils-0.4-branch/docs/user/rst/quickref.html
+--- docutils-0.4/docs/user/rst/quickref.html	2005-09-05 21:44:51.000000000 +0100
++++ docutils-0.4-branch/docs/user/rst/quickref.html	2006-07-02 16:10:36.000000000 +0100
+@@ -23,7 +23,7 @@
+     <p align="right"><em><a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html"
+     >http://docutils.sourceforge.net/docs/user/rst/quickref.html</a></em>
+     <br><em>Being a cheat-sheet for reStructuredText</em>
+-    <br><em>Updated $Date: 2005-09-05 22:44:51 +0200 (Mon, 05 Sep 2005) $</em>
++    <br><em>Updated $Date: 2006-04-01 02:54:47 +0200 (Sat, 01 Apr 2006) $</em>
+ 
+     <blockquote>
+       <p>Copyright: This document has been placed in the public domain.
+@@ -697,6 +697,9 @@
+         </blockquote>
+     </table>
+ 
++    <p>Use <a href="#comments">empty comments</a> to separate indentation
++    contexts, such as block quotes and directive contents.</p>
++
+     <h2><a href="#contents" name="doctest-blocks" class="backref"
+         >Doctest Blocks</a></h2>
+ 
+@@ -1313,14 +1316,18 @@
+ 
+     <tr valign="top">
+       <td>
+-        <samp>An&nbsp;empty&nbsp;"comment"&nbsp;does&nbsp;not</samp>
+-        <br><samp>"consume"&nbsp;following&nbsp;blocks.</samp>
++        <samp>An&nbsp;"empty&nbsp;comment"&nbsp;does&nbsp;not</samp>
++        <br><samp>consume&nbsp;following&nbsp;blocks.</samp>
++        <br><samp>(An&nbsp;empty&nbsp;comment&nbsp;is&nbsp;".."&nbsp;with</samp>
++        <br><samp>blank&nbsp;lines&nbsp;before&nbsp;and&nbsp;after.)</samp>
+         <p><samp>..</samp>
+         <p><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;So&nbsp;this&nbsp;block&nbsp;is&nbsp;not&nbsp;"lost",</samp>
+           <br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;despite&nbsp;its&nbsp;indentation.</samp>
+       <td>
+-        An empty "comment" does not
+-        "consume" following blocks.
++        An "empty comment" does not
++        consume following blocks.
++        (An empty comment is ".." with
++        blank lines before and after.)
+         <blockquote>
+           So this block is not "lost",
+           despite its indentation.
+diff -ur docutils-0.4/docs/user/rst/quickstart.txt docutils-0.4-branch/docs/user/rst/quickstart.txt
+--- docutils-0.4/docs/user/rst/quickstart.txt	2005-05-28 01:30:02.000000000 +0100
++++ docutils-0.4-branch/docs/user/rst/quickstart.txt	2006-07-02 16:10:36.000000000 +0100
+@@ -2,7 +2,7 @@
+ =========================
+ 
+ :Author: Richard Jones
+-:Version: $Revision: 3396 $
++:Version: $Revision: 4478 $
+ :Copyright: This document has been placed in the public domain.
+ 
+ .. contents::
+@@ -54,6 +54,7 @@
+ 
+ __ quickref.html#paragraphs
+ 
++
+ Text styles
+ -----------
+ 
+@@ -82,6 +83,7 @@
+ 
+ __ quickref.html#escaping
+ 
++
+ Lists
+ -----
+ 
+@@ -193,6 +195,7 @@
+     paragraphs or body elements, indented relative to the term.
+     Blank lines are not allowed between term and definition.
+ 
++
+ Preformatting (code samples)
+ ----------------------------
+ (quickref__)
+@@ -239,6 +242,7 @@
+     This is preformatted text, and the
+     last "::" paragraph is removed
+ 
++
+ Sections
+ --------
+ 
+diff -ur docutils-0.4/docs/user/slide-shows.txt docutils-0.4-branch/docs/user/slide-shows.txt
+--- docutils-0.4/docs/user/slide-shows.txt	2005-12-21 02:01:15.000000000 +0000
++++ docutils-0.4-branch/docs/user/slide-shows.txt	2006-07-02 16:10:37.000000000 +0100
+@@ -5,7 +5,7 @@
+ =================================
+ 
+ :Authors: David Goodger & Chris Liechti
+-:Date:    $Date: 2005-12-21 03:01:15 +0100 (Wed, 21 Dec 2005) $
++:Date:    $Date: 2006-06-05 22:12:37 +0200 (Mon, 05 Jun 2006) $
+ 
+ .. This document has been placed in the public domain.
+ 
+@@ -484,6 +484,7 @@
+      * http://meyerweb.com/eric/tools/s5/themes/
+      * http://mozilla.wikicities.com/wiki/Firefox_S5:Designs
+      * http://lachy.id.au/dev/mozilla/firefox/s5/
++     * http://www.openlight.com/Python-S5-Theme.tar.gz
+ 
+      S5 is becoming more popular every day.  Do a web search for "S5
+      theme" and you're bound to find plenty of choices.
+@@ -671,11 +672,12 @@
+    Start with ``pretty.css``; edit ``framing.css`` if you need to make
+    layout changes.
+ 
+-4. Run "``rst2s5.py --theme <new-theme> <doc>.txt <doc>.html``".
++4. Run "``rst2s5.py --theme-url ui/<new-theme> <doc>.txt <doc>.html``".
+ 
+    .. class:: handout
+ 
+-   Open your ``<doc>.html`` in a browser to test the new theme.
++   We use the ``--theme-url`` option to refer to the new theme.  Open
++   your ``<doc>.html`` in a browser to test the new theme.
+ 
+ 5. Rinse & repeat.
+ 
+diff -ur docutils-0.4/docutils/core.py docutils-0.4-branch/docutils/core.py
+--- docutils-0.4/docutils/core.py	2005-12-14 02:12:00.000000000 +0000
++++ docutils-0.4-branch/docutils/core.py	2006-07-02 16:10:26.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Authors: David Goodger
+ # Contact: goodger at python.org
+-# Revision: $Revision: 4208 $
+-# Date: $Date: 2005-12-14 03:12:00 +0100 (Wed, 14 Dec 2005) $
++# Revision: $Revision: 4606 $
++# Date: $Date: 2006-06-05 21:49:46 +0200 (Mon, 05 Jun 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -468,9 +468,9 @@
+                          settings_overrides=None, config_section=None,
+                          enable_exit_status=None):
+     """
+-    Set up & run a `Publisher` to render from an existing document tree data
+-    structure, for programmatic use with string I/O.  Return a pair of encoded
+-    string output and document parts.
++    Set up & run a `Publisher` to render from an existing document
++    tree data structure, for programmatic use with string I/O.  Return
++    the encoded string output.
+ 
+     Note that document.settings is overridden; if you want to use the settings
+     of the original `document`, pass settings=document.settings.
+diff -ur docutils-0.4/docutils/__init__.py docutils-0.4-branch/docutils/__init__.py
+--- docutils-0.4/docutils/__init__.py	2006-01-09 18:28:09.000000000 +0000
++++ docutils-0.4-branch/docutils/__init__.py	2006-07-02 16:10:26.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Author: David Goodger
+ # Contact: goodger at python.org
+-# Revision: $Revision: 4260 $
+-# Date: $Date: 2006-01-09 19:28:09 +0100 (Mon, 09 Jan 2006) $
++# Revision: $Revision: 4613 $
++# Date: $Date: 2006-06-05 22:25:57 +0200 (Mon, 05 Jun 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -51,14 +51,14 @@
+ 
+ __docformat__ = 'reStructuredText'
+ 
+-__version__ = '0.4'
++__version__ = '0.4.1'
+ """``major.minor.micro`` version number.  The micro number is bumped for API
+ changes, for new functionality, and for interim project releases.  The minor
+ number is bumped whenever there is a significant project release.  The major
+ number will be bumped when the project is feature-complete, and perhaps if
+ there is a major change in the design."""
+ 
+-__version_details__ = 'release'
++__version_details__ = 'repository'
+ """Extra version details (e.g. 'snapshot 2005-05-29, r3410', 'repository',
+ 'release'), modified automatically & manually."""
+ 
+@@ -153,9 +153,10 @@
+     unknown_reference_resolvers = ()
+     """List of functions to try to resolve unknown references.  Unknown
+     references have a 'refname' attribute which doesn't correspond to any
+-    target in the document.  Called when FinalCheckVisitor is unable to find a
+-    correct target.  The list should contain functions which will try to
+-    resolve unknown references, with the following signature::
++    target in the document.  Called when the transforms in
++    `docutils.tranforms.references` are unable to find a correct target.  The
++    list should contain functions which will try to resolve unknown
++    references, with the following signature::
+ 
+         def reference_resolver(node):
+             '''Returns boolean: true if resolved, false if not.'''
+diff -ur docutils-0.4/docutils/parsers/rst/__init__.py docutils-0.4-branch/docutils/parsers/rst/__init__.py
+--- docutils-0.4/docutils/parsers/rst/__init__.py	2005-06-01 14:52:43.000000000 +0100
++++ docutils-0.4-branch/docutils/parsers/rst/__init__.py	2006-07-02 16:10:21.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 3416 $
+-# Date: $Date: 2005-06-01 15:52:43 +0200 (Wed, 01 Jun 2005) $
++# Revision: $Revision: 4490 $
++# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+diff -ur docutils-0.4/docutils/parsers/rst/states.py docutils-0.4-branch/docutils/parsers/rst/states.py
+--- docutils-0.4/docutils/parsers/rst/states.py	2006-01-09 03:29:23.000000000 +0000
++++ docutils-0.4-branch/docutils/parsers/rst/states.py	2006-07-02 16:10:21.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 4258 $
+-# Date: $Date: 2006-01-09 04:29:23 +0100 (Mon, 09 Jan 2006) $
++# Revision: $Revision: 4318 $
++# Date: $Date: 2006-01-22 23:53:32 +0100 (Sun, 22 Jan 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -1720,6 +1720,7 @@
+                             (
+                               _               # anonymous target
+                             |               # *OR*
++                              (?!_)           # no underscore at the beginning
+                               (?P<quote>`?)   # optional open quote
+                               (?![ `])        # first char. not space or
+                                               # backquote
+diff -ur docutils-0.4/docutils/transforms/peps.py docutils-0.4-branch/docutils/transforms/peps.py
+--- docutils-0.4/docutils/transforms/peps.py	2005-09-26 19:17:31.000000000 +0100
++++ docutils-0.4-branch/docutils/transforms/peps.py	2006-07-02 16:10:26.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 3909 $
+-# Date: $Date: 2005-09-26 20:17:31 +0200 (Mon, 26 Sep 2005) $
++# Revision: $Revision: 4490 $
++# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+diff -ur docutils-0.4/docutils/utils.py docutils-0.4-branch/docutils/utils.py
+--- docutils-0.4/docutils/utils.py	2005-12-07 23:46:30.000000000 +0000
++++ docutils-0.4-branch/docutils/utils.py	2006-07-02 16:10:26.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 4152 $
+-# Date: $Date: 2005-12-08 00:46:30 +0100 (Thu, 08 Dec 2005) $
++# Revision: $Revision: 4605 $
++# Date: $Date: 2006-06-05 21:41:45 +0200 (Mon, 05 Jun 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -382,7 +382,7 @@
+     Return a new empty document object.
+ 
+     :Parameters:
+-        `source` : string
++        `source_path` : string
+             The path to or description of the source text of the document.
+         `settings` : optparse.Values object
+             Runtime settings.  If none provided, a default set will be used.
+diff -ur docutils-0.4/docutils/writers/latex2e/__init__.py docutils-0.4-branch/docutils/writers/latex2e/__init__.py
+--- docutils-0.4/docutils/writers/latex2e/__init__.py	2006-01-05 23:28:53.000000000 +0000
++++ docutils-0.4-branch/docutils/writers/latex2e/__init__.py	2006-07-02 16:10:22.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Author: Engelbert Gruber
+ # Contact: grubert at users.sourceforge.net
+-# Revision: $Revision: 4242 $
+-# Date: $Date: 2006-01-06 00:28:53 +0100 (Fri, 06 Jan 2006) $
++# Revision: $Revision: 4614 $
++# Date: $Date: 2006-06-05 22:33:33 +0200 (Mon, 05 Jun 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -694,18 +694,20 @@
+         # mbox_newline: to tell encode to add mbox and newline.
+         self.mbox_newline = 0
+ 
+-        # enumeration is done by list environment.
+-        self._enum_cnt = 0
+-
+         # Stack of section counters so that we don't have to use_latex_toc.
+         # This will grow and shrink as processing occurs.
+         # Initialized for potential first-level sections.
+         self._section_number = [0]
+ 
+         # The current stack of enumerations so that we can expand
+-        # them into a compound enumeration
++        # them into a compound enumeration.  
+         self._enumeration_counters = []
+ 
++        # The maximum number of enumeration counters we've used.
++        # If we go beyond this number, we need to create a new
++        # counter; otherwise, just reuse an old one.
++        self._max_enumeration_counters = 0
++
+         self._bibitems = []
+ 
+         # docinfo.
+@@ -1283,8 +1285,6 @@
+         # We create our own enumeration list environment.
+         # This allows to set the style and starting value
+         # and unlimited nesting.
+-        self._enum_cnt += 1
+-
+         enum_style = {'arabic':'arabic',
+                 'loweralpha':'alph',
+                 'upperalpha':'Alph',
+@@ -1303,16 +1303,24 @@
+                     pref += '%d.' % self._section_number[i]
+                 pref = pref[:-1] + self.section_enumerator_separator
+                 enum_prefix += pref
+-            for counter in self._enumeration_counters:
+-                enum_prefix += counter + '.'
++            for ctype, cname in self._enumeration_counters:
++                enum_prefix += '\\%s{%s}.' % (ctype, cname)
+         enum_type = "arabic"
+         if node.has_key('enumtype'):
+             enum_type = node['enumtype']
+         if enum_style.has_key(enum_type):
+             enum_type = enum_style[enum_type]
+-        counter_name = "listcnt%d" % self._enum_cnt;
+-        self._enumeration_counters.append("\\%s{%s}" % (enum_type,counter_name))
+-        self.body.append('\\newcounter{%s}\n' % counter_name)
++
++        counter_name = "listcnt%d" % len(self._enumeration_counters)
++        self._enumeration_counters.append((enum_type, counter_name))
++        # If we haven't used this counter name before, then create a
++        # new counter; otherwise, reset & reuse the old counter.
++        if len(self._enumeration_counters) > self._max_enumeration_counters:
++            self._max_enumeration_counters = len(self._enumeration_counters)
++            self.body.append('\\newcounter{%s}\n' % counter_name)
++        else:
++            self.body.append('\\setcounter{%s}{0}\n' % counter_name)
++            
+         self.body.append('\\begin{list}{%s\\%s{%s}%s}\n' % \
+             (enum_prefix,enum_type,counter_name,enum_suffix))
+         self.body.append('{\n')
+@@ -1382,7 +1390,8 @@
+             self.body.append(':]')
+ 
+     def visit_figure(self, node):
+-        if not node.attributes.has_key('align'):
++        if (not node.attributes.has_key('align') or
++            node.attributes['align'] == 'center'):
+             align = 'center'
+         else:
+             align = 'flush'+node.attributes['align']
+diff -ur docutils-0.4/docutils/writers/pep_html/__init__.py docutils-0.4-branch/docutils/writers/pep_html/__init__.py
+--- docutils-0.4/docutils/writers/pep_html/__init__.py	2005-12-09 04:21:34.000000000 +0000
++++ docutils-0.4-branch/docutils/writers/pep_html/__init__.py	2006-07-02 16:10:22.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 4163 $
+-# Date: $Date: 2005-12-09 05:21:34 +0100 (Fri, 09 Dec 2005) $
++# Revision: $Revision: 4490 $
++# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+diff -ur docutils-0.4/FAQ.txt docutils-0.4-branch/FAQ.txt
+--- docutils-0.4/FAQ.txt	2005-12-09 04:21:34.000000000 +0000
++++ docutils-0.4-branch/FAQ.txt	2006-07-02 16:10:39.000000000 +0100
+@@ -4,8 +4,8 @@
+  Docutils FAQ (Frequently Asked Questions)
+ ===========================================
+ 
+-:Date: $Date: 2005-12-09 05:21:34 +0100 (Fri, 09 Dec 2005) $
+-:Revision: $Revision: 4163 $
++:Date: $Date: 2006-06-05 22:16:34 +0200 (Mon, 05 Jun 2006) $
++:Revision: $Revision: 4608 $
+ :Web site: http://docutils.sourceforge.net/
+ :Copyright: This document has been placed in the public domain.
+ 
+@@ -35,6 +35,15 @@
+ `PEPs (Python Enhancement Proposals)`_ (implemented), and others as
+ discovered.
+ 
++The Docutils distribution consists of:
++
++* a library (the "docutils" package), which `can be used by client
++  code`_;
++* several `front-end tools`_ (such as ``rst2html.py``, which converts
++  reStructuredText input into HTML output);
++* a `test suite`_; and
++* extensive documentation_.
++
+ For an overview of the Docutils project implementation, see `PEP
+ 258`_, "Docutils Design Specification".
+ 
+@@ -43,6 +52,11 @@
+ .. _Docutils: http://docutils.sourceforge.net/
+ .. _PEPs (Python Enhancement Proposals):
+    http://www.python.org/peps/pep-0012.html
++.. _can be used by client code:
++   http://docutils.sourceforge.net/docs/api/publisher.html
++.. _front-end tools: http://docutils.sourceforge.net/docs/user/tools.html
++.. _test suite: http://docutils.sourceforge.net/docs/dev/testing.html
++.. _documentation: http://docutils.sourceforge.net/docs/
+ .. _PEP 258: http://www.python.org/peps/pep-0258.html
+ .. _Python: http://www.python.org/
+ 
+@@ -72,7 +86,8 @@
+ Introduction to reStructuredText`_.
+ 
+ Please note that the name is "Docutils", not "DocUtils" or "Doc-Utils"
+-or any other variation.
++or any other variation.  It is pronounced as in "DOCumentation
++UTILitieS", with emphasis on the first syllable.
+ 
+ .. _An Introduction to reStructuredText:
+    http://docutils.sourceforge.net/docs/ref/rst/introduction.html
+@@ -416,7 +431,7 @@
+ 
+ * `Firedrop <http://www.voidspace.org.uk/python/firedrop2/>`__
+ * `Python Desktop Server <http://pyds.muensterland.org/>`__
+-* `PyBloxsom <http://roughingit.subtlehints.net/pyblosxom/>`__
++* `PyBloxsom <http://pyblosxom.sourceforge.net/>`__
+ * `Lino WebMan <http://lino.sourceforge.net/webman.html>`__
+ 
+ Please `let us know`_ of any other reStructuredText Blogs.
+@@ -923,8 +938,10 @@
+ recognizing that.  You can either try to fix your browser (enable
+ "UTF-8 character set", sometimes called "Unicode"), or choose a
+ different encoding for the HTML output.  You can also try
+-``--output-encoding=ascii:xmlcharrefreplace`` for HTML (not applicable
+-to non-XMLish outputs).
++``--output-encoding=ascii:xmlcharrefreplace`` for HTML or XML, but not
++applicable to non-XMLish outputs (if using runtime
++settings/configuration files, use ``output_encoding=ascii`` and
++``output_encoding_error_handler=xmlcharrefreplace``).
+ 
+ If you're generating document fragments, the "Content-Type" metadata
+ (between the HTML ``<head>`` and ``</head>`` tags) must agree with the
+diff -ur docutils-0.4/HISTORY.txt docutils-0.4-branch/HISTORY.txt
+--- docutils-0.4/HISTORY.txt	2006-01-09 19:54:47.000000000 +0000
++++ docutils-0.4-branch/HISTORY.txt	2006-07-02 16:10:39.000000000 +0100
+@@ -4,14 +4,27 @@
+ 
+ :Author: David Goodger; open to all Docutils developers
+ :Contact: goodger at python.org
+-:Date: $Date: 2006-01-09 20:54:47 +0100 (Mon, 09 Jan 2006) $
+-:Revision: $Revision: 4262 $
++:Date: $Date: 2006-06-05 02:34:01 +0200 (Mon, 05 Jun 2006) $
++:Revision: $Revision: 4598 $
+ :Web site: http://docutils.sourceforge.net/
+ :Copyright: This document has been placed in the public domain.
+ 
+ .. contents::
+ 
+ 
++Changes Since 0.4
++=================
++
++* docutils/parsers/rst/states.py:
++
++  - Unquoted targets beginning with an underscore (``.. __target:
++    URI``) are no longer accepted.
++
++* tools/editors/emacs/rst.el:
++
++  - Changed license to "GPL".
++
++
+ Release 0.4 (2006-01-09)
+ ========================
+ 
+diff -ur docutils-0.4/RELEASE-NOTES.txt docutils-0.4-branch/RELEASE-NOTES.txt
+--- docutils-0.4/RELEASE-NOTES.txt	2006-01-09 19:26:08.000000000 +0000
++++ docutils-0.4-branch/RELEASE-NOTES.txt	2006-07-02 16:10:39.000000000 +0100
+@@ -4,8 +4,8 @@
+ 
+ :Author: Felix Wiemann
+ :Contact: Felix.Wiemann at ososo.de
+-:Date: $Date: 2006-01-09 20:26:08 +0100 (Mon, 09 Jan 2006) $
+-:Revision: $Revision: 4261 $
++:Date: $Date: 2006-01-09 23:05:13 +0100 (Mon, 09 Jan 2006) $
++:Revision: $Revision: 4278 $
+ :Web site: http://docutils.sourceforge.net/
+ :Copyright: This document has been placed in the public domain.
+ 
+@@ -18,6 +18,10 @@
+ .. contents::
+ 
+ 
++Changes Since 0.4
++=================
++
++
+ Release 0.4 (2006-01-09)
+ ========================
+ 
+diff -ur docutils-0.4/setup.py docutils-0.4-branch/setup.py
+--- docutils-0.4/setup.py	2006-01-09 18:28:09.000000000 +0000
++++ docutils-0.4-branch/setup.py	2006-07-02 16:10:39.000000000 +0100
+@@ -1,12 +1,19 @@
+ #!/usr/bin/env python
+-# $Id: setup.py 4260 2006-01-09 18:28:09Z fwiemann $
++# $Id: setup.py 4462 2006-04-01 00:29:53Z fwiemann $
+ # Copyright: This file has been placed in the public domain.
+ 
+ import sys
+ import os
+ import glob
+-from distutils.core import setup
+-from distutils.command.build_py import build_py
++try:
++    from distutils.core import setup
++    from distutils.command.build_py import build_py
++except ImportError:
++    print 'Error: The "distutils" standard module, which is required for the '
++    print 'installation of Docutils, could not be found.  You may need to '
++    print 'install a package called "python-devel" (or similar) on your '
++    print 'system using your package manager.'
++    sys.exit(1)
+ 
+ # From <http://groups.google.de/groups?as_umsgid=f70e3538.0404141327.6cea58ca@posting.google.com>.
+ from distutils.command.install import INSTALL_SCHEMES
+@@ -41,7 +48,7 @@
+ input Docutils supports reStructuredText, an easy-to-read,
+ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60
+     'url': 'http://docutils.sourceforge.net/',
+-    'version': '0.4',
++    'version': '0.4.1',
+     'author': 'David Goodger',
+     'author_email': 'goodger at users.sourceforge.net',
+     'license': 'public domain, Python, BSD, GPL (see COPYING.txt)',
+Only in docutils-0.4-branch: .svn
+Only in docutils-0.4-branch/test/data: .svn
+diff -ur docutils-0.4/test/functional/expected/compact_lists.html docutils-0.4-branch/test/functional/expected/compact_lists.html
+--- docutils-0.4/test/functional/expected/compact_lists.html	2006-01-07 17:05:13.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/compact_lists.html	2006-07-02 16:10:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
++<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+ <title></title>
+ <link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
+ </head>
+diff -ur docutils-0.4/test/functional/expected/dangerous.html docutils-0.4-branch/test/functional/expected/dangerous.html
+--- docutils-0.4/test/functional/expected/dangerous.html	2006-01-07 17:05:13.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/dangerous.html	2006-07-02 16:10:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
++<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+ <title></title>
+ <link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
+ </head>
+diff -ur docutils-0.4/test/functional/expected/field_name_limit.html docutils-0.4-branch/test/functional/expected/field_name_limit.html
+--- docutils-0.4/test/functional/expected/field_name_limit.html	2006-01-07 17:05:13.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/field_name_limit.html	2006-07-02 16:10:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
++<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+ <title></title>
+ <link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
+ </head>
+diff -ur docutils-0.4/test/functional/expected/misc_rst_html4css1.html docutils-0.4-branch/test/functional/expected/misc_rst_html4css1.html
+--- docutils-0.4/test/functional/expected/misc_rst_html4css1.html	2006-01-07 17:05:13.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/misc_rst_html4css1.html	2006-07-02 16:10:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
++<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+ <title></title>
+ <link rel="stylesheet" href="foo&amp;bar.css" type="text/css" />
+ </head>
+diff -ur docutils-0.4/test/functional/expected/pep_html.html docutils-0.4-branch/test/functional/expected/pep_html.html
+--- docutils-0.4/test/functional/expected/pep_html.html	2006-01-07 17:05:13.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/pep_html.html	2006-07-02 16:10:14.000000000 +0100
+@@ -8,7 +8,7 @@
+ -->
+ <head>
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-  <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
++  <meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+   <title>PEP 100 -- Test PEP</title>
+   <link rel="stylesheet" href="../../../docutils/writers/pep_html/pep.css" type="text/css" />
+ </head>
+diff -ur docutils-0.4/test/functional/expected/standalone_rst_html4css1.html docutils-0.4-branch/test/functional/expected/standalone_rst_html4css1.html
+--- docutils-0.4/test/functional/expected/standalone_rst_html4css1.html	2006-01-07 17:05:13.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/standalone_rst_html4css1.html	2006-07-02 16:10:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
++<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+ <title>reStructuredText Test Document</title>
+ <meta name="author" content="David Goodger" />
+ <meta name="authors" content="Me  Myself  I" />
+diff -ur docutils-0.4/test/functional/expected/standalone_rst_latex.tex docutils-0.4-branch/test/functional/expected/standalone_rst_latex.tex
+--- docutils-0.4/test/functional/expected/standalone_rst_latex.tex	2005-11-20 19:54:07.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/standalone_rst_latex.tex	2006-07-02 16:10:14.000000000 +0100
+@@ -382,42 +382,42 @@
+ \hypertarget{enumerated-lists}{}
+ \pdfbookmark[1]{2.3~~~Enumerated Lists}{enumerated-lists}
+ \subsection*{2.3~~~Enumerated Lists}
+-\newcounter{listcnt1}
+-\begin{list}{\arabic{listcnt1}.}
++\newcounter{listcnt0}
++\begin{list}{\arabic{listcnt0}.}
+ {
+-\usecounter{listcnt1}
++\usecounter{listcnt0}
+ \setlength{\rightmargin}{\leftmargin}
+ }
+ \item {} 
+ Arabic numerals.
+-\newcounter{listcnt2}
+-\begin{list}{\alph{listcnt2})}
++\newcounter{listcnt1}
++\begin{list}{\alph{listcnt1})}
+ {
+-\usecounter{listcnt2}
++\usecounter{listcnt1}
+ \setlength{\rightmargin}{\leftmargin}
+ }
+ \item {} 
+ lower alpha)
+-\newcounter{listcnt3}
+-\begin{list}{(\roman{listcnt3})}
++\newcounter{listcnt2}
++\begin{list}{(\roman{listcnt2})}
+ {
+-\usecounter{listcnt3}
++\usecounter{listcnt2}
+ \setlength{\rightmargin}{\leftmargin}
+ }
+ \item {} 
+ (lower roman)
+-\newcounter{listcnt4}
+-\begin{list}{\Alph{listcnt4}.}
++\newcounter{listcnt3}
++\begin{list}{\Alph{listcnt3}.}
+ {
+-\usecounter{listcnt4}
++\usecounter{listcnt3}
+ \setlength{\rightmargin}{\leftmargin}
+ }
+ \item {} 
+ upper alpha.
+-\newcounter{listcnt5}
+-\begin{list}{\Roman{listcnt5})}
++\newcounter{listcnt4}
++\begin{list}{\Roman{listcnt4})}
+ {
+-\usecounter{listcnt5}
++\usecounter{listcnt4}
+ \setlength{\rightmargin}{\leftmargin}
+ }
+ \item {} 
+@@ -433,11 +433,11 @@
+ 
+ \item {} 
+ Lists that don't start at 1:
+-\newcounter{listcnt6}
+-\begin{list}{\arabic{listcnt6}.}
++\setcounter{listcnt1}{0}
++\begin{list}{\arabic{listcnt1}.}
+ {
+-\usecounter{listcnt6}
+-\addtocounter{listcnt6}{2}
++\usecounter{listcnt1}
++\addtocounter{listcnt1}{2}
+ \setlength{\rightmargin}{\leftmargin}
+ }
+ \item {} 
+@@ -447,11 +447,11 @@
+ Four
+ 
+ \end{list}
+-\newcounter{listcnt7}
+-\begin{list}{\Alph{listcnt7}.}
++\setcounter{listcnt1}{0}
++\begin{list}{\Alph{listcnt1}.}
+ {
+-\usecounter{listcnt7}
+-\addtocounter{listcnt7}{2}
++\usecounter{listcnt1}
++\addtocounter{listcnt1}{2}
+ \setlength{\rightmargin}{\leftmargin}
+ }
+ \item {} 
+@@ -461,11 +461,11 @@
+ D
+ 
+ \end{list}
+-\newcounter{listcnt8}
+-\begin{list}{\roman{listcnt8}.}
++\setcounter{listcnt1}{0}
++\begin{list}{\roman{listcnt1}.}
+ {
+-\usecounter{listcnt8}
+-\addtocounter{listcnt8}{2}
++\usecounter{listcnt1}
++\addtocounter{listcnt1}{2}
+ \setlength{\rightmargin}{\leftmargin}
+ }
+ \item {} 
+@@ -925,14 +925,14 @@
+ This paragraph might flow around the figure...
+ 
+ A centered figure:
+-\begin{figure}[htbp]\begin{flushcenter}
++\begin{figure}[htbp]\begin{center}
+ 
+ \includegraphics[width=50]{../../../docs/user/rst/images/biohazard.png}
+ \caption{This is the caption.}{\small 
+ This is the legend.
+ 
+ The legend may consist of several paragraphs.
+-}\end{flushcenter}\end{figure}
++}\end{center}\end{figure}
+ 
+ This paragraph might flow around the figure...
+ 
+diff -ur docutils-0.4/test/functional/expected/standalone_rst_s5_html_1.html docutils-0.4-branch/test/functional/expected/standalone_rst_s5_html_1.html
+--- docutils-0.4/test/functional/expected/standalone_rst_s5_html_1.html	2006-01-07 17:05:13.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/standalone_rst_s5_html_1.html	2006-07-02 16:10:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
++<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+ <meta name="version" content="S5 1.1" />
+ <title>Slide Shows</title>
+ <meta name="author" content="David Goodger" />
+diff -ur docutils-0.4/test/functional/expected/standalone_rst_s5_html_2.html docutils-0.4-branch/test/functional/expected/standalone_rst_s5_html_2.html
+--- docutils-0.4/test/functional/expected/standalone_rst_s5_html_2.html	2006-01-07 17:05:13.000000000 +0000
++++ docutils-0.4-branch/test/functional/expected/standalone_rst_s5_html_2.html	2006-07-02 16:10:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
++<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+ <meta name="version" content="S5 1.1" />
+ <title>Slide Shows</title>
+ <meta name="author" content="David Goodger" />
+diff -ur docutils-0.4/test/test_dependencies.py docutils-0.4-branch/test/test_dependencies.py
+--- docutils-0.4/test/test_dependencies.py	2005-12-03 02:13:12.000000000 +0000
++++ docutils-0.4-branch/test/test_dependencies.py	2006-07-02 16:10:18.000000000 +0100
+@@ -2,8 +2,8 @@
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+-# Revision: $Revision: 4132 $
+-# Date: $Date: 2005-12-03 03:13:12 +0100 (Sat, 03 Dec 2005) $
++# Revision: $Revision: 4617 $
++# Date: $Date: 2006-06-05 22:46:27 +0200 (Mon, 05 Jun 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -20,13 +20,13 @@
+ 
+ class RecordDependenciesTests(unittest.TestCase):
+ 
+-    def setUp(self):
+-        os.chdir(os.path.join(DocutilsTestSupport.testroot, 'data'))
+-
+-    def get_record(self, inputfile=None, **settings):
++    # docutils.utils.DependencyList records relative URLs, not platform paths,
++    # so use "/" as a path separator even on Windows (not os.path.join).
+ 
++    def get_record(self, **settings):
+         recordfile = 'record.txt'
+-        settings.setdefault('source_path', 'dependencies.txt')
++        settings.setdefault('source_path',
++                            os.path.join('data', 'dependencies.txt'))
+         settings.setdefault('settings_overrides', {})
+         settings['settings_overrides'] = settings['settings_overrides'].copy()
+         settings['settings_overrides']['_disable_config'] = 1
+@@ -40,18 +40,20 @@
+ 
+     def test_dependencies(self):
+         self.assertEqual(self.get_record(),
+-                         ['include.txt',
+-                          'raw.txt'])
++                         ['data/include.txt', 'data/raw.txt'])
+         self.assertEqual(self.get_record(writer_name='latex'),
+-                         ['include.txt',
+-                          'raw.txt',
++                         ['data/include.txt',
++                          'data/raw.txt',
++                          # this is a URL, not a path:
+                           'some_image.png'])
+ 
+     def test_csv_dependencies(self):
+         try:
+             import csv
+-            self.assertEqual(self.get_record(source_path='csv_dep.txt'),
+-                             ['csv_data.txt'])
++            self.assertEqual(
++                self.get_record(source_path=os.path.join('data',
++                                                         'csv_dep.txt')),
++                ['data/csv_data.txt'])
+         except ImportError:
+             pass
+ 
+@@ -60,18 +62,16 @@
+         s = {'settings_overrides': {}}
+         so = s['settings_overrides']
+         so['embed_stylesheet'] = 0
+-        so['stylesheet_path'] = 'stylesheet.txt'
++        so['stylesheet_path'] = os.path.join('data', 'stylesheet.txt')
+         so['stylesheet'] = None
+         s['writer_name'] = 'html'
+-        self.assert_('stylesheet.txt' not in
++        self.assert_(os.path.join('data', 'stylesheet.txt') not in
+                      self.get_record(**s))
+         so['embed_stylesheet'] = 1
+-        self.assert_('stylesheet.txt' in
+-                     self.get_record(**s))
++        self.assert_('data/stylesheet.txt' in self.get_record(**s))
+         del so['embed_stylesheet']
+         s['writer_name'] = 'latex'
+-        self.assert_('stylesheet.txt' in
+-                     self.get_record(**s))
++        self.assert_('data/stylesheet.txt' in self.get_record(**s))
+ 
+ 
+ if __name__ == '__main__':
+diff -ur docutils-0.4/test/test_parsers/test_rst/test_directives/test_tables.py docutils-0.4-branch/test/test_parsers/test_rst/test_directives/test_tables.py
+--- docutils-0.4/test/test_parsers/test_rst/test_directives/test_tables.py	2005-04-05 03:55:06.000000000 +0100
++++ docutils-0.4-branch/test/test_parsers/test_rst/test_directives/test_tables.py	2006-07-02 16:10:17.000000000 +0100
+@@ -2,8 +2,8 @@
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+-# Revision: $Revision: 3165 $
+-# Date: $Date: 2005-04-05 04:55:06 +0200 (Tue, 05 Apr 2005) $
++# Revision: $Revision: 4484 $
++# Date: $Date: 2006-04-01 03:47:31 +0200 (Sat, 01 Apr 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -29,6 +29,13 @@
+ utf_16_csv_rel = DocutilsTestSupport.utils.relative_path(None, utf_16_csv)
+ empty_txt = os.path.join(mydir, 'empty.txt')
+ 
++unichr_exception = DocutilsTestSupport.exception_data(
++    'unichr(int("9999999999999", 16))')[0]
++if isinstance(unichr_exception, OverflowError):
++    unichr_exception_string = 'code too large (%s)' % unichr_exception
++else:
++    unichr_exception_string = str(unichr_exception)
++
+ totest = {}
+ 
+ totest['table'] = [
+@@ -678,11 +685,11 @@
+         <paragraph>
+             Error in "csv-table" directive:
+             invalid option value: (option: "delim"; value: 'U+9999999999999')
+-            code too large (long int too large to convert to int).
++            %s.
+         <literal_block xml:space="preserve">
+             .. csv-table:: bad delimiter
+                :delim: U+9999999999999
+-"""],
++""" % unichr_exception_string],
+ ["""\
+ .. csv-table:: bad CSV data
+ 
+diff -ur docutils-0.4/test/test_parsers/test_rst/test_directives/test_unicode.py docutils-0.4-branch/test/test_parsers/test_rst/test_directives/test_unicode.py
+--- docutils-0.4/test/test_parsers/test_rst/test_directives/test_unicode.py	2005-10-02 02:06:42.000000000 +0100
++++ docutils-0.4-branch/test/test_parsers/test_rst/test_directives/test_unicode.py	2006-07-02 16:10:17.000000000 +0100
+@@ -2,8 +2,8 @@
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 3915 $
+-# Date: $Date: 2005-10-02 03:06:42 +0200 (Sun, 02 Oct 2005) $
++# Revision: $Revision: 4483 $
++# Date: $Date: 2006-04-01 03:42:07 +0200 (Sat, 01 Apr 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -18,6 +18,13 @@
+     s.generateTests(totest)
+     return s
+ 
++unichr_exception = DocutilsTestSupport.exception_data(
++    'unichr(int("111111111111111111", 16))')[0]
++if isinstance(unichr_exception, OverflowError):
++    unichr_exception_string = 'code too large (%s)' % unichr_exception
++else:
++    unichr_exception_string = str(unichr_exception)
++
+ totest = {}
+ 
+ totest['unicode'] = [
+@@ -157,12 +164,7 @@
+             Substitution definition "too big for unicode" empty or invalid.
+         <literal_block xml:space="preserve">
+             .. |too big for unicode| unicode:: 0x11111111
+-""" % ([DocutilsTestSupport.exception_data(
+-            'unichr(int("111111111111111111", 16))')[0],
+-        'code too large (%s)' % DocutilsTestSupport.exception_data(
+-    'unichr(int("111111111111111111", 16))')[0]]
+-       [isinstance(DocutilsTestSupport.exception_data(
+-    'unichr(int("111111111111111111", 16))')[0], OverflowError)],
++""" % (unichr_exception_string,
+        DocutilsTestSupport.exception_data('unichr(int("11111111", 16))')[2])]
+ ]
+ 
+diff -ur docutils-0.4/test/test_parsers/test_rst/test_interpreted.py docutils-0.4-branch/test/test_parsers/test_rst/test_interpreted.py
+--- docutils-0.4/test/test_parsers/test_rst/test_interpreted.py	2005-03-26 16:21:28.000000000 +0000
++++ docutils-0.4-branch/test/test_parsers/test_rst/test_interpreted.py	2006-07-02 16:10:18.000000000 +0100
+@@ -2,8 +2,8 @@
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 3129 $
+-# Date: $Date: 2005-03-26 17:21:28 +0100 (Sat, 26 Mar 2005) $
++# Revision: $Revision: 4490 $
++# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+diff -ur docutils-0.4/test/test_parsers/test_rst/test_targets.py docutils-0.4-branch/test/test_parsers/test_rst/test_targets.py
+--- docutils-0.4/test/test_parsers/test_rst/test_targets.py	2005-10-02 02:06:42.000000000 +0100
++++ docutils-0.4-branch/test/test_parsers/test_rst/test_targets.py	2006-07-02 16:10:18.000000000 +0100
+@@ -2,8 +2,8 @@
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 3915 $
+-# Date: $Date: 2005-10-02 03:06:42 +0200 (Sun, 02 Oct 2005) $
++# Revision: $Revision: 4318 $
++# Date: $Date: 2006-01-22 23:53:32 +0100 (Sun, 22 Jan 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -90,6 +90,23 @@
+     <target ids="a-target-name-including-a-colon-escaped" names="a\ target\ name:\ including\ a\ colon\ (escaped)">
+ """],
+ ["""\
++.. _`target: No matching backquote.
++.. _`: No matching backquote either.
++""",
++"""\
++<document source="test data">
++    <comment xml:space="preserve">
++        _`target: No matching backquote.
++    <system_message level="2" line="1" source="test data" type="WARNING">
++        <paragraph>
++            malformed hyperlink target.
++    <comment xml:space="preserve">
++        _`: No matching backquote either.
++    <system_message level="2" line="2" source="test data" type="WARNING">
++        <paragraph>
++            malformed hyperlink target.
++"""],
++["""\
+ .. _a very long target name,
+    split across lines:
+ .. _`and another,
+@@ -123,6 +140,28 @@
+     <target ids="multi-line-email" names="multi-line\ email" refuri="mailto:jdoe at example.com">
+ """],
+ ["""\
++Malformed target:
++
++.. __malformed: no good
++
++Target beginning with an underscore:
++
++.. _`_target`: OK
++""",
++"""\
++<document source="test data">
++    <paragraph>
++        Malformed target:
++    <comment xml:space="preserve">
++        __malformed: no good
++    <system_message level="2" line="3" source="test data" type="WARNING">
++        <paragraph>
++            malformed hyperlink target.
++    <paragraph>
++        Target beginning with an underscore:
++    <target ids="target" names="_target" refuri="OK">
++"""],
++["""\
+ Duplicate external targets (different URIs):
+ 
+ .. _target: first
+diff -ur docutils-0.4/test/test_readers/test_pep/test_inline_markup.py docutils-0.4-branch/test/test_readers/test_pep/test_inline_markup.py
+--- docutils-0.4/test/test_readers/test_pep/test_inline_markup.py	2005-03-26 16:21:28.000000000 +0000
++++ docutils-0.4-branch/test/test_readers/test_pep/test_inline_markup.py	2006-07-02 16:10:09.000000000 +0100
+@@ -2,8 +2,8 @@
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+-# Revision: $Revision: 3129 $
+-# Date: $Date: 2005-03-26 17:21:28 +0100 (Sat, 26 Mar 2005) $
++# Revision: $Revision: 4490 $
++# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+diff -ur docutils-0.4/test/test_writers/test_latex2e.py docutils-0.4-branch/test/test_writers/test_latex2e.py
+--- docutils-0.4/test/test_writers/test_latex2e.py	2005-08-27 14:43:58.000000000 +0100
++++ docutils-0.4-branch/test/test_writers/test_latex2e.py	2006-07-02 16:10:12.000000000 +0100
+@@ -2,8 +2,8 @@
+ 
+ # Author: engelbert gruber
+ # Contact: grubert at users.sourceforge.net
+-# Revision: $Revision: 3840 $
+-# Date: $Date: 2005-08-27 15:43:58 +0200 (Sat, 27 Aug 2005) $
++# Revision: $Revision: 4614 $
++# Date: $Date: 2006-06-05 22:33:33 +0200 (Mon, 05 Jun 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+@@ -162,10 +162,10 @@
+ \\begin{document}
+ 
+ \\setlength{\\locallinewidth}{\\linewidth}
+-\\newcounter{listcnt1}
+-\\begin{list}{\\arabic{listcnt1}.}
++\\newcounter{listcnt0}
++\\begin{list}{\\arabic{listcnt0}.}
+ {
+-\\usecounter{listcnt1}
++\\usecounter{listcnt0}
+ \\setlength{\\rightmargin}{\\leftmargin}
+ }
+ \\item {} 
+@@ -176,10 +176,10 @@
+ 
+ \\end{list}
+ \\begin{quote}
+-\\newcounter{listcnt2}
+-\\begin{list}{\\alph{listcnt2})}
++\\setcounter{listcnt0}{0}
++\\begin{list}{\\alph{listcnt0})}
+ {
+-\\usecounter{listcnt2}
++\\usecounter{listcnt0}
+ \\setlength{\\rightmargin}{\\leftmargin}
+ }
+ \\item {} 
+@@ -190,11 +190,11 @@
+ 
+ \\end{list}
+ \\end{quote}
+-\\newcounter{listcnt3}
+-\\begin{list}{\\arabic{listcnt3}.}
++\\setcounter{listcnt0}{0}
++\\begin{list}{\\arabic{listcnt0}.}
+ {
+-\\usecounter{listcnt3}
+-\\addtocounter{listcnt3}{2}
++\\usecounter{listcnt0}
++\\addtocounter{listcnt0}{2}
+ \\setlength{\\rightmargin}{\\leftmargin}
+ }
+ \\item {} 
+@@ -202,10 +202,10 @@
+ 
+ \\end{list}
+ \\begin{quote}
+-\\newcounter{listcnt4}
+-\\begin{list}{(\\Roman{listcnt4})}
++\\setcounter{listcnt0}{0}
++\\begin{list}{(\\Roman{listcnt0})}
+ {
+-\\usecounter{listcnt4}
++\\usecounter{listcnt0}
+ \\setlength{\\rightmargin}{\\leftmargin}
+ }
+ \\item {} 
+diff -ur docutils-0.4/tools/editors/emacs/rst.el docutils-0.4-branch/tools/editors/emacs/rst.el
+--- docutils-0.4/tools/editors/emacs/rst.el	2005-12-27 13:12:04.000000000 +0000
++++ docutils-0.4-branch/tools/editors/emacs/rst.el	2006-07-02 16:10:37.000000000 +0100
+@@ -5,13 +5,27 @@
+ ;;; :Authors: Martin Blais <blais at furius.ca>,
+ ;;;           Stefan Merten <smerten at oekonux.de>,
+ ;;;           David Goodger <goodger at python.org>
+-;;; :Revision: $Revision: 4232 $
+-;;; :Date: $Date: 2005-12-27 14:12:04 +0100 (Tue, 27 Dec 2005) $
+-;;; :Copyright: This module has been placed in the public domain.
+-;;; :Abstract:
++;;; :Revision: $Revision: 4481 $
++;;; :Date: $Date: 2006-04-01 03:36:26 +0200 (Sat, 01 Apr 2006) $
++;;; :Copyright: 2003-2006 by Martin Blais, Stefan Merten, and David Goodger.
++;;; :License:
++;;;     This program is free software; you can redistribute it and/or modify
++;;;     it under the terms of the GNU General Public License version 2,
++;;;     as published by the Free Software Foundation.
++;;; 
++;;;     This program is distributed in the hope that it will be useful,
++;;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
++;;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++;;;     GNU General Public License for more details.
++;;; 
++;;;     You should have received a copy of the GNU General Public License
++;;;     version 2 along with this program (../../../licenses/gpl.txt) and
++;;;     available at http://docutils.sf.net/licenses/gpl.txt
++;;;     and at http://www.gnu.org/licenses/gpl.txt.
+ ;;;
+-;;;    Support code for editing reStructuredText with Emacs.  The latest version
+-;;;    of this file lies in the docutils source code repository.
++;;; :Abstract:
++;;;     Support code for editing reStructuredText with Emacs.  The latest
++;;;     version of this file lies in the docutils source code repository.
+ ;;;
+ ;;; Description
+ ;;; ===========
+@@ -1903,29 +1917,6 @@
+ ;; All customizable features have a comment explaining their meaning. Refer to
+ ;; the customization of your Emacs (try ``M-x customize``).
+ 
+-;; SEE ALSO
+-;;
+-;; http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html
+-
+-;; AUTHOR
+-;;
+-;; Stefan Merten <smerten AT oekonux.de>
+-
+-;; LICENSE
+-;;
+-;; This program is licensed under the terms of the GPL. See
+-;;
+-;;   http://www.gnu.org/licenses/gpl.txt
+-
+-;; AVAILABILITY
+-;;
+-;; See
+-;;
+-;;   http://www.merten-home.de/FreeSoftware/rst-mode/
+-
+-
+-;;; Code:
+-
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;; Customization:
+ 
+@@ -2687,6 +2678,9 @@
+       (or (and dir (concat dir file-name)) nil)
+     )))
+ 
++
++(require 'compile)
++
+ (defun rst-compile (&optional pfxarg)
+   "Compile command to convert reST document into some output file.
+ Attempts to find configuration file, if it can, overrides the
+diff -ur docutils-0.4/tools/editors/README.txt docutils-0.4-branch/tools/editors/README.txt
+--- docutils-0.4/tools/editors/README.txt	2005-06-28 14:11:20.000000000 +0100
++++ docutils-0.4-branch/tools/editors/README.txt	2006-07-02 16:10:37.000000000 +0100
+@@ -2,7 +2,7 @@
+  Editor Support for reStructuredText_
+ ======================================
+ 
+-:Date: $Date: 2005-06-28 15:11:20 +0200 (Tue, 28 Jun 2005) $
++:Date: $Date: 2006-04-01 03:06:59 +0200 (Sat, 01 Apr 2006) $
+ 
+ The files in this directory contain support code for reStructuredText
+ editing for the following editors:
+@@ -14,6 +14,9 @@
+ * `reStructuredText syntax highlighting mode for vim
+   <http://www.vim.org/scripts/script.php?script_id=973>`__
+ 
++* `VST (Vim reStructured Text) is a plugin for Vim7 with folding for
++  reST <http://skawina.eu.org/mikolaj/vst.html>`__
++
+ * `rst mode <http://jedmodes.sf.net/mode/rst/>`__ for the `JED`_
+   programmers editor
+ 
+diff -ur docutils-0.4/tools/rst2s5.py docutils-0.4-branch/tools/rst2s5.py
+--- docutils-0.4/tools/rst2s5.py	2005-12-08 04:43:13.000000000 +0000
++++ docutils-0.4-branch/tools/rst2s5.py	2006-07-02 16:10:38.000000000 +0100
+@@ -1,9 +1,9 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ 
+ # Author: Chris Liechti
+ # Contact: cliechti at gmx.net
+-# Revision: $Revision: 4156 $
+-# Date: $Date: 2005-12-08 05:43:13 +0100 (Thu, 08 Dec 2005) $
++# Revision: $Revision: 4477 $
++# Date: $Date: 2006-04-01 03:13:25 +0200 (Sat, 01 Apr 2006) $
+ # Copyright: This module has been placed in the public domain.
+ 
+ """
+--- docutils-0.4/MANIFEST.in
++++ docutils-0.4-branch/MANIFEST.in
+@@ -0,0 +1,9 @@
++include *.txt
++include *.py
++recursive-include docutils *
++recursive-include docs *
++recursive-include extras *
++recursive-include licenses *
++recursive-include test *
++recursive-include tools *
++recursive-exclude * .cvsignore *.pyc *~ .DS_Store

Propchange: packages/python-docutils/trunk/debian/patches/01_upstream_04_branch_r4646.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch (added)
+++ packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch Sun Jul  2 17:07:14 2006
@@ -1,0 +1,204 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_doc_debian_paths.dpatch by Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+
+diff -urNad docutils-0.4~/README.txt docutils-0.4/README.txt
+--- docutils-0.4~/README.txt	2005-12-14 17:37:48.000000000 +0000
++++ docutils-0.4/README.txt	2006-07-02 17:27:37.720499432 +0100
+@@ -11,8 +11,19 @@
+ .. contents::
+ 
+ 
+-Quick-Start
+-===========
++Quick-Start on Debian systems
++=============================
++
++The reStructuredText tools are installed in the normal system path by the
++Debian ``python-docutils`` package. To convert reStructuredText to another
++format, use a shell command like::
++
++       rst2html /usr/share/doc/python-docutils/FAQ.txt ./FAQ.html
++
++See Usage_ below for details.
++
++Quick-Start on other systems
++============================
+ 
+ This is for those who want to get up & running quickly.  Read on for
+ complete details.
+@@ -259,6 +270,12 @@
+ the front-end tools for details on options and arguments.  See
+ Docutils Front-End Tools (``docs/user/tools.txt``) for full documentation.
+ 
++On a Debian system the included tools (with the exception of quicktest.py
++and the development tools in the dev/ directory) are installed into the
++normal system path, so you can run ``rst2html.py`` with a command like::
++
++    rst2html example.txt example.html
++
+ The package modules are continually growing and evolving.  The
+ ``docutils.statemachine`` module is usable independently.  It contains
+ extensive inline documentation (in reStructuredText format of course).
+diff -urNad docutils-0.4~/docs/user/emacs.txt docutils-0.4/docs/user/emacs.txt
+--- docutils-0.4~/docs/user/emacs.txt	2005-11-18 04:26:30.000000000 +0000
++++ docutils-0.4/docs/user/emacs.txt	2006-07-02 17:25:57.884998612 +0100
+@@ -37,6 +37,9 @@
+ 
+   (require 'rst)  ;; or (load "rst")
+ 
++The Debian ``python-docutils`` package automatically sets up a suitable
++configuration.
++
+ Additional configuration variables can be customized and can be found
+ by browsing the source code for ``rst.el``.
+ 
+diff -urNad docutils-0.4~/docs/user/tools.txt docutils-0.4/docs/user/tools.txt
+--- docutils-0.4~/docs/user/tools.txt	2005-12-09 04:21:34.000000000 +0000
++++ docutils-0.4/docs/user/tools.txt	2006-07-02 17:26:45.984758112 +0100
+@@ -39,6 +39,10 @@
+ used for the destination.  If no arguments are specified, the standard
+ input (stdin) is used for the source as well.
+ 
++In Debian these tools are installed in the normal system path, without the
++``.py`` extension, according to Debian policy. 
++buildhtml.py_ is installed as rst-buildhtml.
++
+ 
+ Getting Help
+ ============
+@@ -66,13 +70,15 @@
+ :Parser: reStructuredText
+ :Writers: HTML, PEP/HTML
+ 
++In Debian this tool is installed under the name rst-buildhtml.
++
+ Use ``buildhtml.py`` to generate .html from all the .txt files
+ (including PEPs) in each <directory> given, and their subdirectories
+ too.  (Use the ``--local`` option to skip subdirectories.)
+ 
+ Usage::
+ 
+-    buildhtml.py [options] [<directory> ...]
++    rst-buildhtml [options] [<directory> ...]
+ 
+ After unpacking the Docutils package, the following shell commands
+ will generate HTML for all included documentation::
+@@ -103,6 +109,8 @@
+ :Parser: reStructuredText
+ :Writer: HTML
+ 
++In Debian this front end is installed as rst2html.
++
+ The ``rst2html.py`` front end reads standalone reStructuredText source
+ files and produces HTML 4 (XHTML 1) output compatible with modern
+ browsers that support cascading stylesheets (CSS).  A stylesheet is
+@@ -112,13 +120,13 @@
+ For example, to process a reStructuredText file "``test.txt``" into
+ HTML::
+ 
+-    rst2html.py test.txt test.html
++    rst2html test.txt test.html
+ 
+ Now open the "``test.html``" file in your favorite browser to see the
+ results.  To get a footer with a link to the source file, date & time
+ of processing, and links to the Docutils project, add some options::
+ 
+-    rst2html.py -stg test.txt test.html
++    rst2html -stg test.txt test.html
+ 
+ 
+ Stylesheets
+@@ -146,6 +154,8 @@
+ :Parser: reStructuredText
+ :Writer: PEP/HTML
+ 
++In Debian this front end is installed as rstpep2html.
++
+ ``rstpep2html.py`` reads a new-style PEP (marked up with
+ reStructuredText) and produces HTML.  It requires a template file and
+ a stylesheet.  By default, it makes use of a "``pep-html-template``"
+@@ -156,7 +166,7 @@
+ For example, to process a PEP into HTML::
+ 
+     cd <path-to-docutils>/docs/peps
+-    rstpep2html.py pep-0287.txt pep-0287.html
++    rstpep2html pep-0287.txt pep-0287.html
+ 
+ 
+ rst2s5.py
+@@ -166,6 +176,8 @@
+ :Parser: reStructuredText
+ :Writer: S5/HTML
+ 
++In Debian this is installed as rst2s5.
++
+ The ``rst2s5.py`` front end reads standalone reStructuredText source
+ files and produces (X)HTML output compatible with S5_, the "Simple
+ Standards-based Slide Show System" by Eric Meyer.  A theme is required
+@@ -175,7 +187,7 @@
+ For example, to process a reStructuredText file "``slides.txt``" into
+ S5/HTML::
+ 
+-    rst2s5.py slides.txt slides.html
++    rst2s5 slides.txt slides.html
+ 
+ Now open the "``slides.html``" file in your favorite browser, switch
+ to full-screen mode, and enjoy the results.
+@@ -193,7 +205,7 @@
+ the "``--theme-url``" option (for themes anywhere).  For example, the
+ "medium-black" theme can be specified as follows::
+ 
+-    rst2s5.py --theme medium-black slides.txt slides.html
++    rst2s5 --theme medium-black slides.txt slides.html
+ 
+ The theme will be copied to the ``ui/medium-black`` directory.
+ 
+@@ -276,11 +288,14 @@
+ :Parser: reStructuredText
+ :Writer: LaTeX2e
+ 
++In Debian this is installed as rst2latex, with an experimental version
++installed as rst2newlatex.
++
+ The ``rst2latex.py`` front end reads standalone reStructuredText
+ source files and produces LaTeX2e output. For example, to process a
+ reStructuredText file "``test.txt``" into LaTeX::
+ 
+-    rst2latex.py test.txt test.tex
++    rst2latex test.txt test.tex
+ 
+ The output file "``test.tex``" should then be processed with ``latex``
+ or ``pdflatex`` to get a typeset document.
+@@ -306,6 +321,8 @@
+ :Parser: reStructuredText
+ :Writer: XML (Docutils native)
+ 
++In Debian this is installed as rst2xml.
++
+ The ``rst2xml.py`` front end produces Docutils-native XML output.
+ This can be transformed with standard XML tools such as XSLT
+ processors into arbitrary final forms.
+@@ -321,6 +338,8 @@
+ :Parser: reStructuredText
+ :Writer: Pseudo-XML
+ 
++In Debian this is installed as rst2pseudoxml.
++
+ ``rst2pseudoxml.py`` is used for debugging the Docutils "Reader to
+ Transform to Writer" pipeline.  It produces a compact pretty-printed
+ "pseudo-XML", where nesting is indicated by indentation (no end-tags).
+@@ -335,6 +354,9 @@
+ :Parser: reStructuredText
+ :Writer: N/A
+ 
++This tool is not currently installed by the Debian package;
++``apt-get source python-docutils`` if you need it.
++
+ The ``quicktest.py`` tool is used for testing the reStructuredText
+ parser.  It does not use a Docutils Reader or Writer or the standard
+ Docutils command-line options.  Rather, it does its own I/O and calls

Added: packages/python-docutils/trunk/debian/patches/11_not_usrbinenv_python.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/11_not_usrbinenv_python.dpatch?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/patches/11_not_usrbinenv_python.dpatch (added)
+++ packages/python-docutils/trunk/debian/patches/11_not_usrbinenv_python.dpatch Sun Jul  2 17:07:14 2006
@@ -1,0 +1,979 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_not_usrbinenv_python by Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't use "#!/usr/bin/env python", instead use "#!/usr/bin/python".
+
+ at DPATCH@
+diff -urNad docutils-0.4~/docs/api/cmdline-tool.txt docutils-0.4/docs/api/cmdline-tool.txt
+--- docutils-0.4~/docs/api/cmdline-tool.txt	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/docs/api/cmdline-tool.txt	2006-07-02 17:21:29.206342012 +0100
+@@ -18,7 +18,7 @@
+ file``), and supply an interpreter on the first line, the "shebang" or
+ "hash-bang" line::
+ 
+-    #!/usr/bin/env python
++    #!/usr/bin/python
+ 
+ Windows systems can be set up to associate the Python interpreter with
+ the ``.py`` extension.
+diff -urNad docutils-0.4~/docs/dev/testing.txt docutils-0.4/docs/dev/testing.txt
+--- docutils-0.4~/docs/dev/testing.txt	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/docs/dev/testing.txt	2006-07-02 17:21:29.206342012 +0100
+@@ -92,7 +92,7 @@
+ using Python's ``unittest`` module.  For an example, please have a
+ look at the following imaginary ``test_square.py``::
+ 
+-    #! /usr/bin/env python
++    #!/usr/bin/python
+ 
+     # Author: your name
+     # Contact: your email address
+diff -urNad docutils-0.4~/docs/dev/todo.txt docutils-0.4/docs/dev/todo.txt
+--- docutils-0.4~/docs/dev/todo.txt	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/docs/dev/todo.txt	2006-07-02 17:21:29.210341992 +0100
+@@ -644,7 +644,7 @@
+   docstrings`_ and ``from __future__ import`` for module docstrings.
+   A module could begin like this::
+ 
+-      #!/usr/bin/env python
++      #!/usr/bin/python
+       # :Author: Me
+       # :Copyright: whatever
+ 
+diff -urNad docutils-0.4~/install.py docutils-0.4/install.py
+--- docutils-0.4~/install.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/install.py	2006-07-02 17:21:29.250341792 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # $Id: install.py 2428 2004-07-13 15:57:13Z goodger $
+ # Copyright: This file has been placed in the public domain.
+ 
+diff -urNad docutils-0.4~/setup.py docutils-0.4/setup.py
+--- docutils-0.4~/setup.py	2006-07-02 17:21:28.842343832 +0100
++++ docutils-0.4/setup.py	2006-07-02 17:21:29.250341792 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # $Id: setup.py 4462 2006-04-01 00:29:53Z fwiemann $
+ # Copyright: This file has been placed in the public domain.
+ 
+diff -urNad docutils-0.4~/test/docutils_difflib.py docutils-0.4/test/docutils_difflib.py
+--- docutils-0.4~/test/docutils_difflib.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/docutils_difflib.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ """
+ Module difflib -- helpers for computing deltas between objects.
+diff -urNad docutils-0.4~/test/package_unittest.py docutils-0.4/test/package_unittest.py
+--- docutils-0.4~/test/package_unittest.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/package_unittest.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Garth Kidd
+ # Contact: garth at deadlybloodyserious.com
+diff -urNad docutils-0.4~/test/test_dependencies.py docutils-0.4/test/test_dependencies.py
+--- docutils-0.4~/test/test_dependencies.py	2006-07-02 17:21:28.850343792 +0100
++++ docutils-0.4/test/test_dependencies.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_functional.py docutils-0.4/test/test_functional.py
+--- docutils-0.4~/test/test_functional.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_functional.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_io.py docutils-0.4/test/test_io.py
+--- docutils-0.4~/test/test_io.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_io.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_language.py docutils-0.4/test/test_language.py
+--- docutils-0.4~/test/test_language.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_language.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Authors:   Engelbert Gruber; David Goodger
+ # Contact:   grubert at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_nodes.py docutils-0.4/test/test_nodes.py
+--- docutils-0.4~/test/test_nodes.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_nodes.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_SimpleTableParser.py docutils-0.4/test/test_parsers/test_rst/test_SimpleTableParser.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_SimpleTableParser.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_SimpleTableParser.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_TableParser.py docutils-0.4/test/test_parsers/test_rst/test_TableParser.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_TableParser.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_TableParser.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_block_quotes.py docutils-0.4/test/test_parsers/test_rst/test_block_quotes.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_block_quotes.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_block_quotes.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_bullet_lists.py docutils-0.4/test/test_parsers/test_rst/test_bullet_lists.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_bullet_lists.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_bullet_lists.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_citations.py docutils-0.4/test/test_parsers/test_rst/test_citations.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_citations.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_citations.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_comments.py docutils-0.4/test/test_parsers/test_rst/test_comments.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_comments.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_comments.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_definition_lists.py docutils-0.4/test/test_parsers/test_rst/test_definition_lists.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_definition_lists.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_definition_lists.py	2006-07-02 17:21:29.222341932 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_admonitions.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_admonitions.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_admonitions.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_admonitions.py	2006-07-02 17:21:29.210341992 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_compound.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_compound.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_compound.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_compound.py	2006-07-02 17:21:29.210341992 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_container.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_container.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_container.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_container.py	2006-07-02 17:21:29.210341992 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_contents.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_contents.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_contents.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_contents.py	2006-07-02 17:21:29.210341992 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_date.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_date.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_date.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_date.py	2006-07-02 17:21:29.210341992 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_decorations.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_decorations.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_decorations.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_decorations.py	2006-07-02 17:21:29.210341992 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_default_role.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_default_role.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_default_role.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_default_role.py	2006-07-02 17:21:29.210341992 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_figures.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_figures.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_figures.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_figures.py	2006-07-02 17:21:29.210341992 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_images.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_images.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_images.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_images.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_include.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_include.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_include.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_include.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_line_blocks.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_line_blocks.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_line_blocks.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_line_blocks.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_meta.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_meta.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_meta.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_meta.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_raw.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_raw.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_raw.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_raw.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_replace.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_replace.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_replace.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_replace.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_role.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_role.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_role.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_role.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_rubrics.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_rubrics.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_rubrics.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_rubrics.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_sidebars.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_sidebars.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_sidebars.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_sidebars.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_tables.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_tables.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_tables.py	2006-07-02 17:21:28.850343792 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_tables.py	2006-07-02 17:21:29.214341972 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_target_notes.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_target_notes.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_target_notes.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_target_notes.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_test_directives.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_test_directives.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_test_directives.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_test_directives.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_topics.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_topics.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_topics.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_topics.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_unicode.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_unicode.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_unicode.py	2006-07-02 17:21:28.850343792 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_unicode.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_directives/test_unknown.py docutils-0.4/test/test_parsers/test_rst/test_directives/test_unknown.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_directives/test_unknown.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_directives/test_unknown.py	2006-07-02 17:21:29.218341952 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_doctest_blocks.py docutils-0.4/test/test_parsers/test_rst/test_doctest_blocks.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_doctest_blocks.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_doctest_blocks.py	2006-07-02 17:21:29.222341932 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_east_asian_text.py docutils-0.4/test/test_parsers/test_rst/test_east_asian_text.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_east_asian_text.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_east_asian_text.py	2006-07-02 17:21:29.222341932 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ 
+ # Author: David Goodger
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_enumerated_lists.py docutils-0.4/test/test_parsers/test_rst/test_enumerated_lists.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_enumerated_lists.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_enumerated_lists.py	2006-07-02 17:21:29.222341932 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_field_lists.py docutils-0.4/test/test_parsers/test_rst/test_field_lists.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_field_lists.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_field_lists.py	2006-07-02 17:21:29.222341932 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_footnotes.py docutils-0.4/test/test_parsers/test_rst/test_footnotes.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_footnotes.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_footnotes.py	2006-07-02 17:21:29.222341932 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_functions.py docutils-0.4/test/test_parsers/test_rst/test_functions.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_functions.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_functions.py	2006-07-02 17:21:29.222341932 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_inline_markup.py docutils-0.4/test/test_parsers/test_rst/test_inline_markup.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_inline_markup.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_inline_markup.py	2006-07-02 17:21:29.222341932 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_interpreted.py docutils-0.4/test/test_parsers/test_rst/test_interpreted.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_interpreted.py	2006-07-02 17:21:28.850343792 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_interpreted.py	2006-07-02 17:21:29.226341912 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_line_blocks.py docutils-0.4/test/test_parsers/test_rst/test_line_blocks.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_line_blocks.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_line_blocks.py	2006-07-02 17:21:29.226341912 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_literal_blocks.py docutils-0.4/test/test_parsers/test_rst/test_literal_blocks.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_literal_blocks.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_literal_blocks.py	2006-07-02 17:21:29.226341912 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_option_lists.py docutils-0.4/test/test_parsers/test_rst/test_option_lists.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_option_lists.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_option_lists.py	2006-07-02 17:21:29.226341912 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_outdenting.py docutils-0.4/test/test_parsers/test_rst/test_outdenting.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_outdenting.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_outdenting.py	2006-07-02 17:21:29.226341912 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_paragraphs.py docutils-0.4/test/test_parsers/test_rst/test_paragraphs.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_paragraphs.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_paragraphs.py	2006-07-02 17:21:29.226341912 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_section_headers.py docutils-0.4/test/test_parsers/test_rst/test_section_headers.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_section_headers.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_section_headers.py	2006-07-02 17:21:29.226341912 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_substitutions.py docutils-0.4/test/test_parsers/test_rst/test_substitutions.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_substitutions.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_substitutions.py	2006-07-02 17:21:29.226341912 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_tables.py docutils-0.4/test/test_parsers/test_rst/test_tables.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_tables.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_tables.py	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_targets.py docutils-0.4/test/test_parsers/test_rst/test_targets.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_targets.py	2006-07-02 17:21:28.854343772 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_targets.py	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_parsers/test_rst/test_transitions.py docutils-0.4/test/test_parsers/test_rst/test_transitions.py
+--- docutils-0.4~/test/test_parsers/test_rst/test_transitions.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_parsers/test_rst/test_transitions.py	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_publisher.py docutils-0.4/test/test_publisher.py
+--- docutils-0.4~/test/test_publisher.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_publisher.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Martin Blais
+ # Contact: blais at furius.ca
+diff -urNad docutils-0.4~/test/test_readers/test_pep/test_inline_markup.py docutils-0.4/test/test_readers/test_pep/test_inline_markup.py
+--- docutils-0.4~/test/test_readers/test_pep/test_inline_markup.py	2006-07-02 17:21:28.854343772 +0100
++++ docutils-0.4/test/test_readers/test_pep/test_inline_markup.py	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_readers/test_pep/test_rfc2822.py docutils-0.4/test/test_readers/test_pep/test_rfc2822.py
+--- docutils-0.4~/test/test_readers/test_pep/test_rfc2822.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_readers/test_pep/test_rfc2822.py	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_readers/test_python/showast docutils-0.4/test/test_readers/test_python/showast
+--- docutils-0.4~/test/test_readers/test_python/showast	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_readers/test_python/showast	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ """
+ This is a tool for exploring abstract syntax trees generated by
+diff -urNad docutils-0.4~/test/test_readers/test_python/showdoc docutils-0.4/test/test_readers/test_python/showdoc
+--- docutils-0.4~/test/test_readers/test_python/showdoc	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_readers/test_python/showdoc	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ """
+ This is a tool for exploring module documentation trees generated by
+diff -urNad docutils-0.4~/test/test_readers/test_python/showparse docutils-0.4/test/test_readers/test_python/showparse
+--- docutils-0.4~/test/test_readers/test_python/showparse	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_readers/test_python/showparse	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ """
+ This is a tool for exploring abstract syntax trees generated by
+diff -urNad docutils-0.4~/test/test_readers/test_python/showtok docutils-0.4/test/test_readers/test_python/showtok
+--- docutils-0.4~/test/test_readers/test_python/showtok	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_readers/test_python/showtok	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ 
+ """
+diff -urNad docutils-0.4~/test/test_readers/test_python/test_functions.py docutils-0.4/test/test_readers/test_python/test_functions.py
+--- docutils-0.4~/test/test_readers/test_python/test_functions.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_readers/test_python/test_functions.py	2006-07-02 17:21:29.230341892 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_readers/test_python/test_parser.py docutils-0.4/test/test_readers/test_python/test_parser.py
+--- docutils-0.4~/test/test_readers/test_python/test_parser.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_readers/test_python/test_parser.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_readers/test_python/test_token_parser.py docutils-0.4/test/test_readers/test_python/test_token_parser.py
+--- docutils-0.4~/test/test_readers/test_python/test_token_parser.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_readers/test_python/test_token_parser.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_settings.py docutils-0.4/test/test_settings.py
+--- docutils-0.4~/test/test_settings.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_settings.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_statemachine.py docutils-0.4/test/test_statemachine.py
+--- docutils-0.4~/test/test_statemachine.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_statemachine.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test___init__.py docutils-0.4/test/test_transforms/test___init__.py
+--- docutils-0.4~/test/test_transforms/test___init__.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test___init__.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_transforms/test_class.py docutils-0.4/test/test_transforms/test_class.py
+--- docutils-0.4~/test/test_transforms/test_class.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_class.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_contents.py docutils-0.4/test/test_transforms/test_contents.py
+--- docutils-0.4~/test/test_transforms/test_contents.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_contents.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_docinfo.py docutils-0.4/test/test_transforms/test_docinfo.py
+--- docutils-0.4~/test/test_transforms/test_docinfo.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_docinfo.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_doctitle.py docutils-0.4/test/test_transforms/test_doctitle.py
+--- docutils-0.4~/test/test_transforms/test_doctitle.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_doctitle.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_expose_internals.py docutils-0.4/test/test_transforms/test_expose_internals.py
+--- docutils-0.4~/test/test_transforms/test_expose_internals.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_expose_internals.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_transforms/test_filter.py docutils-0.4/test/test_transforms/test_filter.py
+--- docutils-0.4~/test/test_transforms/test_filter.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_filter.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_footnotes.py docutils-0.4/test/test_transforms/test_footnotes.py
+--- docutils-0.4~/test/test_transforms/test_footnotes.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_footnotes.py	2006-07-02 17:21:29.234341872 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_hyperlinks.py docutils-0.4/test/test_transforms/test_hyperlinks.py
+--- docutils-0.4~/test/test_transforms/test_hyperlinks.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_hyperlinks.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_messages.py docutils-0.4/test/test_transforms/test_messages.py
+--- docutils-0.4~/test/test_transforms/test_messages.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_messages.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_peps.py docutils-0.4/test/test_transforms/test_peps.py
+--- docutils-0.4~/test/test_transforms/test_peps.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_peps.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_sectnum.py docutils-0.4/test/test_transforms/test_sectnum.py
+--- docutils-0.4~/test/test_transforms/test_sectnum.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_sectnum.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger, Dmitry Jemerov
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_strip_comments.py docutils-0.4/test/test_transforms/test_strip_comments.py
+--- docutils-0.4~/test/test_transforms/test_strip_comments.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_strip_comments.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/test/test_transforms/test_substitutions.py docutils-0.4/test/test_transforms/test_substitutions.py
+--- docutils-0.4~/test/test_transforms/test_substitutions.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_substitutions.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_target_notes.py docutils-0.4/test/test_transforms/test_target_notes.py
+--- docutils-0.4~/test/test_transforms/test_target_notes.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_target_notes.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_transitions.py docutils-0.4/test/test_transforms/test_transitions.py
+--- docutils-0.4~/test/test_transforms/test_transitions.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_transitions.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_transforms/test_writer_aux.py docutils-0.4/test/test_transforms/test_writer_aux.py
+--- docutils-0.4~/test/test_transforms/test_writer_aux.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_transforms/test_writer_aux.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_utils.py docutils-0.4/test/test_utils.py
+--- docutils-0.4~/test/test_utils.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_utils.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_viewlist.py docutils-0.4/test/test_viewlist.py
+--- docutils-0.4~/test/test_viewlist.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_viewlist.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_writers/test_docutils_xml.py docutils-0.4/test/test_writers/test_docutils_xml.py
+--- docutils-0.4~/test/test_writers/test_docutils_xml.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_writers/test_docutils_xml.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_writers/test_html4css1.py docutils-0.4/test/test_writers/test_html4css1.py
+--- docutils-0.4~/test/test_writers/test_html4css1.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_writers/test_html4css1.py	2006-07-02 17:21:29.238341852 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: reggie dugard
+ # Contact: reggie at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_writers/test_html4css1_misc.py docutils-0.4/test/test_writers/test_html4css1_misc.py
+--- docutils-0.4~/test/test_writers/test_html4css1_misc.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_writers/test_html4css1_misc.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_writers/test_latex2e.py docutils-0.4/test/test_writers/test_latex2e.py
+--- docutils-0.4~/test/test_writers/test_latex2e.py	2006-07-02 17:21:28.854343772 +0100
++++ docutils-0.4/test/test_writers/test_latex2e.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: engelbert gruber
+ # Contact: grubert at users.sourceforge.net
+diff -urNad docutils-0.4~/test/test_writers/test_null.py docutils-0.4/test/test_writers/test_null.py
+--- docutils-0.4~/test/test_writers/test_null.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_writers/test_null.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/test/test_writers/test_pseudoxml.py docutils-0.4/test/test_writers/test_pseudoxml.py
+--- docutils-0.4~/test/test_writers/test_pseudoxml.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/test/test_writers/test_pseudoxml.py	2006-07-02 17:21:29.242341832 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/tools/buildhtml.py docutils-0.4/tools/buildhtml.py
+--- docutils-0.4~/tools/buildhtml.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/buildhtml.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/tools/dev/create_unimap.py docutils-0.4/tools/dev/create_unimap.py
+--- docutils-0.4~/tools/dev/create_unimap.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/dev/create_unimap.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Felix Wiemann
+ # Contact: Felix_Wiemann at ososo.de
+diff -urNad docutils-0.4~/tools/dev/unicode2rstsubs.py docutils-0.4/tools/dev/unicode2rstsubs.py
+--- docutils-0.4~/tools/dev/unicode2rstsubs.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/dev/unicode2rstsubs.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/tools/quicktest.py docutils-0.4/tools/quicktest.py
+--- docutils-0.4~/tools/quicktest.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/quicktest.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: Garth Kidd
+ # Contact: garth at deadlybloodyserious.com
+diff -urNad docutils-0.4~/tools/rst2html.py docutils-0.4/tools/rst2html.py
+--- docutils-0.4~/tools/rst2html.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/rst2html.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at python.org
+diff -urNad docutils-0.4~/tools/rst2latex.py docutils-0.4/tools/rst2latex.py
+--- docutils-0.4~/tools/rst2latex.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/rst2latex.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/tools/rst2newlatex.py docutils-0.4/tools/rst2newlatex.py
+--- docutils-0.4~/tools/rst2newlatex.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/rst2newlatex.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/tools/rst2pseudoxml.py docutils-0.4/tools/rst2pseudoxml.py
+--- docutils-0.4~/tools/rst2pseudoxml.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/rst2pseudoxml.py	2006-07-02 17:21:29.246341812 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/tools/rst2xml.py docutils-0.4/tools/rst2xml.py
+--- docutils-0.4~/tools/rst2xml.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/rst2xml.py	2006-07-02 17:21:29.250341792 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net
+diff -urNad docutils-0.4~/tools/rstpep2html.py docutils-0.4/tools/rstpep2html.py
+--- docutils-0.4~/tools/rstpep2html.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/tools/rstpep2html.py	2006-07-02 17:21:29.250341792 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ # Author: David Goodger
+ # Contact: goodger at users.sourceforge.net

Propchange: packages/python-docutils/trunk/debian/patches/11_not_usrbinenv_python.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/python-docutils/trunk/debian/patches/12_remove_unnecessary_hashbang.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/12_remove_unnecessary_hashbang.dpatch?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/patches/12_remove_unnecessary_hashbang.dpatch (added)
+++ packages/python-docutils/trunk/debian/patches/12_remove_unnecessary_hashbang.dpatch Sun Jul  2 17:07:14 2006
@@ -1,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_remove_unnecessary_hashbang.dpatch by Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove unnecessary #! line from docutils.readers.python.pynodes
+## DP: to keep lintian happy
+
+ at DPATCH@
+diff -urNad docutils-0.4~/docutils/readers/python/pynodes.py docutils-0.4/docutils/readers/python/pynodes.py
+--- docutils-0.4~/docutils/readers/python/pynodes.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/docutils/readers/python/pynodes.py	2006-07-02 17:21:47.682249632 +0100
+@@ -1,5 +1,3 @@
+-#! /usr/bin/env python
+-
+ """
+ :Author: David Goodger
+ :Contact: goodger at users.sourceforge.net

Propchange: packages/python-docutils/trunk/debian/patches/12_remove_unnecessary_hashbang.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/python-docutils/trunk/debian/patches/13_nodes_namespace.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/13_nodes_namespace.dpatch?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/patches/13_nodes_namespace.dpatch (added)
+++ packages/python-docutils/trunk/debian/patches/13_nodes_namespace.dpatch Sun Jul  2 17:07:14 2006
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_nodes_namespace.dpatch by Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Was in Matthias' packaging, I'm not sure why
+
+ at DPATCH@
+diff -urNad docutils-0.4~/docutils/nodes.py docutils-0.4/docutils/nodes.py
+--- docutils-0.4~/docutils/nodes.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/docutils/nodes.py	2006-07-02 17:21:58.042197832 +0100
+@@ -887,6 +887,11 @@
+ 
+         self.document = self
+ 
++        self._namespace = None
++
++    def set_namespace(self, namespace):
++        self._namespace = namespace
++
+     def asdom(self, dom=None):
+         """Return a DOM representation of this document."""
+         if dom is None:

Propchange: packages/python-docutils/trunk/debian/patches/13_nodes_namespace.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch (added)
+++ packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch Sun Jul  2 17:07:14 2006
@@ -1,0 +1,92 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_distutils_setup.dpatch by Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Split roman.py setup into a separate script
+
+ at DPATCH@
+diff -urNad docutils-0.4~/setup.py docutils-0.4/setup.py
+--- docutils-0.4~/setup.py	2006-07-02 17:22:09.542140332 +0100
++++ docutils-0.4/setup.py	2006-07-02 17:22:10.018137952 +0100
+@@ -23,9 +23,6 @@
+ 
+ def do_setup():
+     kwargs = package_data.copy()
+-    extras = get_extras()
+-    if extras:
+-        kwargs['py_modules'] = extras
+     if sys.hexversion >= 0x02030000:    # Python 2.3
+         kwargs['classifiers'] = classifiers
+     else:
+@@ -53,7 +50,7 @@
+     'author_email': 'goodger at users.sourceforge.net',
+     'license': 'public domain, Python, BSD, GPL (see COPYING.txt)',
+     'platforms': 'OS-independent',
+-    'package_dir': {'docutils': 'docutils', '': 'extras'},
++    'package_dir': {'docutils': 'docutils'},
+     'packages': ['docutils',
+                  'docutils.languages',
+                  'docutils.parsers',
+@@ -84,6 +81,7 @@
+                      ['docutils/writers/s5_html/themes/README.txt']),]
+                    + s5_theme_files),
+     'scripts' : ['tools/rst2html.py',
++                 'tools/rstpep2html.py',
+                  'tools/rst2s5.py',
+                  'tools/rst2latex.py',
+                  'tools/rst2newlatex.py',
+@@ -120,29 +118,6 @@
+ """Trove classifiers for the Distutils "register" command;
+ Python 2.3 and up."""
+ 
+-extra_modules = [('optparse', '1.4.1', None),
+-                 ('textwrap', None, None),
+-                 ('roman', '1.4', ['toRoman', 'fromRoman',
+-                                   'InvalidRomanNumeralError'])]
+-"""Third-party modules to install if they're not already present.
+-List of (module name, minimum __version__ string, [attribute names])."""
+-
+-def get_extras():
+-    extras = []
+-    for module_name, version, attributes in extra_modules:
+-        try:
+-            module = __import__(module_name)
+-            if version and module.__version__ < version:
+-                raise ValueError
+-            for attribute in attributes or []:
+-                getattr(module, attribute)
+-            print ('"%s" module already present; ignoring extras/%s.py.'
+-                   % (module_name, module_name))
+-        except (ImportError, AttributeError, ValueError):
+-            extras.append(module_name)
+-    return extras
+-
+-
+ class dual_build_py(build_py):
+ 
+     """
+diff -urNad docutils-0.4~/setup_roman.py docutils-0.4/setup_roman.py
+--- docutils-0.4~/setup_roman.py	2006-07-02 17:20:58.000000000 +0100
++++ docutils-0.4/setup_roman.py	2006-07-02 17:22:10.018137952 +0100
+@@ -0,0 +1,21 @@
++#!/usr/bin/python
++# $Id: setup.py,v 1.9 2002/12/12 02:45:53 goodger Exp $
++
++from distutils.core import setup
++
++def do_setup():
++    dist = setup(
++          name = 'roman',
++          description = 'Python Roman-numbers library',
++          #long_description = '',
++          url = 'http://docutils.sourceforge.net/',
++          version = '0.2+',
++          author = 'Mark Pilgrim',
++          author_email = 'f8dy at diveintopython.org',
++          license = 'Python',
++          package_dir = {'': 'extras'},
++		  py_modules = ['roman'])
++    return dist
++
++if __name__ == '__main__' :
++    do_setup()

Propchange: packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/python-docutils/trunk/debian/patches/99_old-diffs.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/99_old-diffs.dpatch?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/patches/99_old-diffs.dpatch (added)
+++ packages/python-docutils/trunk/debian/patches/99_old-diffs.dpatch Sun Jul  2 17:07:14 2006
@@ -1,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_old-diffs.dpatch by Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Probably unnecessary? Were in Matthias' packaging
+
+ at DPATCH@
+
+--- python-docutils-0.4.orig/docutils/writers/pep_html/__init__.py
++++ python-docutils-0.4/docutils/writers/pep_html/__init__.py
+@@ -17,6 +17,7 @@
+ import docutils
+ from docutils import frontend, nodes, utils, writers
+ from docutils.writers import html4css1
++import optparse
+ 
+ 
+ class Writer(html4css1.Writer):
+--- python-docutils-0.4.orig/docutils/frontend.py
++++ python-docutils-0.4/docutils/frontend.py
+@@ -36,13 +36,9 @@
+ import ConfigParser as CP
+ import codecs
+ import docutils
+-try:
+-    import optparse
+-    from optparse import SUPPRESS_HELP
+-except ImportError:
+-    import optik as optparse
+-    from optik import SUPPRESS_HELP
+ 
++import optparse
++from optparse import SUPPRESS_HELP
+ 
+ def store_multiple(option, opt, value, parser, *args, **kwargs):
+     """

Added: packages/python-docutils/trunk/debian/python-docutils.copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/python-docutils.copyright?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/python-docutils.copyright (added)
+++ packages/python-docutils/trunk/debian/python-docutils.copyright Sun Jul  2 17:07:14 2006
@@ -1,0 +1,79 @@
+This package was debianized by Matthias Klose <doko at debian.org> on
+Sat, 12 Oct 2002 15:05:38 +0200. It was later maintained by Matthias
+Urlichs <smurf at noris.de> and is currently maintained by martin f. krafft
+<madduck at debian.org>, Simon McVittie <smcv at ianadd.pseudorandom.co.uk> and
+the Debian Python Modules team <python-modules-team at lists.alioth.debian.org>.
+
+It was downloaded from http://docutils.sourceforge.net/
+
+Upstream Author: David Goodger <goodger at users.sourceforge.net>
+
+Copyright:
+
+The files in this package, apart from the following, are in
+the public domain. The public domain dedication may be found below.
+
+* docutils/writers/s5_html/themes/default/iepngfix.htc
+
+      IE5.5+ PNG Alpha Fix v1.0 by Angus Turnbull
+      <http://www.twinhelix.com>.  Free usage permitted as long as
+      this notice remains intact.
+
+* /usr/share/emacs/site-lisp/rst.el
+
+      Copyright 2003-2006 by Martin Blais, Stefan Merten, and David Goodger.
+      This program is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License version 2,
+      as published by the Free Software Foundation.
+
+      This program is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+      GNU General Public License for more details.
+  
+      On Debian systems the text of the GNU General Public License version 2
+      can be found in /usr/share/common-licenses/GPL-2.
+
+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.
+
+Public Domain Dedication
+========================
+
+The persons who have associated their work with this project (the
+"Dedicator": David Goodger and the many contributors to the Docutils
+project) hereby dedicate the entire copyright, less the exceptions_
+listed below, in the work of authorship known as "Docutils" identified
+below (the "Work") to the public domain.
+
+The primary repository for the Work is the Internet World Wide Web
+site <http://docutils.sourceforge.net/>.  The Work consists of the
+files within the "docutils" module of the Docutils project Subversion
+repository (Internet host svn.berlios.de, filesystem path
+/svnroot/repos/docutils), whose Internet web interface is located at
+<http://svn.berlios.de/viewcvs/docutils/>.  Files dedicated to the
+public domain may be identified by the inclusion, near the beginning
+of each file, of a declaration of the form::
+
+    Copyright: This document/module/DTD/stylesheet/file/etc. has been
+               placed in the public domain.
+
+Dedicator makes this dedication for the benefit of the public at large
+and to the detriment of Dedicator's heirs and successors.  Dedicator
+intends this dedication to be an overt act of relinquishment in
+perpetuity of all present and future rights under copyright law,
+whether vested or contingent, in the Work.  Dedicator understands that
+such relinquishment of all rights includes the relinquishment of all
+rights to enforce (by lawsuit or otherwise) those copyrights in the
+Work.
+
+Dedicator recognizes that, once placed in the public domain, the Work
+may be freely reproduced, distributed, transmitted, used, modified,
+built upon, or otherwise exploited by anyone for any purpose,
+commercial or non-commercial, and in any way, including by methods
+that have not yet been invented or conceived.
+
+(This dedication is derived from the text of the `Creative Commons
+Public Domain Dedication
+<http://creativecommons.org/licenses/publicdomain>`_.)

Added: 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=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/python-docutils.manpages (added)
+++ packages/python-docutils/trunk/debian/python-docutils.manpages Sun Jul  2 17:07:14 2006
@@ -1,0 +1,1 @@
+debian/rst2html.1

Added: packages/python-docutils/trunk/debian/python-roman.copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/python-roman.copyright?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/python-roman.copyright (added)
+++ packages/python-docutils/trunk/debian/python-roman.copyright Sun Jul  2 17:07:14 2006
@@ -1,0 +1,261 @@
+This package was debianized by Matthias Klose <doko at debian.org> on
+Sat, 12 Oct 2002 15:05:38 +0200. It was later maintained by Matthias
+Urlichs <smurf at noris.de> and is currently maintained by martin f. krafft
+<madduck at debian.org>, Simon McVittie <smcv at ianadd.pseudorandom.co.uk> and
+the Debian Python Modules team <python-modules-team at lists.alioth.debian.org>.
+
+It was downloaded from http://docutils.sourceforge.net/
+
+roman.py, copyright by Mark Pilgrim, has been released under the
+Python 2.1.1 license. See the license from the python2.1 package.
+
+The Python 2.1 copyright notice is available as
+/usr/share/doc/python2.1/copyright on Debian systems;
+it is also reproduced below.
+
+Copyright notice (as found in LICENSE in the original source).
+--------------------------------------------------------------
+
+A. HISTORY OF THE SOFTWARE
+==========================
+
+Python was created in the early 1990s by Guido van Rossum at Stichting
+Mathematisch Centrum (CWI) in the Netherlands as a successor of a
+language called ABC.  Guido is Python's principal author, although it
+includes many contributions from others.  The last version released
+from CWI was Python 1.2.  In 1995, Guido continued his work on Python
+at the Corporation for National Research Initiatives (CNRI) in Reston,
+Virginia where he released several versions of the software.  Python
+1.6 was the last of the versions released by CNRI.  In 2000, Guido and
+the Python core development team moved to BeOpen.com to form the
+BeOpen PythonLabs team.  Python 2.0 was the first and only release
+from BeOpen.com.
+
+Following the release of Python 1.6, and after Guido van Rossum left
+CNRI to work with commercial software developers, it became clear that
+the ability to use Python with software available under the GNU Public
+License (GPL) was very desirable.  CNRI and the Free Software
+Foundation (FSF) interacted to develop enabling wording changes to the
+Python license.  Python 1.6.1 is essentially the same as Python 1.6,
+with a few minor bug fixes, and with a different license that enables
+later versions to be GPL-compatible.  Python 2.1 is a derivative work
+of Python 1.6.1, as well as of Python 2.0.
+
+After Python 2.0 was released by BeOpen.com, Guido van Rossum and the
+other PythonLabs developers joined Digital Creations.  All
+intellectual property added from this point on, starting with Python
+2.1 and its alpha and beta releases, is owned by the Python Software
+Foundation (PSF), a non-profit modeled after the Apache Software
+Foundation.  See http://www.python.org/psf/ for more information about
+the PSF.
+
+Thanks to the many outside volunteers who have worked under Guido's
+direction to make these releases possible.
+
+
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
+
+PSF LICENSE AGREEMENT
+---------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using Python 2.1 software in source or binary form and its
+associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 2.1
+alone or in any derivative version, provided, however, that PSF's
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+2001 Python Software Foundation; All Rights Reserved" are retained in
+Python 2.1 alone or in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 2.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 2.1.
+
+4. PSF is making Python 2.1 available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+2.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 2.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between PSF and Licensee.  This
+License Agreement does not grant permission to use PSF trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python 2.1, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0
+----------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions.  Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee.  This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party.  As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT
+-------------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee.  Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement.  This Agreement together with
+Python 1.6.1 may be located on the Internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013.  This
+Agreement may also be obtained from a proxy server on the Internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee.  This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+        ACCEPT
+
+
+CWI PERMISSIONS STATEMENT AND DISCLAIMER
+----------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands.  All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Added: packages/python-docutils/trunk/debian/python-roman.override
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/python-roman.override?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/python-roman.override (added)
+++ packages/python-docutils/trunk/debian/python-roman.override Sun Jul  2 17:07:14 2006
@@ -1,0 +1,1 @@
+python-roman: copyright-should-refer-to-common-license-file-for-gpl

Added: packages/python-docutils/trunk/debian/rst2html.1
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/rst2html.1?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/rst2html.1 (added)
+++ packages/python-docutils/trunk/debian/rst2html.1 Sun Jul  2 17:07:14 2006
@@ -1,0 +1,52 @@
+.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>

Added: packages/python-docutils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/rules?rev=1106&op=file
==============================================================================
--- packages/python-docutils/trunk/debian/rules (added)
+++ packages/python-docutils/trunk/debian/rules Sun Jul  2 17:07:14 2006
@@ -1,0 +1,139 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+export DH_PYCENTRAL=nomove
+
+p	= python-docutils
+d	= debian/$(p)
+PYTHON	= /usr/bin/python
+PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+
+BUILDHTML_DIRS := .
+BUILDHTML_RECURSE_DIRS := docs
+
+build: build-stamp
+build-stamp: patch
+	dh_testdir
+	$(PYTHON) setup.py build
+	$(PYTHON) setup_roman.py build
+	set -e && for dir in $(BUILDHTML_DIRS); do PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py --local --config=tools/docutils.conf $$dir --traceback; done
+	set -e && for dir in $(BUILDHTML_RECURSE_DIRS); do PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py --config=tools/docutils.conf $$dir --traceback; done
+	touch build-stamp
+
+clean: clean-patched unpatch
+
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	$(PYTHON) setup.py clean --all
+	-find -name '*.py[co]' | xargs rm -f
+	rm -f *.html
+	find docs -name '*.html' -not -name 'quickref.html' -print0 | xargs -0 --no-run-if-empty rm
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	-mkdir -p $(d)/usr/bin
+
+	: # Install Python files - all to python-docutils first, then sort
+	: # out roman.py afterwards (it looks simpler to do it separately,
+	: # but currently distutils ends up copying both roman and docutils
+	: # to both directories if you do)
+	@mkdir -p debian/tmp
+	$(PYTHON) setup.py install \
+	    --root debian/tmp --no-compile \
+	    	--install-lib /usr/share/pycentral/$(p)/site-packages \
+	    	--install-data /usr/share/pycentral/$(p)/site-packages \
+
+	$(PYTHON) setup_roman.py install \
+	    --root debian/tmp --no-compile \
+	    	--install-lib /usr/share/pycentral/$(p)/site-packages \
+	    	--install-data /usr/share/pycentral/$(p)/site-packages \
+
+	install -d debian/tmp/usr/share/pycentral/python-roman/site-packages
+	mv debian/tmp/usr/share/pycentral/python-docutils/site-packages/roman.py \
+		debian/tmp/usr/share/pycentral/python-roman/site-packages/roman.py
+
+	# Emacs: move files to site-start directory
+	install -d $(d)/usr/share/emacs/site-lisp
+	install -m644 tools/editors/emacs/rst.el $(d)/usr/share/emacs/site-lisp/rst.el
+
+	# ... and have it autoload rst-mode
+	install -d $(d)/etc/emacs/site-start.d/
+	install -m 644 debian/emacs-start.el \
+		$(d)/etc/emacs/site-start.d/50python-docutils.el
+
+	: # give scripts canonical names in /usr/bin
+	cd debian/tmp/usr/bin && \
+	mv rst2newlatex.py rst2newlatex && \
+	mv rst2html.py rst2html && \
+	mv rst2xml.py rst2xml && \
+	mv rst2s5.py rst2s5 && \
+	mv rst2pseudoxml.py rst2pseudoxml && \
+	mv rstpep2html.py rstpep2html && \
+	mv rst2latex.py rst2latex
+
+	install tools/buildhtml.py debian/tmp/usr/bin/rst-buildhtml
+
+	: # Install documentation
+	rm -f $(d)/usr/share/doc/$(p)/COPYING[-.]*
+	set -e && ( cd docs; find . -name SCCS -prune -o -type d -print ) | \
+		while read f ; do install -d $(d)/usr/share/doc/$(p)/docs/$$f ; done
+	set -e && ( cd docs; find . -name SCCS -prune -o -type f -print ) | \
+		while read f ; do install -o root -m 755 docs/$$f $(d)/usr/share/doc/$(p)/docs/$$f ; done
+	rm -f $(d)/usr/share/doc/$(p)/COPYING.txt
+	rm -f $(d)/usr/share/doc/$(p)/COPYING.html
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf
+
+	dh_installdocs *.txt *.html
+	set -e && ( cd docs; find . -name SCCS -prune -o -type d -print ) | \
+		while read f ; do install -d $(d)/usr/share/doc/$(p)/docs/$$f ; done
+	set -e && ( cd docs; find . -name SCCS -prune -o -type f -print ) | \
+		while read f ; do install -o root -m 755 docs/$$f $(d)/usr/share/doc/$(p)/docs/$$f ; done
+
+	dh_movefiles -ppython-roman \
+		usr/share/pycentral/python-roman
+	dh_movefiles -ppython-docutils \
+		usr/share/pycentral/python-docutils usr/bin
+
+	: # The license file for python-roman mentions the GPL
+	install -d debian/python-roman/usr/share/lintian/overrides
+	install -m644 debian/python-roman.override \
+		debian/python-roman/usr/share/lintian/overrides/python-roman
+
+	dh_pycentral
+	dh_python
+	dh_installexamples
+	dh_installman
+	set -e && for x in rst2latex rst2newlatex rst2html rst2pseudoxml \
+		rst2s5 rstpep2html rst2xml rst-buildhtml; do \
+			ln -sf rst2html.1.gz $(d)/usr/share/man/man1/$$x.1.gz; \
+	done
+	dh_installchangelogs
+	dh_compress -X.py -X.dtd -X.html
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

Propchange: packages/python-docutils/trunk/debian/rules
------------------------------------------------------------------------------
    svn:executable = *




More information about the Python-modules-commits mailing list