[Python-apps-commits] r9067 - in packages/alot/trunk/debian/patches (3 files)

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

    Date: Sunday, August 26, 2012 @ 00:57:57
  Author: laarmen-guest
Revision: 9067

Replace the patch deleting a file by a temporary patch disabling the use
of this file.

Added:
  packages/alot/trunk/debian/patches/0005-patch-out-_templates.patch
Modified:
  packages/alot/trunk/debian/patches/series
Deleted:
  packages/alot/trunk/debian/patches/0002-Remove-unused-template.patch

Deleted: packages/alot/trunk/debian/patches/0002-Remove-unused-template.patch
===================================================================
--- packages/alot/trunk/debian/patches/0002-Remove-unused-template.patch	2012-08-25 18:44:57 UTC (rev 9066)
+++ packages/alot/trunk/debian/patches/0002-Remove-unused-template.patch	2012-08-26 00:57:57 UTC (rev 9067)
@@ -1,19 +0,0 @@
-Description: Remove the old template
- It was an old default that wasn't up-to-date. Since there was no
- customization, the best bet is to entirely remove it to avoid having the issue
- next time Sphinx changes something.
-Author: Simon Chopin <chopin.simon at gmail.com>
-Bug: http://github.com/pazz/alot/issues/503
-diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html
-deleted file mode 100644
-index b4384e4..0000000
---- a/docs/source/_templates/layout.html
-+++ /dev/null
-@@ -1,7 +0,0 @@
--{% extends "!layout.html" %}
--{% set script_files = [] %}
--
--{% block linktags %}{% endblock %}
--{% block relbar1 %}{% endblock %}
--{% block footer %}{% endblock %}
--{% block relbaritems %}{% endblock %}

Added: packages/alot/trunk/debian/patches/0005-patch-out-_templates.patch
===================================================================
--- packages/alot/trunk/debian/patches/0005-patch-out-_templates.patch	                        (rev 0)
+++ packages/alot/trunk/debian/patches/0005-patch-out-_templates.patch	2012-08-26 00:57:57 UTC (rev 9067)
@@ -0,0 +1,18 @@
+Description: Remove the _template directory from the sphinx configuration.
+ It was an old default that wasn't up-to-date. Since there was no
+ customization, the best bet is to entirely remove it to avoid having the issue
+ next time Sphinx changes something. This patch is NOT the one upstreamed but
+ is only a workaround until the next release.
+Author: Simon Chopin <chopin.simon at gmail.com>
+Bug: http://github.com/pazz/alot/issues/503
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -57,7 +57,7 @@
+ 
+ 
+ # Add any paths that contain templates here, relative to this directory.
+-templates_path = ['_templates']
++templates_path = []
+ 
+ # The suffix of source filenames.
+ source_suffix = '.rst'

Modified: packages/alot/trunk/debian/patches/series
===================================================================
--- packages/alot/trunk/debian/patches/series	2012-08-25 18:44:57 UTC (rev 9066)
+++ packages/alot/trunk/debian/patches/series	2012-08-26 00:57:57 UTC (rev 9067)
@@ -1,4 +1,4 @@
 0001-Add-a-hidden-TOC-for-the-manpage.patch
-0002-Remove-unused-template.patch
 0003-Replace-non-ascii-char.patch
 0004-enable-doc-sidebar
+0005-patch-out-_templates.patch