[Python-modules-commits] r33101 - in packages/python-scrapy/trunk/debian (3 files)

[yoh at users.alioth.debian.org]

    Date: Thursday, June 25, 2015 @ 15:49:38
  Author: yoh
Revision: 33101

added patch changeset_48582be.diff to "cherry-pick" 48582be (DOC(ENH): specify path to rtd theme explicitly)

Added:
  packages/python-scrapy/trunk/debian/patches/changeset_48582be.diff
Modified:
  packages/python-scrapy/trunk/debian/changelog
  packages/python-scrapy/trunk/debian/patches/series

Modified: packages/python-scrapy/trunk/debian/changelog
===================================================================
--- packages/python-scrapy/trunk/debian/changelog	2015-06-25 15:49:33 UTC (rev 33100)
+++ packages/python-scrapy/trunk/debian/changelog	2015-06-25 15:49:38 UTC (rev 33101)
@@ -14,16 +14,16 @@
     - minimal required version of w3lib boosted to 1.8
     - Build-Depends on python-setuptools and python-sphinx-rtd-theme
     - boost policy to 3.9.6
-  * debian/patches
-    - debian/patches/changeset_49fe915.diff
-      do not ignore failure to build docs
   * debian/copyright
     - moved verbatim of BSD-3 and MIT licenses into separate paragraphs
       for reuse
   * debian/python-scrapy-doc.doc-base
     - removed obsolete reference to /experimental/*.html
+  * debian/patches (sent upstream)
+    - changeset_48582be.diff - explicit path to RTD sphinx theme
+    - changeset_49fe915.diff - do not ignore failed docs build
 
- -- Yaroslav Halchenko <debian at onerussian.com>  Thu, 25 Jun 2015 10:21:18 -0400
+ -- Yaroslav Halchenko <debian at onerussian.com>  Thu, 25 Jun 2015 10:53:02 -0400
 
 python-scrapy (0.24.2-1) unstable; urgency=medium
 

Added: packages/python-scrapy/trunk/debian/patches/changeset_48582be.diff
===================================================================
--- packages/python-scrapy/trunk/debian/patches/changeset_48582be.diff	                        (rev 0)
+++ packages/python-scrapy/trunk/debian/patches/changeset_48582be.diff	2015-06-25 15:49:38 UTC (rev 33101)
@@ -0,0 +1,17 @@
+From: Yaroslav Halchenko <debian at onerussian.com>
+Subject: DOC(ENH): specify path to rtd theme explicitly
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -108,7 +108,10 @@ html_theme = 'sphinx_rtd_theme'
+ #html_theme_options = {}
+ 
+ # Add any paths that contain custom themes here, relative to this directory.
+-#html_theme_path = []
++# Add path to the RTD explicitly to robustify builds (otherwise might
++# fail in a clean Debian build env)
++import sphinx_rtd_theme
++html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+ 
+ 
+ # The style sheet to use for HTML and HTML Help pages. A file of that name

Modified: packages/python-scrapy/trunk/debian/patches/series
===================================================================
--- packages/python-scrapy/trunk/debian/patches/series	2015-06-25 15:49:33 UTC (rev 33100)
+++ packages/python-scrapy/trunk/debian/patches/series	2015-06-25 15:49:38 UTC (rev 33101)
@@ -1 +1,2 @@
+changeset_48582be.diff
 changeset_49fe915.diff