[Python-modules-commits] r34060 - in packages/sip4/trunk/debian (5 files)

[mitya57 at users.alioth.debian.org]

    Date: Sunday, August 30, 2015 @ 19:39:18
  Author: mitya57
Revision: 34060

Build with Sphinx 1.3.

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/control
  packages/sip4/trunk/debian/patches/series
  packages/sip4/trunk/debian/rules
Deleted:
  packages/sip4/trunk/debian/patches/old_sphinx.diff

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2015-08-30 19:34:43 UTC (rev 34059)
+++ packages/sip4/trunk/debian/changelog	2015-08-30 19:39:18 UTC (rev 34060)
@@ -4,6 +4,9 @@
   * python-sip: Add Breaks against obsolete and buggy transitional
     package python-sip4-dbg to ensure its removal.  (Closes: #789452)
 
+  [ Dmitry Shachnev ]
+  * Build with Sphinx 1.3.
+
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 20 Jul 2015 22:28:06 +0300
 
 sip4 (4.16.9+dfsg-1) unstable; urgency=medium

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2015-08-30 19:34:43 UTC (rev 34059)
+++ packages/sip4/trunk/debian/control	2015-08-30 19:39:18 UTC (rev 34060)
@@ -12,7 +12,7 @@
                flex,
                python-all-dbg,
                python-all-dev (>= 2.7.2-5~),
-               python-sphinx (>= 1.0.7+dfsg),
+               python-sphinx (>= 1.3),
                python3-all-dbg,
                python3-all-dev (>= 3.3.2-5~)
 Standards-Version: 3.9.6

Deleted: packages/sip4/trunk/debian/patches/old_sphinx.diff
===================================================================
--- packages/sip4/trunk/debian/patches/old_sphinx.diff	2015-08-30 19:34:43 UTC (rev 34059)
+++ packages/sip4/trunk/debian/patches/old_sphinx.diff	2015-08-30 19:39:18 UTC (rev 34060)
@@ -1,17 +0,0 @@
-Description: support building with Sphinx 1.2 from Jessie
- This reverts upstream changeset 569a9695bc2f.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-03-27
-
---- a/sphinx/conf.py
-+++ b/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/sip4/trunk/debian/patches/series
===================================================================
--- packages/sip4/trunk/debian/patches/series	2015-08-30 19:34:43 UTC (rev 34059)
+++ packages/sip4/trunk/debian/patches/series	2015-08-30 19:39:18 UTC (rev 34060)
@@ -1,2 +1 @@
 siputils_debian_changes.diff
-old_sphinx.diff

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2015-08-30 19:34:43 UTC (rev 34059)
+++ packages/sip4/trunk/debian/rules	2015-08-30 19:39:18 UTC (rev 34060)
@@ -188,8 +188,6 @@
 # Build architecture independant packages using the common target.
 binary-indep:
 	sphinx-build sphinx debian/python-sip-doc/usr/share/doc/python-sip-doc/html
-	# Temporary hack to use upstream stylesheet with Sphinx 1.2
-	cd debian/python-sip-doc/usr/share/doc/python-sip-doc/html/_static && mv classic.css default.css
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.