[Python-modules-team] Bug#857510: wand-doc, sphinx: broken symlink: /usr/share/doc/wand-doc/html/_static/websupport.js -> ../../../../javascript/sphinxdoc/1.0/websupport.js

2017-03-15 Thread Dmitry Shachnev 
Control: reassign -1 wand-doc 0.4.4-1.1
Control: tags -1 +patch

Hi Andreas,

On Sun, Mar 12, 2017 at 04:06:37AM +0100, Andreas Beckmann wrote:
> 0m21.5s ERROR: FAIL: Broken symlinks:
>   /usr/share/doc/wand-doc/html/_static/websupport.js -> 
> ../../../../javascript/sphinxdoc/1.0/websupport.js
>
> There is no .../javascript/sphinxdoc/1.0/websupport.js in
> libjs-sphinxdoc ...
> therefore assigning the bug to both wand and sphinx.
>
> I have *not* looked at the wand source package to determine whether
> wand or sphinx is responsible for the broken symlink.

This package is not using dh_sphinxdoc, but it is rather linking the files
manually (and wrongly), therefore it is not a bug in sphinx.

I am attaching a patch for wand to use dh_sphinxdoc, which fixes this issue.

The devhelp build is incomplete compared to HTML build (it lacks
searchindex.js), so in order to make dh_sphinxdoc recognize it, I needed
to do both HTML and devhelp builds.

--
Dmitry Shachnev
diff -Nru wand-0.4.4/debian/changelog wand-0.4.4/debian/changelog
--- wand-0.4.4/debian/changelog	2017-01-11 12:15:07.0 +0300
+++ wand-0.4.4/debian/changelog	2017-03-15 13:03:50.0 +0300
@@ -1,3 +1,9 @@
+wand (0.4.4-1.2) UNRELEASED; urgency=medium
+
+  * Use dh-sphinxdoc instead of broken hardcoded linking (Closes: #857510).
+
+ -- Dmitry Shachnev   Wed, 15 Mar 2017 13:03:50 +0300
+
 wand (0.4.4-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru wand-0.4.4/debian/control wand-0.4.4/debian/control
--- wand-0.4.4/debian/control	2017-01-11 12:14:15.0 +0300
+++ wand-0.4.4/debian/control	2017-03-15 13:03:18.0 +0300
@@ -70,7 +70,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends},
- libjs-sphinxdoc,
+ ${sphinxdoc:Depends},
 Suggests: python-wand
 Description: Python interface for ImageMagick library - documentation
  Wand is a ctypes-based simple ImageMagick binding for Python. It
diff -Nru wand-0.4.4/debian/rules wand-0.4.4/debian/rules
--- wand-0.4.4/debian/rules	2016-11-06 12:02:18.0 +0300
+++ wand-0.4.4/debian/rules	2017-03-15 13:03:50.0 +0300
@@ -3,7 +3,7 @@
 export PYBUILD_NAME=wand
 
 %:
-	dh $@ --buildsystem=pybuild --with python2,python3,pypy
+	dh $@ --buildsystem=pybuild --with python2,python3,pypy,sphinxdoc
 
 .PHONY: build_doc clean_doc
 
@@ -27,6 +27,7 @@
 	#dh_auto_test
 
 build_doc:
+	$(MAKE) -C $(CURDIR)/docs html
 	$(MAKE) -C $(CURDIR)/docs devhelp
 
 clean_doc:
diff -Nru wand-0.4.4/debian/wand-doc.install wand-0.4.4/debian/wand-doc.install
--- wand-0.4.4/debian/wand-doc.install	2016-11-06 12:02:18.0 +0300
+++ wand-0.4.4/debian/wand-doc.install	2017-03-15 13:03:50.0 +0300
@@ -1 +1,2 @@
-docs/_build/devhelp/* usr/share/doc/wand-doc/html/
+docs/_build/html/* usr/share/doc/wand-doc/html/
+docs/_build/devhelp/Wand.devhelp.gz usr/share/doc/wand-doc/html/
diff -Nru wand-0.4.4/debian/wand-doc.links wand-0.4.4/debian/wand-doc.links
--- wand-0.4.4/debian/wand-doc.links	2016-11-06 12:02:18.0 +0300
+++ wand-0.4.4/debian/wand-doc.links	2017-03-15 13:03:05.0 +0300
@@ -2,9 +2,3 @@
 usr/share/doc/wand-doc/html usr/share/doc/pypy-wand/html
 usr/share/doc/wand-doc/html usr/share/doc/python-wand/html
 usr/share/doc/wand-doc/html usr/share/doc/python3-wand/html
-usr/share/javascript/sphinxdoc/1.0/doctools.js usr/share/doc/wand-doc/html/_static/doctools.js
-usr/share/javascript/sphinxdoc/1.0/jquery.js usr/share/doc/wand-doc/html/_static/jquery.js
-usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/wand-doc/html/_static/searchtools.js
-usr/share/javascript/sphinxdoc/1.0/sidebar.js usr/share/doc/wand-doc/html/_static/sidebar.js
-usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/doc/wand-doc/html/_static/underscore.js
-usr/share/javascript/sphinxdoc/1.0/websupport.js usr/share/doc/wand-doc/html/_static/websupport.js


signature.asc
Description: PGP signature
___
Python-modules-team mailing list
Python-modules-team@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team

[Python-modules-team] Bug#857510: wand-doc, sphinx: broken symlink: /usr/share/doc/wand-doc/html/_static/websupport.js -> ../../../../javascript/sphinxdoc/1.0/websupport.js

2017-03-11 Thread Andreas Beckmann 
Package: wand-doc,sphinx
Version: 0.4.4-1.1
Severity: normal
User: debian...@lists.debian.org
Usertags: piuparts

Hi,

during a test with piuparts I noticed your package ships (or creates)
a broken symlink.

>From the attached log (scroll to the bottom...):

0m21.5s ERROR: FAIL: Broken symlinks:
  /usr/share/doc/wand-doc/html/_static/websupport.js -> 
../../../../javascript/sphinxdoc/1.0/websupport.js

There is no .../javascript/sphinxdoc/1.0/websupport.js in
libjs-sphinxdoc ...
therefore assigning the bug to both wand and sphinx.
I tested rebuilding the package in current sid (in case that was
built with either something ancient or something from experimental),
but it still contains the websupport symlink.

apt-file search _static/websupport.js | wc -l
reports 148 occurrences in sid ...
Only a few of these depend on libjs-sphinxdoc, and even fewer use
symlinks to javascript/sphinxdoc/1.0/*.js. But there is at least one
that looks similar to wand-doc: salt-doc (and I stopped looking at
further packages, having started at the end of the list so this was
number 3 or 4).
The notable difference is that salt-doc ships websupport.js as a file
and not as a symlink.

I have *not* looked at the wand source package to determine whether
wand or sphinx is responsible for the broken symlink.


cheers,

Andreas


wand-doc_0.4.4-1.1.log.gz
Description: application/gzip
___
Python-modules-team mailing list
Python-modules-team@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team