[Python-modules-commits] r9648 - in packages/sphinx/trunk/debian/patches (2 files)

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

    Date: Friday, September 4, 2009 @ 10:38:12
  Author: dottedmag-guest
Revision: 9648

Refresh patches

Modified:
  packages/sphinx/trunk/debian/patches/disable_ez_setup.patch
  packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch

Modified: packages/sphinx/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/disable_ez_setup.patch	2009-09-04 10:35:24 UTC (rev 9647)
+++ packages/sphinx/trunk/debian/patches/disable_ez_setup.patch	2009-09-04 10:38:12 UTC (rev 9648)
@@ -1,9 +1,7 @@
 all dependencies should be are already installed (see Build-Depends*),
 ignore ez_setup's attempt to download different version of setuptools
-Index: sphinx-0.5.1/setup.py
-===================================================================
---- sphinx-0.5.1.orig/setup.py
-+++ sphinx-0.5.1/setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -1,6 +1,6 @@
  # -*- coding: utf-8 -*-
 -import ez_setup

Modified: packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2009-09-04 10:35:24 UTC (rev 9647)
+++ packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2009-09-04 10:38:12 UTC (rev 9648)
@@ -1,10 +1,8 @@
 # move static files outside site-packages so that they can be shared between
 # different Python versions
-Index: sphinx-0.6.1/sphinx/theming.py
-===================================================================
---- sphinx-0.6.1.orig/sphinx/theming.py
-+++ sphinx-0.6.1/sphinx/theming.py
-@@ -33,7 +33,7 @@ class Theme(object):
+--- a/sphinx/theming.py
++++ b/sphinx/theming.py
+@@ -33,7 +33,7 @@
      def init_themes(cls, builder):
          """Search all theme paths for available themes."""
          cls.themepath = list(builder.config.html_theme_path)
@@ -13,11 +11,9 @@
  
          for themedir in cls.themepath[::-1]:
              themedir = path.join(builder.confdir, themedir)
-Index: sphinx-0.6.1/sphinx/builders/changes.py
-===================================================================
---- sphinx-0.6.1.orig/sphinx/builders/changes.py
-+++ sphinx-0.6.1/sphinx/builders/changes.py
-@@ -137,12 +137,10 @@ class ChangesBuilder(Builder):
+--- a/sphinx/builders/changes.py
++++ b/sphinx/builders/changes.py
+@@ -136,12 +136,10 @@
                  f.close()
          themectx = dict(('theme_' + key, val) for (key, val) in
                          self.theme.get_options({}).iteritems())
@@ -32,24 +28,20 @@
                            path.join(self.outdir, 'basic.css'), self)
  
      def hl(self, text, version):
-Index: sphinx-0.6.1/sphinx/builders/latex.py
-===================================================================
---- sphinx-0.6.1.orig/sphinx/builders/latex.py
-+++ sphinx-0.6.1/sphinx/builders/latex.py
-@@ -195,7 +195,7 @@ class LaTeXBuilder(Builder):
-                             path.join(self.outdir, logobase))
+--- a/sphinx/builders/latex.py
++++ b/sphinx/builders/latex.py
+@@ -194,7 +194,7 @@
+                      path.join(self.outdir, logobase))
  
          self.info(bold('copying TeX support files... '), nonl=True)
 -        staticdirname = path.join(package_dir, 'texinputs')
 +        staticdirname = '/usr/share/sphinx/texinputs'
          for filename in os.listdir(staticdirname):
              if not filename.startswith('.'):
-                 shutil.copyfile(path.join(staticdirname, filename),
-Index: sphinx-0.6.1/sphinx/builders/html.py
-===================================================================
---- sphinx-0.6.1.orig/sphinx/builders/html.py
-+++ sphinx-0.6.1/sphinx/builders/html.py
-@@ -92,8 +92,8 @@ class StandaloneHTMLBuilder(Builder):
+                 copyfile(path.join(staticdirname, filename),
+--- a/sphinx/builders/html.py
++++ b/sphinx/builders/html.py
+@@ -91,8 +91,8 @@
              self.link_suffix = self.out_suffix
  
          if self.config.language is not None: