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

[mitya57 at users.alioth.debian.org]

    Date: Saturday, June 13, 2015 @ 12:30:05
  Author: mitya57
Revision: 32972

Add a temporary hack to use upstream stylesheet when building the
documentation with Sphinx 1.2.

Added:
  packages/python-qt4/trunk/debian/patches/old_sphinx.diff
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/patches/series
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2015-06-13 12:22:20 UTC (rev 32971)
+++ packages/python-qt4/trunk/debian/changelog	2015-06-13 12:30:05 UTC (rev 32972)
@@ -4,6 +4,8 @@
     - pyuic now sorts imported modules (closes: #787250).
   * Drop remove_timestamps.diff, applied upstream.
   * Bump the required sip version to 4.16.4.
+  * Add a temporary hack to use upstream stylesheet when building the
+    documentation with Sphinx 1.2.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 13 Jun 2015 15:17:18 +0300
 

Added: packages/python-qt4/trunk/debian/patches/old_sphinx.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/old_sphinx.diff	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/old_sphinx.diff	2015-06-13 12:30:05 UTC (rev 32972)
@@ -0,0 +1,20 @@
+Description: support building with Sphinx 1.2
+ This reverts upstream changeset 265be2eab2fa.
+ .
+ When Sphinx 1.3 reaches unstable, this patch should be removed
+ together with the hack in debian/rules.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-06-13
+
+--- a/doc/sphinx/conf.py
++++ b/doc/sphinx/conf.py
+@@ -91,7 +91,7 @@
+ 
+ # The theme to use for HTML and HTML Help pages.  Major themes that come with
+ # Sphinx are currently 'default' and 'sphinxdoc'.
+-html_theme = 'classic'
++html_theme = 'default'
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2015-06-13 12:22:20 UTC (rev 32971)
+++ packages/python-qt4/trunk/debian/patches/series	2015-06-13 12:30:05 UTC (rev 32972)
@@ -1,3 +1,4 @@
 debian_configure_changes.diff
 qreal_float_support.diff
 config_flags.diff
+old_sphinx.diff

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2015-06-13 12:22:20 UTC (rev 32971)
+++ packages/python-qt4/trunk/debian/rules	2015-06-13 12:30:05 UTC (rev 32972)
@@ -244,6 +244,8 @@
 ifeq (,$(findstring -a, $(DH_OPTIONS)))
 	sphinx-build $(CURDIR)/doc/sphinx \
 	$(CURDIR)/debian/python-qt4-doc/usr/share/doc/python-qt4-doc/html
+	# Temporary hack to use upstream stylesheet with Sphinx 1.2
+	cd $(CURDIR)/debian/python-qt4-doc/usr/share/doc/python-qt4-doc/html/_static && mv classic.css default.css
 	dh_sphinxdoc
 endif
 	dh_sip