Hello again, On Fri 03 Aug 2018 at 01:59PM +0800, Sean Whitton wrote: >> dh_sphinxdoc doesn't work well as expected, it means it seems to have >> a bug with handling multiple binary packages (it fails to find sphinx >> doc files if there's two binary packages). So I've specified its >> installation manually. > > Right. > > I think maybe we can use dh_linktree instead of dh_sphinxdoc. The attached patch does this, clearing up the Lintian warnings about embedded JavaScript. It seems that there is more cleaning up that could be done. For example, we can make debian-policy-ja depend on debian-policy, and use dh_link to install only one copy of the css and image files. Are you interested in doing that work, or do you want to hand your branch over to me at this point? Let me know the current status. Thank you! -- Sean Whitton
From 6ee6fb1dda4cb5544776e0fcc9e985856e886790 Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhitton@spwhitton.name> Date: Fri, 3 Aug 2018 14:10:31 +0800 Subject: [PATCH] add dh_linktree --- debian/control | 1 + debian/debian-policy-ja.linktrees | 1 + debian/debian-policy.linktrees | 1 + debian/rules | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 debian/debian-policy-ja.linktrees create mode 100644 debian/debian-policy.linktrees diff --git a/debian/control b/debian/control index 6d25ae9..50a33e6 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Priority: optional Build-Depends: dblatex, debhelper (>= 10), + dh-linktree, dia, docbook-xml, docbook-xsl, diff --git a/debian/debian-policy-ja.linktrees b/debian/debian-policy-ja.linktrees new file mode 100644 index 0000000..bb8ef9b --- /dev/null +++ b/debian/debian-policy-ja.linktrees @@ -0,0 +1 @@ +deduplicate /usr/share/javascript/sphinxdoc/1.0/ usr/share/doc/debian-policy/ja/policy.html/_static/ diff --git a/debian/debian-policy.linktrees b/debian/debian-policy.linktrees new file mode 100644 index 0000000..88fadfd --- /dev/null +++ b/debian/debian-policy.linktrees @@ -0,0 +1 @@ +deduplicate /usr/share/javascript/sphinxdoc/1.0/ usr/share/doc/debian-policy/policy.html/_static/ diff --git a/debian/rules b/debian/rules index 3f4a043..9dcf24d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with linktree override_dh_auto_install: # To avoid dh_sphinxdoc bug, install files directory to package directory -- 2.11.0
Attachment:
signature.asc
Description: PGP signature