[Python-modules-commits] r27628 - in packages/sphinx/trunk/debian (3 files)

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

    Date: Thursday, February 13, 2014 @ 08:54:05
  Author: mitya57-guest
Revision: 27628

Add html_logo_path_fix.diff to fix path check for HTML logo,
backported from upstream hg (thanks James Cowgill, closes: #738741).

Added:
  packages/sphinx/trunk/debian/patches/html_logo_path_fix.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2014-02-13 08:45:19 UTC (rev 27627)
+++ packages/sphinx/trunk/debian/changelog	2014-02-13 08:54:05 UTC (rev 27628)
@@ -1,5 +1,7 @@
 sphinx (1.2.1+dfsg-3) UNRELEASED; urgency=medium
 
+  * Add html_logo_path_fix.diff to fix path check for HTML logo,
+    backported from upstream hg (thanks James Cowgill, closes: #738741).
   * Add missing xauth depencency for sphinx-doc autopkgtest.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 25 Jan 2014 12:53:08 +0400

Added: packages/sphinx/trunk/debian/patches/html_logo_path_fix.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/html_logo_path_fix.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/html_logo_path_fix.diff	2014-02-13 08:54:05 UTC (rev 27628)
@@ -0,0 +1,28 @@
+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/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2014-02-13 08:45:19 UTC (rev 27627)
+++ packages/sphinx/trunk/debian/patches/series	2014-02-13 08:54:05 UTC (rev 27628)
@@ -4,3 +4,4 @@
 python3_test_build_dir.diff
 parallel_2to3.diff
 no_external_css.diff
+html_logo_path_fix.diff