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

[mitya57-guest at users.alioth.debian.org]

    Date: Saturday, July 26, 2014 @ 11:50:04
  Author: mitya57-guest
Revision: 29937

Exclude non-free biohazard.swf file from the tarball and
from the testsuite.

Added:
  packages/python-docutils/trunk/debian/patches/delete-swf-file.diff
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/copyright
  packages/python-docutils/trunk/debian/patches/series

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2014-07-26 11:49:04 UTC (rev 29936)
+++ packages/python-docutils/trunk/debian/changelog	2014-07-26 11:50:04 UTC (rev 29937)
@@ -1,4 +1,4 @@
-python-docutils (0.12-1) UNRELEASED; urgency=medium
+python-docutils (0.12+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop python3.3-odt-writer.diff, applied upstream.
@@ -7,6 +7,8 @@
     than sf.php.
   * Add explicit build-dependency on dh-python.
   * Convert debian/changelog to copyright format 1.0.
+  * Exclude non-free biohazard.swf file from the tarball and
+    from the testsuite.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 26 Jul 2014 13:59:54 +0400
 

Modified: packages/python-docutils/trunk/debian/copyright
===================================================================
--- packages/python-docutils/trunk/debian/copyright	2014-07-26 11:49:04 UTC (rev 29936)
+++ packages/python-docutils/trunk/debian/copyright	2014-07-26 11:50:04 UTC (rev 29937)
@@ -1,4 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Files-Excluded: docs/user/rst/images/biohazard.swf
 
 Files: *
 Copyright: Public domain

Added: packages/python-docutils/trunk/debian/patches/delete-swf-file.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/delete-swf-file.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/delete-swf-file.diff	2014-07-26 11:50:04 UTC (rev 29937)
@@ -0,0 +1,44 @@
+Description: remove SWF images test, we do not ship biohazard.swf
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Last-Update: 2014-07-26
+
+--- a/test/functional/expected/standalone_rst_html4css1.html
++++ b/test/functional/expected/standalone_rst_html4css1.html
+@@ -135,7 +135,6 @@
+ <li><a class="reference internal" href="#list-tables" id="id72">2.22   List Tables</a></li>
+ <li><a class="reference internal" href="#custom-roles" id="id73">2.23   Custom Roles</a></li>
+ <li><a class="reference internal" href="#svg-images" id="id74">2.24   SVG Images</a></li>
+-<li><a class="reference internal" href="#swf-images" id="id75">2.25   SWF Images</a></li>
+ </ul>
+ </li>
+ <li><a class="reference internal" href="#error-handling" id="id76">3   Error Handling</a></li>
+@@ -1120,19 +1119,6 @@
+ <p class="caption">SVG image in a figure.</p>
+ </div>
+ </div>
+-<div class="section" id="swf-images">
+-<h2><a class="toc-backref" href="#id75">2.25   SWF Images</a></h2>
+-<p>Shockwave Flash is an image/movie format that most modern web browsers
+-support via a plugin. It is sometimes blocked due to privacy/security
+-concerns.</p>
+-<p>Images with extension <tt class="docutils literal">.swf</tt> are placed inside <object> elements.
+-For complete control over display options use raw HTML.</p>
+-<object class="align-left" data="../../../docs/user/rst/images/biohazard.swf" style="width: 4cm; height: 2em;" type="application/x-shockwave-flash">
+-[biohazard.swf]</object>
+-<p>An SWF image in a  4 cm x 2 em box, left aligned.</p>
+-<p>An inline SWF image <object data="../../../docs/user/rst/images/biohazard.swf" style="width: 0.8em; height: 0.8em;" type="application/x-shockwave-flash">inline-swf</object> scaled to 0.8 em x 0.8 em.</p>
+-</div>
+-</div>
+ <div class="section" id="error-handling">
+ <h1><a class="toc-backref" href="#id76">3   Error Handling</a></h1>
+ <p>Any errors caught during processing will generate system messages.</p>
+--- a/test/functional/input/standalone_rst_html4css1.txt
++++ b/test/functional/input/standalone_rst_html4css1.txt
+@@ -6,7 +6,6 @@
+ .. include:: data/list_table.txt
+ .. include:: data/custom_roles.txt
+ .. include:: data/svg_images.txt
+-.. include:: data/swf_images.txt
+ .. include:: data/errors.txt
+ 
+ .. footer:: |valid-xhtml10| |valid-CSS2|

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2014-07-26 11:49:04 UTC (rev 29936)
+++ packages/python-docutils/trunk/debian/patches/series	2014-07-26 11:50:04 UTC (rev 29937)
@@ -10,3 +10,4 @@
 no-local-roman.diff
 rst2odt_prepstyles-elementtree.diff
 odt-writer-ascii-filenames.diff
+delete-swf-file.diff