[Python-modules-commits] r22874 - in packages/python-docutils/trunk/debian (5 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Sat Nov 3 15:52:40 UTC 2012
Date: Saturday, November 3, 2012 @ 15:52:38
Author: jwilk
Revision: 22874
Drop dep8.diff; it's no longer needed.
Modified:
packages/python-docutils/trunk/debian/changelog
packages/python-docutils/trunk/debian/patches/series
packages/python-docutils/trunk/debian/tests/python-docutils
packages/python-docutils/trunk/debian/tests/python3-docutils
Deleted:
packages/python-docutils/trunk/debian/patches/dep8.diff
Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog 2012-11-02 21:02:20 UTC (rev 22873)
+++ packages/python-docutils/trunk/debian/changelog 2012-11-03 15:52:38 UTC (rev 22874)
@@ -1,8 +1,11 @@
python-docutils (0.9.1-2) UNRELEASED; urgency=low
* Install all DTD files (really closes: #531170).
+ * Fix DEP-8 tests:
+ + Drop dep8.diff; it's no longer needed (closes: #692127). Thanks to
+ Dmitry Shachnev for the bug report.
- -- Jakub Wilk <jwilk at debian.org> Sun, 01 Jul 2012 14:16:29 +0200
+ -- Jakub Wilk <jwilk at debian.org> Sat, 03 Nov 2012 16:37:11 +0100
python-docutils (0.9.1-1) experimental; urgency=low
Deleted: packages/python-docutils/trunk/debian/patches/dep8.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/dep8.diff 2012-11-02 21:02:20 UTC (rev 22873)
+++ packages/python-docutils/trunk/debian/patches/dep8.diff 2012-11-03 15:52:38 UTC (rev 22874)
@@ -1,193 +0,0 @@
-Description: update paths for DEP-8 tests
- Update paths in various test files for the purpose of automated automatic
- as-installed testing for Debian packages (see DEP-8).
- .
- This patch must not be applied when building the package!
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-04-25
-
---- a/test/functional/expected/compact_lists.html
-+++ b/test/functional/expected/compact_lists.html
-@@ -5,7 +5,7 @@
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
- <title></title>
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- </head>
- <body>
- <div class="document">
---- a/test/functional/expected/dangerous.html
-+++ b/test/functional/expected/dangerous.html
-@@ -5,7 +5,7 @@
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
- <title></title>
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- </head>
- <body>
- <div class="document">
---- a/test/functional/expected/field_name_limit.html
-+++ b/test/functional/expected/field_name_limit.html
-@@ -5,7 +5,7 @@
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
- <title></title>
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- </head>
- <body>
- <div class="document">
---- a/test/functional/expected/math_output_html.html
-+++ b/test/functional/expected/math_output_html.html
-@@ -5,8 +5,8 @@
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
- <title>Mathematics</title>
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/math.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/math.css" type="text/css" />
- </head>
- <body>
- <div class="document" id="mathematics">
---- a/test/functional/expected/math_output_latex.html
-+++ b/test/functional/expected/math_output_latex.html
-@@ -5,7 +5,7 @@
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
- <title>Mathematics</title>
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- </head>
- <body>
- <div class="document" id="mathematics">
---- a/test/functional/expected/math_output_mathjax.html
-+++ b/test/functional/expected/math_output_mathjax.html
-@@ -6,7 +6,7 @@
- <meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
- <title>Mathematics</title>
- <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- </head>
- <body>
- <div class="document" id="mathematics">
---- a/test/functional/expected/math_output_mathml.xhtml
-+++ b/test/functional/expected/math_output_mathml.xhtml
-@@ -5,7 +5,7 @@
- <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
- <meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
- <title>Mathematics</title>
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- </head>
- <body>
- <div class="document" id="mathematics">
---- a/test/functional/expected/pep_html.html
-+++ b/test/functional/expected/pep_html.html
-@@ -10,7 +10,7 @@
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Docutils 0.9: http://docutils.sourceforge.net/" />
- <title>PEP 100 -- Test PEP</title>
-- <link rel="stylesheet" href="../../../docutils/writers/pep_html/pep.css" type="text/css" />
-+ <link rel="stylesheet" href="/usr/share/docutils/writers/pep_html/pep.css" type="text/css" />
- </head>
- <body bgcolor="white">
- <table class="navigation" cellpadding="0" cellspacing="0"
---- a/test/functional/expected/standalone_rst_html4css1.html
-+++ b/test/functional/expected/standalone_rst_html4css1.html
-@@ -13,7 +13,7 @@
- <meta content="reStructuredText, test, parser" name="keywords" />
- <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" />
- <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- </head>
- <body>
- <div class="header">
---- a/test/functional/expected/standalone_rst_s5_html_1.html
-+++ b/test/functional/expected/standalone_rst_s5_html_1.html
-@@ -8,7 +8,7 @@
- <title>Slide Shows</title>
- <meta name="author" content="David Goodger" />
- <meta name="date" content="2005-11-28" />
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- <!-- configuration parameters -->
- <meta name="defaultView" content="slideshow" />
- <meta name="controlVis" content="hidden" />
---- a/test/functional/expected/standalone_rst_s5_html_2.html
-+++ b/test/functional/expected/standalone_rst_s5_html_2.html
-@@ -8,7 +8,7 @@
- <title>Slide Shows</title>
- <meta name="author" content="David Goodger" />
- <meta name="date" content="2005-11-28" />
--<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- <!-- configuration parameters -->
- <meta name="defaultView" content="slideshow" />
- <meta name="controlVis" content="hidden" />
---- a/test/functional/tests/math_output_html.py
-+++ b/test/functional/tests/math_output_html.py
-@@ -11,6 +11,6 @@
-
- settings_overrides['math_output'] = 'HTML'
- settings_overrides['stylesheet_path'] = (
-- '../docutils/writers/html4css1/html4css1.css, '
-- '../docutils/writers/html4css1/math.css ')
-+ '/usr/share/docutils/writers/html4css1/html4css1.css, '
-+ '/usr/share/docutils/writers/html4css1/math.css ')
-
---- a/test/test_writers/test_html4css1_template.py
-+++ b/test/test_writers/test_html4css1_template.py
-@@ -55,7 +55,7 @@
-
-
- stylesheet = """\
--<link rel="stylesheet" href="../docutils/writers/html4css1/html4css1.css" type="text/css" />"""
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />"""
-
-
- body_prefix = """\
-@@ -112,7 +112,7 @@
-
-
- stylesheet = """\
--<link rel="stylesheet" href="../docutils/writers/html4css1/html4css1.css" type="text/css" />"""
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />"""
-
-
- body_prefix = """\
---- a/test/test_writers/test_s5.py
-+++ b/test/test_writers/test_s5.py
-@@ -48,7 +48,7 @@
- <meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/" />
- <meta name="version" content="S5 1.1" />
- <title>Show Title</title>
--<link rel="stylesheet" href="../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- <!-- configuration parameters -->
- <meta name="defaultView" content="slideshow" />
- <meta name="controlVis" content="hidden" />
-@@ -113,7 +113,7 @@
- <meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/" />
- <meta name="version" content="S5 1.1" />
- <title>Bogus Slide Show</title>
--<link rel="stylesheet" href="../docutils/writers/html4css1/html4css1.css" type="text/css" />
-+<link rel="stylesheet" href="/usr/share/docutils/writers/html4css1/html4css1.css" type="text/css" />
- <!-- configuration parameters -->
- <meta name="defaultView" content="outline" />
- <meta name="controlVis" content="visible" />
---- a/test/test_dependencies.py
-+++ b/test/test_dependencies.py
-@@ -27,6 +27,7 @@
- 'default-stylesheet': u'../docutils/writers/html4css1/html4css1.css',
- }
-
-+paths['default-stylesheet'] = '/usr/share/docutils/writers/html4css1/html4css1.css'
-
- class RecordDependenciesTests(unittest.TestCase):
-
Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series 2012-11-02 21:02:20 UTC (rev 22873)
+++ packages/python-docutils/trunk/debian/patches/series 2012-11-03 15:52:38 UTC (rev 22874)
@@ -6,4 +6,3 @@
parallel-2to3.diff
test-sys-path.diff
move-data-to-usr-share.diff
-# dep8.diff
Modified: packages/python-docutils/trunk/debian/tests/python-docutils
===================================================================
--- packages/python-docutils/trunk/debian/tests/python-docutils 2012-11-02 21:02:20 UTC (rev 22873)
+++ packages/python-docutils/trunk/debian/tests/python-docutils 2012-11-03 15:52:38 UTC (rev 22874)
@@ -1,7 +1,6 @@
#!/bin/sh
set -e -u
cp -r docs/ test/ "$ADTTMP"
-cat debian/patches/dep8.diff | (cd "$ADTTMP" && patch -p1)
cd "$ADTTMP/test/"
pyversions -i \
| tr ' ' '\n' \
Modified: packages/python-docutils/trunk/debian/tests/python3-docutils
===================================================================
--- packages/python-docutils/trunk/debian/tests/python3-docutils 2012-11-02 21:02:20 UTC (rev 22873)
+++ packages/python-docutils/trunk/debian/tests/python3-docutils 2012-11-03 15:52:38 UTC (rev 22874)
@@ -1,7 +1,6 @@
#!/bin/sh
set -e -u
python3 setup.py build -b "$ADTTMP"
-cat debian/patches/dep8.diff | (cd "$ADTTMP/lib/test/" && patch -p2)
cd "$ADTTMP/lib/"
rm -rf docutils* roman* tools
cd test/
More information about the Python-modules-commits
mailing list