Hello. sphinx version in testing (0.4.1-2) has serious bug (#492732), and there is already new upstream version in unstable (0.4.2-1). Please allow uploading backport of fix (0.4.1-2lenny1) to the t-p-u for the package. Debdiff is attached. --
Attachment:
pgp8Z9VklpdKr.pgp
Description: PGP signature
diff -u sphinx-0.4.1/debian/changelog sphinx-0.4.1/debian/changelog
--- sphinx-0.4.1/debian/changelog
+++ sphinx-0.4.1/debian/changelog
@@ -1,3 +1,12 @@
+sphinx (0.4.1-2lenny1) testing-proposed-updates; urgency=medium
+
+ * Backported fix for broken show-inheritance in automodule from 0.4.2
+ (Closes: #492732).
+ * Fixed lintian warning: using libjs-jquery instead of bundled jQuery.
+ * Urgency medium, fixes RC bug.
+
+ -- Mikhail Gusarov <dottedmag@dottedmag.net> Sun, 03 Aug 2008 15:25:49 +0700
+
sphinx (0.4.1-2) unstable; urgency=low
* debian/control: sphinx is not compatible with python 2.3, so
diff -u sphinx-0.4.1/debian/rules sphinx-0.4.1/debian/rules
--- sphinx-0.4.1/debian/rules
+++ sphinx-0.4.1/debian/rules
@@ -1,18 +1,20 @@
#!/usr/bin/make -f
# -*- makefile -*-
+include /usr/share/quilt/quilt.make
+
PACKAGE_NAME=python-sphinx
build: build-stamp
-build-stamp:
+build-stamp: patch
dh_testdir
mkdir -p _build/html
python sphinx-build.py doc _build/html
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
@@ -43,6 +45,11 @@
dh_installman
dh_pycentral
dh_compress -X.py -X.js -X.rst -X.json -X.doctree -X.txt
+ ln -sf /usr/share/javascript/jquery/jquery.js \
+ $(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/doc/python-sphinx/html/_static/jquery.js
+ ln -sf /usr/share/javascript/jquery/jquery.js \
+ $(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/pyshared/sphinx/static/jquery.js
+ dh_link
dh_fixperms
dh_installdeb
dh_gencontrol
diff -u sphinx-0.4.1/debian/control sphinx-0.4.1/debian/control
--- sphinx-0.4.1/debian/control
+++ sphinx-0.4.1/debian/control
@@ -4,7 +4,7 @@
Maintainer: Mikhail Gusarov <dottedmag@dottedmag.net>
Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Homepage: http://sphinx.pocoo.org/
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6c5)
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6c5), quilt, libjs-jquery
Build-Depends-Indep: python-central (>= 0.5.6), python-docutils, python-pygments (>= 0.8), python-jinja (>= 1.0)
Standards-Version: 3.8.0
XS-Python-Version: >=2.4
only in patch2:
unchanged:
--- sphinx-0.4.1.orig/debian/patches/fix-472732.diff
+++ sphinx-0.4.1/debian/patches/fix-472732.diff
@@ -0,0 +1,12 @@
+--- sphinx/ext/autodoc.py (revision 64795)
++++ sphinx/ext/autodoc.py (revision 64803)
+@@ -548,7 +548,8 @@
+
+ def setup(app):
+ mod_options = {'members': members_option, 'undoc-members': directives.flag,
+- 'noindex': directives.flag}
++ 'noindex': directives.flag, 'inherited-members': directives.flag,
++ 'show-inheritance': directives.flag}
+ cls_options = {'members': members_option, 'undoc-members': directives.flag,
+ 'noindex': directives.flag, 'inherited-members': directives.flag,
+ 'show-inheritance': directives.flag}
only in patch2:
unchanged:
--- sphinx-0.4.1.orig/debian/patches/series
+++ sphinx-0.4.1/debian/patches/series
@@ -0,0 +1 @@
+fix-472732.diff