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

[mitya57 at users.alioth.debian.org]

    Date: Sunday, August 30, 2015 @ 19:41:36
  Author: mitya57
Revision: 34061

Build with Sphinx 1.3.

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

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2015-08-30 19:39:18 UTC (rev 34060)
+++ packages/python-qt4/trunk/debian/changelog	2015-08-30 19:41:36 UTC (rev 34061)
@@ -1,6 +1,7 @@
 python-qt4 (4.11.4+dfsg-2) UNRELEASED; urgency=medium
 
   * Add explicit build-dependency on dh-python.
+  * Build with Sphinx 1.3.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 20 Aug 2015 13:01:12 +0300
 

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2015-08-30 19:39:18 UTC (rev 34060)
+++ packages/python-qt4/trunk/debian/control	2015-08-30 19:41:36 UTC (rev 34061)
@@ -30,7 +30,7 @@
                python-sip-dev (>= 4.16.4),
                python3-sip-dbg,
                python3-sip-dev (>= 4.16.4),
-               python-sphinx (>= 1.0.7+dfsg-1~)
+               python-sphinx (>= 1.3)
 Build-Conflicts: python3.2-dev (<< 3.2.3-8~), python2.7-dev (<< 2.7.5-2~)
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.4

Deleted: packages/python-qt4/trunk/debian/patches/old_sphinx.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/old_sphinx.diff	2015-08-30 19:39:18 UTC (rev 34060)
+++ packages/python-qt4/trunk/debian/patches/old_sphinx.diff	2015-08-30 19:41:36 UTC (rev 34061)
@@ -1,20 +0,0 @@
-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-08-30 19:39:18 UTC (rev 34060)
+++ packages/python-qt4/trunk/debian/patches/series	2015-08-30 19:41:36 UTC (rev 34061)
@@ -1,4 +1,3 @@
 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-08-30 19:39:18 UTC (rev 34060)
+++ packages/python-qt4/trunk/debian/rules	2015-08-30 19:41:36 UTC (rev 34061)
@@ -244,8 +244,6 @@
 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