Package: python-sphinx
Version: 1.2.1+dfsg-2
Severity: normal
Tags: patch fixed-upstream

Hi,

This issue
 
https://bitbucket.org/birkenfeld/sphinx/issue/1352/copying-html_logo-file-over-improperly

is currently causing my package (python-sfml) to FTBFS.

Could you apply the upstream fix (which I've put in a patch file) to sphinx?

Thanks,
 James

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.12-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages python-sphinx depends on:
ii  python-docutils  0.11-3
ii  python-jinja2    2.7.2-2
ii  python-pygments  1.6+dfsg-1
pn  python:any       <none>
ii  sphinx-common    1.2.1+dfsg-2

Versions of packages python-sphinx recommends:
ii  python             2.7.5-5
ii  python-pil         2.3.0-1
ii  python-simplejson  3.3.2-1
ii  sphinx-doc         1.2.1+dfsg-2

Versions of packages python-sphinx suggests:
pn  dvipng                     <none>
pn  jsmath                     <none>
pn  libjs-mathjax              <none>
ii  texlive-fonts-recommended  2013.20140123-1
ii  texlive-latex-extra        2013.20140123-1
ii  texlive-latex-recommended  2013.20140123-1

-- no debconf information
Description: Fix html_logo file existance check
Origin: https://bitbucket.org/birkenfeld/sphinx/pull-request/211/fix-for-issue-1352/
Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1352/copying-html_logo-file-over-improperly
Applied-Upstream: https://bitbucket.org/birkenfeld/sphinx/commits/e57544e4ef0b543c98e92700d30e14ff03a81508
Last-Update: 2014-02-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- 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')
_______________________________________________
Python-modules-team mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to