diff -Nru python-docutils-0.8.1/debian/changelog python-docutils-0.8.1/debian/changelog --- python-docutils-0.8.1/debian/changelog 2011-12-18 00:03:00.000000000 +0400 +++ python-docutils-0.8.1/debian/changelog 2012-08-19 11:41:51.000000000 +0400 @@ -1,3 +1,74 @@ +python-docutils (0.8.1-8ubuntu1) quantal; urgency=low + + * Resynchronize with Debian unstable (LP: #1038470), remaining change: + - Use dh_python2 instead of dh_pysupport + + -- Dmitry Shachnev Sat, 18 Aug 2012 20:16:07 +0400 + +python-docutils (0.8.1-8) unstable; urgency=low + + * Install all DTD files (really closes: #531170). + + -- Jakub Wilk Wed, 04 Jul 2012 14:07:30 +0200 + +python-docutils (0.8.1-7) unstable; urgency=low + + * Rebuild against debhelper (>= 9.20120528) to fix postinst that + unconditionally overwrites files in /etc (see: #477751, closes: #675489). + Thanks to Helmut Grohne for the bug report. + + -- Jakub Wilk Fri, 01 Jun 2012 18:20:46 +0200 + +python-docutils (0.8.1-6) unstable; urgency=low + + * Fix a typo in a patch description. + * Bump standards version to 3.9.3 (no changes needed). + * Don't mention “Dive Into Python” in python*-roman package descriptions + (closes: #661555). Thanks to Konrad Schöbel for the bug report. + * Remove references to http://diveintopython.org/ from debian/copyright. + * Do not skip tests because of failed imports, as they should never happen. + (no-test-skipping.diff) + * Check only *.py files when looking for unguarded use of __file__. + * Fix paths in the auto-generated manual pages. + * Split section “Usage” into “Synopsis” and “Description” in the manual + pages. + * Fool DocutilsXMLTestCase into thinking that Python version is 2.7.3/3.2.3 + when it's in fact 2.7.2/3.2.2 with patched + xml.dom.minidom.Document.toprettyxml() method (closes: #645369). + (fix-docutilsxmltestcase.diff). + + -- Jakub Wilk Sat, 03 Mar 2012 01:40:35 +0100 + +python-docutils (0.8.1-5) unstable; urgency=low + + [ Simon McVittie ] + * Remove myself from Uploaders + + [ Jakub Wilk ] + * Backport upstream patch to follow the changes in the + xml.dom.minidom.Document.toprettyxml method + (fix-docutilsxmltestcase.diff). + * Drop postinst snippet to deal with a python-support bug (it cannot replace + directory with a regular file). It was needed only for 0.7 upgrades. + * Suggest fonts-linuxlibertine as an alternative to ttf-linux-libertine. + * Update David Goodger's e-mail address in debian/copyright + (closes: #653769). Thanks to Jari Aalto for the bug report. + * Update Subversion repository URLs in patch headers (so that they point to + SourceForge rather than BerliOS). + * Use xargs to iterate over all Python versions. + * Convert rst2odt_prepstyles manpage source from DocBook to + reStructuredText. + + Remove docbook-to-man from Build-Depends-Indep. + + Update debian/rules. + * Don't run dh_testroot in the clean target. There's a good chance that root + privileges are not needed (e.g. because binary target was run under + fakeroot), and even if they are actually needed, the target will fail + quickly. + * Drop obsolete virtual package: docutils-writer-manpage (closes: #631066). + * Run tests with --verbose. + + -- Jakub Wilk Wed, 15 Feb 2012 19:21:26 +0100 + python-docutils (0.8.1-4ubuntu1) precise; urgency=low * Build using dh_python2 @@ -9,7 +80,7 @@ python-docutils (0.8.1-4) unstable; urgency=low * When running the test suite, don't copy stdout and stderr output to a log - file, as this would break under LC_ALL=C, PYTHONWARNING=d and python3.X + file, as this would break under LC_ALL=C, PYTHONWARNINGS=d and python3.X (testall-no-stdout-stderr-redirect.diff). * Use build/py2 and build/py3 for build directories. * Remove excessive whitespace from debian/control. diff -Nru python-docutils-0.8.1/debian/control python-docutils-0.8.1/debian/control --- python-docutils-0.8.1/debian/control 2011-12-17 18:11:35.000000000 +0400 +++ python-docutils-0.8.1/debian/control 2012-08-19 11:45:39.000000000 +0400 @@ -1,26 +1,24 @@ Source: python-docutils Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Jakub Wilk , martin f. krafft , - Simon McVittie , Michael Schutte , Ben Finney Build-Depends: debhelper (>= 7) Build-Depends-Indep: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), - docbook-to-man, xml-core -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 X-Python-Version: >= 2.3 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-docutils/trunk/ Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-docutils/trunk/ Homepage: http://docutils.sourceforge.net/ Package: python-docutils -Provides: docutils, - docutils-writer-manpage +Provides: docutils Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-roman, @@ -30,7 +28,7 @@ libpaper-utils, python-lxml, docutils-doc (= ${source:Version}) -Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, ttf-linux-libertine +Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, fonts-linuxlibertine | ttf-linux-libertine Conflicts: python-odtwriter, docutils-writer-odt Replaces: python-odtwriter, @@ -61,7 +59,7 @@ Conflicts: python-docutils (<< 0.7-3~), python-odtwriter, docutils-writer-odt -Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, docutils-doc, ttf-linux-libertine +Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, fonts-linuxlibertine | ttf-linux-libertine, docutils-doc Description: text processing system for reStructuredText (implemented in Python 3) reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax and parser system. It is useful for in-line program documentation @@ -122,10 +120,6 @@ 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. - . This package includes Python 2 modules. Package: python3-roman @@ -136,8 +130,4 @@ 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. - . This package includes Python 3 modules. diff -Nru python-docutils-0.8.1/debian/copyright python-docutils-0.8.1/debian/copyright --- python-docutils-0.8.1/debian/copyright 2011-09-03 03:26:38.000000000 +0400 +++ python-docutils-0.8.1/debian/copyright 2012-08-18 20:12:46.000000000 +0400 @@ -11,7 +11,7 @@ It was downloaded from http://docutils.sourceforge.net/ -Upstream Author: David Goodger +Upstream Author: David Goodger Most of the files included in this project have been placed in the public domain, and therefore have no license requirements and no restrictions on @@ -146,8 +146,7 @@ Copyright © 2001 Mark Pilgrim This program is part of "Dive Into Python", a free Python tutorial for - experienced programmers. Visit http://diveintopython.org/ for the - latest version. + experienced programmers. This program is free software; you can redistribute it and/or modify it under the terms of the Python 2.1.1 license, available at diff -Nru python-docutils-0.8.1/debian/docutils-common.install python-docutils-0.8.1/debian/docutils-common.install --- python-docutils-0.8.1/debian/docutils-common.install 2011-08-22 00:20:16.000000000 +0400 +++ python-docutils-0.8.1/debian/docutils-common.install 2012-08-18 20:12:46.000000000 +0400 @@ -1,4 +1,4 @@ /usr/share/docutils/ tools/editors/emacs/rst.el usr/share/emacs/site-lisp debian/50python-docutils.el etc/emacs/site-start.d -docs/ref/docutils.dtd usr/share/xml/docutils/ +docs/ref/*.dtd usr/share/xml/docutils/ diff -Nru python-docutils-0.8.1/debian/patches/add-missing-import.diff python-docutils-0.8.1/debian/patches/add-missing-import.diff --- python-docutils-0.8.1/debian/patches/add-missing-import.diff 2011-10-24 00:01:26.000000000 +0400 +++ python-docutils-0.8.1/debian/patches/add-missing-import.diff 2012-08-18 20:12:46.000000000 +0400 @@ -1,6 +1,6 @@ Description: Add missing import. -Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/docutils/frontend.py?r1=7071&r2=7196 -Last-Update: 2011-10-23 +Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/frontend.py?r1=7071&r2=7196 +Last-Update: 2011-12-31 --- a/docutils/frontend.py +++ b/docutils/frontend.py diff -Nru python-docutils-0.8.1/debian/patches/disable-DocutilsXMLTestCase.diff python-docutils-0.8.1/debian/patches/disable-DocutilsXMLTestCase.diff --- python-docutils-0.8.1/debian/patches/disable-DocutilsXMLTestCase.diff 2011-12-17 23:54:22.000000000 +0400 +++ python-docutils-0.8.1/debian/patches/disable-DocutilsXMLTestCase.diff 1970-01-01 03:00:00.000000000 +0300 @@ -1,90 +0,0 @@ -Index: python-docutils-0.8.1/test/test_writers/test_docutils_xml.py -=================================================================== ---- python-docutils-0.8.1.orig/test/test_writers/test_docutils_xml.py 2009-04-01 20:00:21.000000000 +0000 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,85 +0,0 @@ --#!/usr/bin/env python -- --# $Id: test_docutils_xml.py 5889 2009-04-01 20:00:21Z gbrandl $ --# Author: Lea Wiemann --# Copyright: This module has been placed in the public domain. -- --""" --Test for docutils XML writer. --""" -- --from __init__ import DocutilsTestSupport -- --import docutils --import docutils.core --from docutils._compat import b -- -- --class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase): -- -- input = b("""\ --Test -- ------------ -- --Test. \xc3\xa4\xc3\xb6\xc3\xbc\xe2\x82\xac""") -- xmldecl = b('\n') -- doctypedecl = b('\n') -- generatedby = b('\n' % docutils.__version__) -- bodynormal = b('TestTest. \xe4\xf6\xfc€') -- bodynewlines = b("""\ -- -- --Test -- -- -- --Test. \xe4\xf6\xfc€ -- -- --""") -- bodyindents = b("""\ -- -- -- Test -- -- -- -- Test. \xe4\xf6\xfc€ -- -- --""") -- -- def test_publish(self): -- settings = {'input_encoding': 'utf8', -- 'output_encoding': 'iso-8859-1', -- '_disable_config': 1} -- for settings['newlines'] in 0, 1: -- for settings['indents'] in 0, 1: -- for settings['xml_declaration'] in 0, 1: -- for settings['doctype_declaration'] in 0, 1: -- -- expected = b('') -- if settings['xml_declaration']: -- expected += self.xmldecl -- if settings['doctype_declaration']: -- expected += self.doctypedecl -- expected += self.generatedby -- if settings['indents']: -- expected += self.bodyindents -- elif settings['newlines']: -- expected += self.bodynewlines -- else: -- expected += self.bodynormal -- -- self.assertEqual(docutils.core.publish_string -- (source=self.input, -- reader_name='standalone', -- writer_name='docutils_xml', -- settings_overrides=settings), -- expected) -- -- --if __name__ == '__main__': -- import unittest -- unittest.main() diff -Nru python-docutils-0.8.1/debian/patches/fix-docutilsxmltestcase-debian.diff python-docutils-0.8.1/debian/patches/fix-docutilsxmltestcase-debian.diff --- python-docutils-0.8.1/debian/patches/fix-docutilsxmltestcase-debian.diff 1970-01-01 03:00:00.000000000 +0300 +++ python-docutils-0.8.1/debian/patches/fix-docutilsxmltestcase-debian.diff 2012-08-18 20:12:46.000000000 +0400 @@ -0,0 +1,26 @@ +Description: Forge sys.version_info for DocutilsXMLTestCase. + Fool DocutilsXMLTestCase into thinking that Python version is 2.7.3/3.2.3 when + it's in fact 2.7.2/3.2.2 with patched xml.dom.minidom.Document.toprettyxml() + method. +Author: Jakub Wilk +Bug-Debian: http://bugs.debian.org/645369 +Forwarded: not-needed +Last-Update: 2012-03-03 + +--- a/test/test_writers/test_docutils_xml.py ++++ b/test/test_writers/test_docutils_xml.py +@@ -15,6 +15,14 @@ + import docutils.core + from docutils._compat import b + ++if sys.version_info[:3] in [(2, 7, 2), (3, 2, 2)]: ++ import xml.dom.minidom as minidom ++ if minidom.parseString('z').toprettyxml() == '\n\n\tz\n\n': ++ sys_version_info = sys.version_info[:2] + (3, 'candidate', 0) ++ class sys: ++ version_info = sys_version_info ++ del sys_version_info ++ del minidom + + class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase): + diff -Nru python-docutils-0.8.1/debian/patches/fix-docutilsxmltestcase.diff python-docutils-0.8.1/debian/patches/fix-docutilsxmltestcase.diff --- python-docutils-0.8.1/debian/patches/fix-docutilsxmltestcase.diff 1970-01-01 03:00:00.000000000 +0300 +++ python-docutils-0.8.1/debian/patches/fix-docutilsxmltestcase.diff 2012-08-18 20:12:46.000000000 +0400 @@ -0,0 +1,62 @@ +Description: Follow the changes in xml.dom.minidom.Document.toprettyxml(). + xml.dom.minidom.Document.toprettyxml() has change behaviour in Python 2.7.3 + and 3.3.3. See http://bugs.python.org/issue4147 for details. + . + This patch updates DocutilsXMLTestCase to cope with these changes. +Origin: backport, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/test/test_writers/test_docutils_xml.py?r1=7221&r2=7226 +Bug: http://sourceforge.net/tracker/?func=detail&aid=3423983&group_id=38414&atid=422030 +Bug-Debian: http://bugs.debian.org/645369 +Last-Update: 2011-12-31 + +--- a/test/test_writers/test_docutils_xml.py ++++ b/test/test_writers/test_docutils_xml.py +@@ -10,6 +10,7 @@ + + from __init__ import DocutilsTestSupport + ++import sys + import docutils + import docutils.core + from docutils._compat import b +@@ -29,6 +30,13 @@ + bodynormal = b('TestTest. \xe4\xf6\xfc€') + bodynewlines = b("""\ + ++Test ++ ++Test. \xe4\xf6\xfc€ ++ ++""") ++ bodynewlines_old = b("""\ ++ + + Test + +@@ -40,6 +48,13 @@ + """) + bodyindents = b("""\ + ++ Test ++ ++ Test. \xe4\xf6\xfc€ ++ ++""") ++ bodyindents_old = b("""\ ++ + + Test + +@@ -79,6 +94,13 @@ + settings_overrides=settings), + expected) + ++ # New formatting introduced in versions 2.7.3 and 3.2.3 on 2011-11-18 ++ # to fix http://bugs.python.org/issue4147 ++ if (sys.version_info < (2, 7, 3) or ++ sys.version_info[0] == 3 and sys.version_info < (3, 2, 3)): ++ bodynewlines = bodynewlines_old ++ bodyindents = bodyindents_old ++ + + if __name__ == '__main__': + import unittest diff -Nru python-docutils-0.8.1/debian/patches/fix-error-reporting-encoding-issues.diff python-docutils-0.8.1/debian/patches/fix-error-reporting-encoding-issues.diff --- python-docutils-0.8.1/debian/patches/fix-error-reporting-encoding-issues.diff 2011-10-24 00:05:50.000000000 +0400 +++ python-docutils-0.8.1/debian/patches/fix-error-reporting-encoding-issues.diff 2012-08-18 20:12:46.000000000 +0400 @@ -1,6 +1,6 @@ Description: Fix encoding issues in error reporting for Python 3. -Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/docutils/error_reporting.py?r1=7073&r2=7196 -Last-Update: 2011-10-23 +Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/error_reporting.py?r1=7073&r2=7196 +Last-Update: 2011-12-31 --- a/docutils/error_reporting.py +++ b/docutils/error_reporting.py diff -Nru python-docutils-0.8.1/debian/patches/fix-io-encoding-issues.diff python-docutils-0.8.1/debian/patches/fix-io-encoding-issues.diff --- python-docutils-0.8.1/debian/patches/fix-io-encoding-issues.diff 2011-10-24 01:06:12.000000000 +0400 +++ python-docutils-0.8.1/debian/patches/fix-io-encoding-issues.diff 2012-08-18 20:12:46.000000000 +0400 @@ -1,7 +1,7 @@ Description: Fix encoding issues in file I/O for Python 3. Bug: http://sourceforge.net/tracker/?func=detail&aid=3395948&group_id=38414&atid=422030 -Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/docutils/io.py?r1=7073&r2=7196 -Last-Update: 2011-10-23 +Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/io.py?r1=7073&r2=7196 +Last-Update: 2011-12-31 --- a/docutils/io.py +++ b/docutils/io.py diff -Nru python-docutils-0.8.1/debian/patches/no-test-skipping.diff python-docutils-0.8.1/debian/patches/no-test-skipping.diff --- python-docutils-0.8.1/debian/patches/no-test-skipping.diff 1970-01-01 03:00:00.000000000 +0300 +++ python-docutils-0.8.1/debian/patches/no-test-skipping.diff 2012-08-18 20:12:46.000000000 +0400 @@ -0,0 +1,17 @@ +Description: Do not skip tests. + If Build-Depends are satisfied, importing ElementTree should not fail. If it + does, it's better to fail than to skip the test silently. +Author: Jakub Wilk +Forwarded: not-needed +Last-Update: 2012-03-02 + +--- a/test/test_writers/test_odt.py ++++ b/test/test_writers/test_odt.py +@@ -74,6 +74,7 @@ + from elementtree import ElementTree as etree + WhichElementTree = 'elementtree' + except ImportError, e: ++ raise + s1 = '\nSkipped test of odf_odt writer. ' \ + 'In order to test odf_odt writer ' \ + 'must install either a version of Python containing ' \ diff -Nru python-docutils-0.8.1/debian/patches/series python-docutils-0.8.1/debian/patches/series --- python-docutils-0.8.1/debian/patches/series 2011-12-17 23:53:36.000000000 +0400 +++ python-docutils-0.8.1/debian/patches/series 2012-08-19 11:43:04.000000000 +0400 @@ -9,5 +9,7 @@ add-missing-import.diff fix-error-reporting-encoding-issues.diff fix-io-encoding-issues.diff +fix-docutilsxmltestcase.diff +fix-docutilsxmltestcase-debian.diff +no-test-skipping.diff move-data-to-usr-share.diff -disable-DocutilsXMLTestCase.diff diff -Nru python-docutils-0.8.1/debian/patches/testall-no-stdout-stderr-redirect.diff python-docutils-0.8.1/debian/patches/testall-no-stdout-stderr-redirect.diff --- python-docutils-0.8.1/debian/patches/testall-no-stdout-stderr-redirect.diff 2011-09-18 04:30:39.000000000 +0400 +++ python-docutils-0.8.1/debian/patches/testall-no-stdout-stderr-redirect.diff 2012-08-18 20:12:46.000000000 +0400 @@ -1,6 +1,6 @@ Description: Don't copy test suite output to a log. When running the test suite, don't copy stdout and stderr output to a log - file, as this would break under LC_ALL=C, PYTHONWARNING=d and python3.X. + file, as this would break under LC_ALL=C, PYTHONWARNINGS=d and python3.X. Author: Jakub Wilk Forwarded: not-needed Last-Update: 2011-09-18 diff -Nru python-docutils-0.8.1/debian/python-docutils.postinst python-docutils-0.8.1/debian/python-docutils.postinst --- python-docutils-0.8.1/debian/python-docutils.postinst 2011-08-22 20:38:52.000000000 +0400 +++ python-docutils-0.8.1/debian/python-docutils.postinst 2012-08-18 20:12:46.000000000 +0400 @@ -1,19 +1,6 @@ #!/bin/sh set -e -# python-support prior to 1.0.14 doesn't correctly handle replacing directory -# with a regular file. The following snippet works around this bug: -if [ "$1" = configure ] -then - for pydir in /usr/lib/pymodules/python2.*/ - do - if [ -d $pydir/docutils-0.7.egg-info/ ] - then - rm -rf $pydir/docutils-0.7.egg-info/ - fi - done -fi - if [ "$1" = configure ] then for exe in /usr/share/docutils/scripts/python2/* diff -Nru python-docutils-0.8.1/debian/rst2odt_prepstyles.sgml python-docutils-0.8.1/debian/rst2odt_prepstyles.sgml --- python-docutils-0.8.1/debian/rst2odt_prepstyles.sgml 2009-12-07 04:48:26.000000000 +0300 +++ python-docutils-0.8.1/debian/rst2odt_prepstyles.sgml 1970-01-01 03:00:00.000000000 +0300 @@ -1,62 +0,0 @@ - - - - rst2odt_prepstyles - 1 - July 2008 - - odtwriter - - - - rst2odt_prepstyles - strip paper size specifications off of rst2odt stylesheets - - - - - rst2odt_prepstyles - FILE - - - - - DESCRIPTION - - - rst2odt(1) uses a stylesheet file as a template - for the ODT files it creates. The stock - styles.odt file shipped with it comes without - page dimensions. When rst2odt is run and - detects that there no paper size is given in the stylesheet, it is - automatically determined using paperconf(1). - - - - When editing stylesheets with OpenOffice.org Writer (or similar - programs), the resulting files always carry a page size. - rst2odt respects this setting and ensures that - documents processed with custom stylesheets look the same - regardless of the host it is running on. If you want to get the - original behavior, i.e. a system-dependent paper size, you can run - rst2odt_prepstyles over your custom stylesheet. - Remember to re-run the command whenever you change the file with a - word processor. - - - - - AUTHOR - - - odtwriter is Copyright © 2006-2008 Dave Kuhlman - <dkuhlman@rexx.com> - - - - This manual page was written by Michael Schutte for the Debian - GNU/Linux system (but may be used by others). - - - - diff -Nru python-docutils-0.8.1/debian/rst2odt_prepstyles.txt python-docutils-0.8.1/debian/rst2odt_prepstyles.txt --- python-docutils-0.8.1/debian/rst2odt_prepstyles.txt 1970-01-01 03:00:00.000000000 +0300 +++ python-docutils-0.8.1/debian/rst2odt_prepstyles.txt 2012-08-18 20:12:46.000000000 +0400 @@ -0,0 +1,38 @@ +================== +rst2odt_prepstyles +================== + +---------------------------------------------------------- +strip paper size specifications off of rst2odt stylesheets +---------------------------------------------------------- + +:Manual section: 1 +:Manual group: text processing + +Synopsis +======== +**rst2odt_prepstyles** *FILE* + +Description +=========== + +**rst2odt**\(1) uses a stylesheet file as a template for the ODT files it +creates. The stock **styles.odt** file shipped with it comes without page +dimensions. When **rst2odt** is run and detects that there no paper size is +given in the stylesheet, it is automatically determined using +**paperconf**\(1). + +When editing stylesheets with OpenOffice.org Writer (or similar programs), the +resulting files always carry a page size. **rst2odt** respects this setting +and ensures that documents processed with custom stylesheets look the same +regardless of the host it is running on. If you want to get the original +behavior, i.e. a system-dependent paper size, you can run +**rst2odt_prepstyles** over your custom stylesheet. Remember to re-run the +command whenever you change the file with a word processor. + +Author +====== +odtwriter is Copyright © 2006-2008 Dave Kuhlman + +This manual page was written by Michael Schutte for the Debian GNU/Linux system +(but may be used by others). diff -Nru python-docutils-0.8.1/debian/rules python-docutils-0.8.1/debian/rules --- python-docutils-0.8.1/debian/rules 2011-12-17 18:11:54.000000000 +0400 +++ python-docutils-0.8.1/debian/rules 2012-08-19 11:41:51.000000000 +0400 @@ -20,11 +20,14 @@ pre_strip_images2 = 's,([^]*\bsrc="http://[^"]+"[^>]*>,$$1,g;' pre_strip_images = $(pre_strip_images1)$(pre_strip_images2) +python_all = pyversions -r $(CURDIR)/debian/control | tr ' ' '\n' | xargs -t -I {} env {} +python3_all = $(patsubst py%,py3%,$(python_all)) + build build-indep: build-stamp build-stamp: dh_testdir # Check if move-data-to-usr-share.diff is up-to-date - if grep -r __file__ docutils/ | grep -vw _datadir; then \ + if grep -r __file__ --include='*.py' docutils/ | grep -vw _datadir; then \ echo "Error: Some uses of __file__ are not guarded by _datadir()." \ "Is move-data-to-usr-share.diff up-to-date?"; \ exit 1; \ @@ -35,15 +38,9 @@ python3 setup.py build --build-lib=build/py3/ ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) # Run test suite for Python 2.X: - set -ex && cd build/py2/ && \ - for python in $(shell pyversions -r); do \ - $$python ../../test/alltests.py; \ - done + cd build/py2/ && $(python_all) ../../test/alltests.py --verbose # Run test suite for Python 3.X: - set -ex && cd build/py3/ && \ - for python in $(shell py3versions -r); do \ - $$python test/alltests.py; \ - done + cd build/py3/ && $(python3_all) test/alltests.py --verbose endif # Build documentation: PYTHONPATH=.:extras python tools/buildhtml.py \ @@ -58,7 +55,6 @@ clean: dh_testdir - dh_testroot rm -f build-stamp rm -rf build/ find -name '*.py[co]' -delete @@ -104,13 +100,20 @@ PYTHONPATH=.:extras; \ export PYTHONPATH; \ cp debian/$$exe.txt debian/tmp/man/$$exe.txt; \ - python debian/tmp/usr/share/docutils/scripts/python2/$$exe --help \ + python debian/tmp/usr/share/docutils/scripts/python2/$$exe --help | \ + sed \ + -e '1 s/^Usage$$/Synopsis/' \ + -e 's/^=/====/' \ + -e '3 s/^ //' \ + -e '4 a Description' \ + -e '4 a ===========' \ >> debian/tmp/man/$$exe.txt;\ python tools/rst2man.py debian/tmp/man/$$exe.txt \ debian/tmp/man/$$exe.1; \ done - docbook-to-man debian/rst2odt_prepstyles.sgml > \ + PYTHONPATH=.:extras python tools/rst2man.py debian/rst2odt_prepstyles.txt \ debian/tmp/man/rst2odt_prepstyles.1 + sed -i -e 's,"\(docutils/writers/\),"/usr/share/\1,g' debian/tmp/man/* # Build architecture-independent files here. binary-indep: build install