[Python-modules-commits] r28000 - in packages/sphinx/trunk/debian (6 files)

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

    Date: Monday, March 3, 2014 @ 14:55:11
  Author: mitya57-guest
Revision: 28000

* New upstream bugfix release.
* Drop html_logo_path_fix.diff, applied upstream.
* Refresh and rebase other patches.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/initialize_autodoc.diff
  packages/sphinx/trunk/debian/patches/no_external_css.diff
  packages/sphinx/trunk/debian/patches/parallel_2to3.diff
  packages/sphinx/trunk/debian/patches/series
Deleted:
  packages/sphinx/trunk/debian/patches/html_logo_path_fix.diff

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2014-03-02 15:51:29 UTC (rev 27999)
+++ packages/sphinx/trunk/debian/changelog	2014-03-03 14:55:11 UTC (rev 28000)
@@ -1,5 +1,8 @@
 sphinx (1.2.1+dfsg-4) UNRELEASED; urgency=low
 
+  * New upstream bugfix release.
+  * Drop html_logo_path_fix.diff, applied upstream.
+  * Refresh and rebase other patches.
   * Bump debhelper compatibility level to 9.
   * Backport upstream patch to fix writing table hlines in LaTeX writer
     (closes: #732585).

Deleted: packages/sphinx/trunk/debian/patches/html_logo_path_fix.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/html_logo_path_fix.diff	2014-03-02 15:51:29 UTC (rev 27999)
+++ packages/sphinx/trunk/debian/patches/html_logo_path_fix.diff	2014-03-03 14:55:11 UTC (rev 28000)
@@ -1,28 +0,0 @@
-Description: fix html_logo file existence check
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/e57544e4ef0b54
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1352
-Last-Update: 2014-02-13
-
---- a/sphinx/builders/html.py
-+++ b/sphinx/builders/html.py
-@@ -597,15 +597,17 @@
-         if self.config.html_logo:
-             logobase = path.basename(self.config.html_logo)
-             logotarget = path.join(self.outdir, '_static', logobase)
--            if not path.isfile(logobase):
--                self.warn('logo file %r does not exist' % logobase)
-+            if not path.isfile(path.join(self.confdir, self.config.html_logo)):
-+                self.warn('logo file %r does not exist' % self.config.html_logo)
-             elif not path.isfile(logotarget):
-                 copyfile(path.join(self.confdir, self.config.html_logo),
-                          logotarget)
-         if self.config.html_favicon:
-             iconbase = path.basename(self.config.html_favicon)
-             icontarget = path.join(self.outdir, '_static', iconbase)
--            if not path.isfile(icontarget):
-+            if not path.isfile(path.join(self.confdir, self.config.html_favicon)):
-+                self.warn('favicon file %r does not exist' % self.config.html_favicon)
-+            elif not path.isfile(icontarget):
-                 copyfile(path.join(self.confdir, self.config.html_favicon),
-                          icontarget)
-         self.info('done')

Modified: packages/sphinx/trunk/debian/patches/initialize_autodoc.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/initialize_autodoc.diff	2014-03-02 15:51:29 UTC (rev 27999)
+++ packages/sphinx/trunk/debian/patches/initialize_autodoc.diff	2014-03-03 14:55:11 UTC (rev 28000)
@@ -15,7 +15,7 @@
  from sphinx import package_dir
  from sphinx.ext.autosummary import import_by_name, get_documenter
  from sphinx.jinja2glue import BuiltinTemplateLoader
-@@ -50,6 +51,15 @@
+@@ -65,6 +66,15 @@
      if len(args) < 1:
          p.error('no input files given')
  

Modified: packages/sphinx/trunk/debian/patches/no_external_css.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/no_external_css.diff	2014-03-02 15:51:29 UTC (rev 27999)
+++ packages/sphinx/trunk/debian/patches/no_external_css.diff	2014-03-03 14:55:11 UTC (rev 28000)
@@ -10,7 +10,7 @@
  
  {% block extrahead %}
 -    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700'
--          rel='stylesheet' type='text/css'>
+-          rel='stylesheet' type='text/css' />
  {{ super() }}
  {%- if not embedded %}
      <style type="text/css">

Modified: packages/sphinx/trunk/debian/patches/parallel_2to3.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/parallel_2to3.diff	2014-03-02 15:51:29 UTC (rev 27999)
+++ packages/sphinx/trunk/debian/patches/parallel_2to3.diff	2014-03-03 14:55:11 UTC (rev 28000)
@@ -5,7 +5,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -160,6 +160,23 @@
+@@ -157,6 +157,23 @@
  
      cmdclass['compile_catalog'] = compile_catalog_plusjs
  

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2014-03-02 15:51:29 UTC (rev 27999)
+++ packages/sphinx/trunk/debian/patches/series	2014-03-03 14:55:11 UTC (rev 28000)
@@ -3,6 +3,5 @@
 sphinxcontrib_namespace.diff
 python3_test_build_dir.diff
 parallel_2to3.diff
-no_external_css.diff
 html_logo_path_fix.diff
 fix_latex_hlines.diff