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

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Tue Nov 1 18:40:50 UTC 2011 

    Date: Tuesday, November 1, 2011 @ 18:40:48
  Author: jwilk
Revision: 19137

New upstream release.

Added:
  packages/sphinx/branches/1.1/debian/patches/py3k_custom_fixers.diff
Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/patches/series
Deleted:
  packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch
  packages/sphinx/branches/1.1/debian/patches/sphinx-apidoc_script.diff

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2011-11-01 18:30:18 UTC (rev 19136)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-11-01 18:40:48 UTC (rev 19137)
@@ -1,11 +1,12 @@
-sphinx (1.1+dfsg-1) UNRELEASED; urgency=low
+sphinx (1.1.1+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
     + Drop autosummary_1.0.6.patch for the time being (reopens: #611078).
     + Drop docstring_parse.diff, applied upstream.
     + Rename disable_ez_setup.diff to disable_distribute_setup.diff.
-    + Update move_static_files_outside_site-packages.patch to take care of
-      sphinx.websupport.
+    + Drop move_static_files_outside_site-packages.patch. Most of it was
+      applied upstream, the remaining bits are now taken care of in
+      debian/rules.
     + Refresh other patches.
     + Update integration tests for the JavaScript code.
     + Bump minimum required versions:
@@ -18,7 +19,6 @@
   * Texinfo output format is now supported (closes: #586747).
   * Update version numbers in the manual pages. Add a build-time warning to be
     emitted if they ever get out of date again.
-  * Copy sphinx-apidoc script from upstream VCS.
   * Rephrase short package description, so that it's... shorter.
   * New binary package: sphinx-common, containing manual pages, templates,
     translations and other data files.
@@ -51,8 +51,10 @@
     + Use ‘set -x’ for all for loops.
     + Run nosetests with --verbose --no-skip.
   * Use XS-Python-Version instead of debian/pyversions.
+  * Copy custom_fixers modules from the upstream VCS. (It was accidentally
+    omitted form the upstream tarball.)
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 22:48:04 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 01 Nov 2011 19:27:41 +0100
 
 sphinx (1.0.8+dfsg-2) unstable; urgency=low
 

Deleted: packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch	2011-11-01 18:30:18 UTC (rev 19136)
+++ packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch	2011-11-01 18:40:48 UTC (rev 19137)
@@ -1,54 +0,0 @@
-Description: Move static files outside site-packages so that they can be shared
-  between different Python versions.
-Forwarded: no
-Last-Update: 2011-10-15
-
---- a/sphinx/pycode/__init__.py
-+++ b/sphinx/pycode/__init__.py
-@@ -11,6 +11,7 @@
- 
- from os import path
- 
-+from sphinx import package_dir
- from sphinx.errors import PycodeError
- from sphinx.pycode import nodes
- from sphinx.pycode.pgen2 import driver, token, tokenize, parse, literals
-@@ -20,7 +21,7 @@
- 
- 
- # load the Python grammar
--_grammarfile = path.join(path.dirname(__file__), 'Grammar.txt')
-+_grammarfile = path.join(package_dir, 'pycode', 'Grammar.txt')
- pygrammar = driver.load_grammar(_grammarfile)
- pydriver = driver.Driver(pygrammar, convert=nodes.convert)
- 
---- a/sphinx/ext/autosummary/generate.py
-+++ b/sphinx/ext/autosummary/generate.py
-@@ -27,6 +27,7 @@
- from jinja2 import FileSystemLoader, TemplateNotFound
- from jinja2.sandbox import SandboxedEnvironment
- 
-+from sphinx import package_dir
- from sphinx.ext.autosummary import import_by_name, get_documenter
- from sphinx.jinja2glue import BuiltinTemplateLoader
- from sphinx.util.osutil import ensuredir
-@@ -78,7 +79,7 @@
-         sources = [os.path.join(base_path, filename) for filename in sources]
- 
-     # create our own templating environment
--    template_dirs = [os.path.join(os.path.dirname(__file__), 'templates')]
-+    template_dirs = [os.path.join(package_dir, 'ext', 'autosummary', 'templates')]
-     if builder is not None:
-         # allow the user to override the templates
-         template_loader = BuiltinTemplateLoader()
---- a/sphinx/websupport/__init__.py
-+++ b/sphinx/websupport/__init__.py
-@@ -87,7 +87,7 @@
- 
-     def _init_templating(self):
-         import sphinx
--        template_path = path.join(path.dirname(sphinx.__file__),
-+        template_path = path.join(sphinx.package_dir,
-                                   'themes', 'basic')
-         loader = FileSystemLoader(template_path)
-         self.template_env = Environment(loader=loader)

Added: packages/sphinx/branches/1.1/debian/patches/py3k_custom_fixers.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/py3k_custom_fixers.diff	                        (rev 0)
+++ packages/sphinx/branches/1.1/debian/patches/py3k_custom_fixers.diff	2011-11-01 18:40:48 UTC (rev 19137)
@@ -0,0 +1,26 @@
+Description: Re-add custom_fixed module, that was accidentally omittem from 
+ Re-add custom_fixed module, that was accidentally omittem from the upstream
+ tarball.
+Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/src/1.1.1/custom_fixers/fix_alt_unicode.py
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/809/custom_fixers-missing
+Forwarded: not-needed
+
+--- /dev/null
++++ b/custom_fixers/fix_alt_unicode.py
+@@ -0,0 +1,12 @@
++from lib2to3.fixer_base import BaseFix
++from lib2to3.fixer_util import Name
++
++class FixAltUnicode(BaseFix):
++    PATTERN = """
++    func=funcdef< 'def' name='__unicode__'
++                  parameters< '(' NAME ')' > any+ >
++    """
++
++    def transform(self, node, results):
++        name = results['name']
++        name.replace(Name('__str__', prefix=name.prefix))
+--- /dev/null
++++ b/custom_fixers/__init__.py
+@@ -0,0 +1 @@
++#

Modified: packages/sphinx/branches/1.1/debian/patches/series
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/series	2011-11-01 18:30:18 UTC (rev 19136)
+++ packages/sphinx/branches/1.1/debian/patches/series	2011-11-01 18:40:48 UTC (rev 19137)
@@ -1,6 +1,5 @@
 disable_distribute_setup.diff
-move_static_files_outside_site-packages.patch
 unversioned_grammar_pickle.diff
 show_more_stack_frames.diff
-sphinx-apidoc_script.diff
 merge_debian_manpages.diff
+py3k_custom_fixers.diff

Deleted: packages/sphinx/branches/1.1/debian/patches/sphinx-apidoc_script.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/sphinx-apidoc_script.diff	2011-11-01 18:30:18 UTC (rev 19136)
+++ packages/sphinx/branches/1.1/debian/patches/sphinx-apidoc_script.diff	2011-11-01 18:40:48 UTC (rev 19137)
@@ -1,22 +0,0 @@
-Description: Provide a stand-alone sphinx-apidoc.py script.
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/src/1.1/sphinx-apidoc.py
-Last-Update: 2011-10-13
-
---- /dev/null
-+++ b/sphinx-apidoc.py
-@@ -0,0 +1,15 @@
-+#!/usr/bin/env python
-+# -*- coding: utf-8 -*-
-+"""
-+    Sphinx - Python documentation toolchain
-+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+
-+    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
-+    :license: BSD, see LICENSE for details.
-+"""
-+
-+import sys
-+
-+if __name__ == '__main__':
-+    from sphinx.apidoc import main
-+    sys.exit(main(sys.argv))

More information about the Python-modules-commits mailing list