[Python-modules-commits] r33385 - in packages/sphinx/trunk/debian (3 files)

[mitya57 at users.alioth.debian.org]

    Date: Saturday, July 18, 2015 @ 10:15:53
  Author: mitya57
Revision: 33385

Backport upstream patch to disable warning about renamed default theme
(no_theme_rename_warning.diff).

Added:
  packages/sphinx/trunk/debian/patches/no_theme_rename_warning.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2015-07-18 09:22:49 UTC (rev 33384)
+++ packages/sphinx/trunk/debian/changelog	2015-07-18 10:15:53 UTC (rev 33385)
@@ -1,6 +1,8 @@
 sphinx (1.3.1-3) UNRELEASED; urgency=medium
 
   * Update debian/TODO with the actual information.
+  * Backport upstream patch to disable warning about renamed default theme
+    (no_theme_rename_warning.diff).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 18 Jul 2015 12:22:01 +0300
 

Added: packages/sphinx/trunk/debian/patches/no_theme_rename_warning.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/no_theme_rename_warning.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/no_theme_rename_warning.diff	2015-07-18 10:15:53 UTC (rev 33385)
@@ -0,0 +1,25 @@
+Description: do not warn if theme is default
+Origin: upstream, https://github.com/sphinx-doc/sphinx/commit/034c4e942451fad4
+Last-Update: 2015-07-18
+
+--- a/sphinx/theming.py
++++ b/sphinx/theming.py
+@@ -101,11 +101,13 @@
+                                  '(missing theme.conf?)' % name)
+         self.name = name
+ 
+-        if name == 'default' and warn:
+-            warn("'default' html theme has been renamed to 'classic'. "
+-                 "Please change your html_theme setting either to "
+-                 "the new 'alabaster' default theme, or to 'classic' "
+-                 "to keep using the old default.")
++        # Do not warn yet -- to be compatible with old Sphinxes, people *have*
++        # to use "default".
++        # if name == 'default' and warn:
++        #     warn("'default' html theme has been renamed to 'classic'. "
++        #          "Please change your html_theme setting either to "
++        #          "the new 'alabaster' default theme, or to 'classic' "
++        #          "to keep using the old default.")
+ 
+         tdir, tinfo = self.themes[name]
+         if tinfo is None:

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2015-07-18 09:22:49 UTC (rev 33384)
+++ packages/sphinx/trunk/debian/patches/series	2015-07-18 10:15:53 UTC (rev 33385)
@@ -4,3 +4,4 @@
 disable_js_version_check.diff
 no_snowballstemmer.diff
 py35compat.diff
+no_theme_rename_warning.diff