[Python-modules-commits] r30376 - in packages/sphinx/trunk/debian (4 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Sunday, August 31, 2014 @ 09:25:12
  Author: mitya57-guest
Revision: 30376

Drop sphinxcontrib_namespace.diff, all sphinxcontrib packages
are using dh_python2 now. Break old versions of issuetracker and
spelling packages.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/control
  packages/sphinx/trunk/debian/patches/series
Deleted:
  packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2014-08-31 09:13:51 UTC (rev 30375)
+++ packages/sphinx/trunk/debian/changelog	2014-08-31 09:25:12 UTC (rev 30376)
@@ -1,6 +1,9 @@
 sphinx (1.2.2+dfsg-4) UNRELEASED; urgency=medium
 
   * Build-depend on python3-whoosh, now when it is available.
+  * Drop sphinxcontrib_namespace.diff, all sphinxcontrib packages
+    are using dh_python2 now. Break old versions of issuetracker and
+    spelling packages.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Sun, 31 Aug 2014 13:13:23 +0400
 

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2014-08-31 09:13:51 UTC (rev 30375)
+++ packages/sphinx/trunk/debian/control	2014-08-31 09:25:12 UTC (rev 30376)
@@ -39,6 +39,9 @@
 Suggests:
   libjs-mathjax, dvipng,
   texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended
+Breaks:
+  python-sphinxcontrib.issuetracker (<< 0.11-1),
+  python-sphinxcontrib.spelling (<< 2.1.1-1)
 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.

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2014-08-31 09:13:51 UTC (rev 30375)
+++ packages/sphinx/trunk/debian/patches/series	2014-08-31 09:25:12 UTC (rev 30376)
@@ -1,6 +1,5 @@
 disable_distribute_setup.diff
 initialize_autodoc.diff
-sphinxcontrib_namespace.diff
 python3_test_build_dir.diff
 parallel_2to3.diff
 no_external_css.diff

Deleted: packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff	2014-08-31 09:13:51 UTC (rev 30375)
+++ packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff	2014-08-31 09:25:12 UTC (rev 30376)
@@ -1,30 +0,0 @@
-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
-@@ -39,6 +39,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):
-     """Sphinx build "main" command-line entry."""