[Python-modules-commits] [python-scrapy] 04/06: update patch description

[Vincent Cheng]

This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch master
in repository python-scrapy.

commit 4f9d4fcfd2b68e87b3fe09e7e9b4028cc249295a
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sun Jul 10 23:19:36 2016 -0700

    update patch description
---
 .../0003-add-patch-to-support-sphinx-1.4.patch     | 25 ++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0003-add-patch-to-support-sphinx-1.4.patch b/debian/patches/0003-add-patch-to-support-sphinx-1.4.patch
index 824a75b..497aa8b 100644
--- a/debian/patches/0003-add-patch-to-support-sphinx-1.4.patch
+++ b/debian/patches/0003-add-patch-to-support-sphinx-1.4.patch
@@ -1,8 +1,25 @@
-From 45edfb80aec1f8f81a15ea68ad22b9b01f34f36d Mon Sep 17 00:00:00 2001
-From: Vincent Cheng <vcheng at debian.org>
-Date: Sun, 10 Jul 2016 23:17:26 -0700
-Subject: add patch to support sphinx 1.4
+https://github.com/scrapy/scrapy/commit/a38a99e0e2f3d69bb7a7aa50403c7aef3854cf00
 
+From 1075587dbd15e5ccb9a83c4ca14086c1e135fe12 Mon Sep 17 00:00:00 2001
+From: Paul Tremberth <paul.tremberth at gmail.com>
+Date: Wed, 30 Mar 2016 14:31:10 +0200
+Subject: [PATCH] Add support for Sphinx 1.4
+
+See http://www.sphinx-doc.org/en/stable/changes.html#release-1-4-released-mar-28-2016
+
+sphinx_rtd_theme has become optional, needs to be added to reqs
+
+https://github.com/sphinx-doc/sphinx/pull/2320 changes node entries tuples
+to 5 values instead of 4
+
+`sh` syntax highlighting added very locally in selectors.rst
+because of this warning/error with Sphinx 1.4:
+
+```
+Warning, treated as error:
+/home/paul/src/scrapy/docs/topics/selectors.rst:743:
+WARNING: Could not lex literal_block as "python". Highlighting skipped.
+```
 ---
  docs/_ext/scrapydocs.py   | 4 ++--
  docs/topics/selectors.rst | 4 ++++

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-scrapy.git