[Python-modules-commits] r19401 - in packages/sphinx/branches/1.1/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Monday, November 21, 2011 @ 13:05:48
  Author: jwilk
Revision: 19401

Merge 1.0 -> 1.1.

Added:
  packages/sphinx/branches/1.1/debian/patches/sphinxcontrib_namespace.diff
    (from rev 19400, packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff)
Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/control
  packages/sphinx/branches/1.1/debian/patches/series

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2011-11-21 12:58:04 UTC (rev 19400)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-11-21 13:05:48 UTC (rev 19401)
@@ -1,3 +1,12 @@
+sphinx (1.1.2+dfsg-2) UNRELEASED; urgency=low
+
+  * Add sphinxcontrib_namespace.diff: create namespace package
+    ‘sphinxcontrib’. This allows python-sphinxcontrib.* packages, both those
+    using dh_python2 and those using python-support, to be co-importable.
+  * Add various texlive-* to Suggests.
+
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 21 Nov 2011 14:01:06 +0100
+
 sphinx (1.1.2+dfsg-1) experimental; urgency=low
 
   * New upstream release (closes: #649048).

Modified: packages/sphinx/branches/1.1/debian/control
===================================================================
--- packages/sphinx/branches/1.1/debian/control	2011-11-21 12:58:04 UTC (rev 19400)
+++ packages/sphinx/branches/1.1/debian/control	2011-11-21 13:05:48 UTC (rev 19401)
@@ -32,7 +32,8 @@
   sphinx-common (= ${source:Version})
 Recommends: python (>= 2.6) | python-simplejson, python-imaging,
  sphinx-doc
-Suggests: jsmath
+Suggests: jsmath,
+  texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended
 Description: documentation generator for Python projects (implemented in Python 2)
  Sphinx is a tool for producing documentation for Python projects, using
  reStructuredText as markup language.
@@ -56,7 +57,9 @@
   python3-jinja2 (>= 2.3),
   sphinx-common (= ${source:Version})
 Recommends: python3-imaging
-Suggests: jsmath, sphinx-doc
+Suggests: jsmath,
+  texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended,
+  sphinx-doc
 Description: documentation generator for Python projects (implemented in Python 3)
  Sphinx is a tool for producing documentation for Python projects, using
  reStructuredText as markup language.

Modified: packages/sphinx/branches/1.1/debian/patches/series
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/series	2011-11-21 12:58:04 UTC (rev 19400)
+++ packages/sphinx/branches/1.1/debian/patches/series	2011-11-21 13:05:48 UTC (rev 19401)
@@ -2,3 +2,4 @@
 unversioned_grammar_pickle.diff
 show_more_stack_frames.diff
 merge_debian_manpages.diff
+sphinxcontrib_namespace.diff

Copied: packages/sphinx/branches/1.1/debian/patches/sphinxcontrib_namespace.diff (from rev 19400, packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff)
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/sphinxcontrib_namespace.diff	                        (rev 0)
+++ packages/sphinx/branches/1.1/debian/patches/sphinxcontrib_namespace.diff	2011-11-21 13:05:48 UTC (rev 19401)
@@ -0,0 +1,30 @@
+Description: Create namespace package ‘sphinxcontrib’.
+ Create namespace package ‘sphinxcontrib’. This allows python-sphinxcontrib.*
+ packages, both those using dh_python2 and those using python-support, to be
+ co-importable.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+Last-Update: 2011-11-20
+
+--- a/sphinx/__init__.py
++++ b/sphinx/__init__.py
+@@ -32,6 +32,19 @@
+     except Exception:
+         pass
+ 
++def _create_sphinext_namespace():
++    # Create namespace package "sphinxcontrib".
++    import pkgutil
++    module_type = type(sys)
++    try:
++        sphinxcontrib = sys.modules['sphinxcontrib']
++    except LookupError:
++        sphinxcontrib = module_type('sphinxcontrib')
++        sphinxcontrib.__path__ = []
++        sys.modules[sphinxcontrib.__name__] = sphinxcontrib
++    sphinxcontrib.__path__ = pkgutil.extend_path(sphinxcontrib.__path__, sphinxcontrib.__name__)
++
++_create_sphinext_namespace()
+ 
+ def main(argv=sys.argv):
+     if sys.version_info[:3] < (2, 4, 0):