[oolite] 12/15: Install docs as (good) .odt and (ugly) HTML, but no more as (bad) PDF. Drop Build-Dependency on fonts used to build the PDF. Avoid duplicating the list in oolite-doc.install and rules. Declare phony targets.

Nicolas Boulenguez nicolas.boulenguez at free.fr
Thu Jul 28 23:24:29 UTC 2016 

This is an automated email from the git hooks/post-receive script.

nicobou-guest pushed a commit to branch master
in repository oolite.

commit 061abd8d93fc047be7edb7306e4a6ed7a1dddd0f
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Thu Jul 28 13:44:41 2016 +0200

    Install docs as (good) .odt and (ugly) HTML, but no more as (bad) PDF.
    Drop Build-Dependency on fonts used to build the PDF.
    Avoid duplicating the list in oolite-doc.install and rules.
    Declare phony targets.
---
 debian/control                                     |  3 +-
 ...te-doc.doc-base.oolite-advice_for_new_commander |  5 ++-
 debian/oolite-doc.doc-base.oolite-readme           |  5 ++-
 debian/oolite-doc.doc-base.oolite-reference-sheet  |  5 ++-
 debian/oolite-doc.install                          |  6 ---
 debian/rules                                       | 46 ++++++++++++----------
 6 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/debian/control b/debian/control
index 53b38a4..1c29b7f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 9),
 	libnspr4-dev, libmozjs185-dev,
 	libpng-dev, mesa-common-dev, gobjc,
         pkg-config
-Build-Depends-Indep: libreoffice-writer, fonts-liberation, fonts-dejavu,
- fonts-opensymbol
+Build-Depends-Indep: libreoffice-writer
 Homepage: http://www.oolite.org
 Vcs-Git: git://anonscm.debian.org/pkg-games/oolite.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/oolite.git
diff --git a/debian/oolite-doc.doc-base.oolite-advice_for_new_commander b/debian/oolite-doc.doc-base.oolite-advice_for_new_commander
index 1c66769..7a2fa99 100644
--- a/debian/oolite-doc.doc-base.oolite-advice_for_new_commander
+++ b/debian/oolite-doc.doc-base.oolite-advice_for_new_commander
@@ -4,5 +4,6 @@ Author: Disembodied and the oolite team
 Abstract: An introduction to the Oolite game, with links to the internet documentation.
 Section: Games/Simulation
 
-Format: PDF
-Files: /usr/share/doc/oolite/AdviceForNewCommanders.pdf.gz
+Format: HTML
+Files: /usr/share/doc/oolite/AdviceForNewCommanders.html
+Index: /usr/share/doc/oolite/AdviceForNewCommanders.html
diff --git a/debian/oolite-doc.doc-base.oolite-readme b/debian/oolite-doc.doc-base.oolite-readme
index 25dea77..1479561 100644
--- a/debian/oolite-doc.doc-base.oolite-readme
+++ b/debian/oolite-doc.doc-base.oolite-readme
@@ -4,5 +4,6 @@ Author: Giles Williams
 Abstract: Short introduction to keyboard shortcuts in the Oolite game.
 Section: Games/Simulation
 
-Format: PDF
-Files: /usr/share/doc/oolite/OoliteReadMe.pdf.gz
+Format: HTML
+Files: /usr/share/doc/oolite/OoliteReadMe.html
+Index: /usr/share/doc/oolite/OoliteReadMe.html
diff --git a/debian/oolite-doc.doc-base.oolite-reference-sheet b/debian/oolite-doc.doc-base.oolite-reference-sheet
index 43b225b..6e80ad9 100644
--- a/debian/oolite-doc.doc-base.oolite-reference-sheet
+++ b/debian/oolite-doc.doc-base.oolite-reference-sheet
@@ -5,5 +5,6 @@ Abstract: A quick reference to all commands, prices, materials,
  ships in the Oolite game.
 Section: Games/Simulation
 
-Format: PDF
-Files: /usr/share/doc/oolite/OoliteRS.pdf.gz
+Format: HTML
+Files: /usr/share/doc/oolite/OoliteRS.html
+Index: /usr/share/doc/oolite/OoliteRS.html
diff --git a/debian/oolite-doc.install b/debian/oolite-doc.install
index 55c5e10..c59581f 100644
--- a/debian/oolite-doc.install
+++ b/debian/oolite-doc.install
@@ -1,8 +1,2 @@
-# We want all documentation in one place, but no circular dependency
-# between packages, so we avoid dh_installdocs.
-
-Doc/AdviceForNewCommanders.pdf             usr/share/doc/oolite
 Doc/contributors.txt                       usr/share/doc/oolite
 Doc/FAQ.TXT                                usr/share/doc/oolite
-Doc/OoliteReadMe.pdf                       usr/share/doc/oolite
-Doc/OoliteRS.pdf                           usr/share/doc/oolite
diff --git a/debian/rules b/debian/rules
index f1a9d3d..c0fc9af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,12 +28,8 @@ $(POLICY_TARGETS):
 	dh $@
 
 # Debhelper, please, do not run make -f GNUmakefile without me.
-override_dh_auto_configure:
-override_dh_auto_build-arch:
-override_dh_auto_build-indep:
-override_dh_auto_test:
-override_dh_auto_install:
-override_dh_auto_clean::
+.PHONY: $(addprefix override_dh_auto_, \
+  configure build-arch build-indep test install clean)
 # We will never call the install upstream target, as GNUstep stores
 # arch-dep and arch-indep files together. Installing to debian/tmp and
 # splitting afterwards is much more complex than moving them once.
@@ -112,33 +108,38 @@ override_dh_auto_clean::
 	$(MAKE) $(GSMAKE) -C $(ICOSMESH_DIR) clean
 
 ######################################################################
+# Regenerating the PDF gives very ugly results even with
+# fonts-liberation, fonts-dejavu, fonts-opensymbol installed.
+# Recommended format in Debian is HTML.
+# However, we also install the sources which are often more pretty.
 # AdviceForNewCommanders.doc produces a better result than .odt.
-PDF_FROM_DOC := \
-  Doc/AdviceForNewCommanders.pdf
-PDF_FROM_ODT := \
-  Doc/OoliteReadMe.pdf \
-  Doc/OoliteRS.pdf
+HTML_FROM_DOC := \
+  Doc/AdviceForNewCommanders.html
+HTML_FROM_ODT := \
+  Doc/OoliteReadMe.html \
+  Doc/OoliteRS.html
 
 # Attempt to circumvent #730893.
 TMP_LOFFICE_HOME := $(CURDIR)/debian/tmp_loffice_config
-$(PDF_FROM_DOC) $(PDF_FROM_ODT): export XDG_CONFIG_HOME := $(TMP_LOFFICE_HOME)
-$(PDF_FROM_DOC) $(PDF_FROM_ODT): $(TMP_LOFFICE_HOME)
+$(HTML_FROM_DOC) $(HTML_FROM_ODT): export XDG_CONFIG_HOME := $(TMP_LOFFICE_HOME)
+$(HTML_FROM_DOC) $(HTML_FROM_ODT): $(TMP_LOFFICE_HOME)
 $(TMP_LOFFICE_HOME):
 	mkdir $@
 override_dh_auto_clean::
 	rm -fr $(TMP_LOFFICE_HOME)
 
-override_dh_auto_build-indep: $(PDF_FROM_DOC) $(PDF_FROM_ODT)
-$(PDF_FROM_DOC): %.pdf: %.doc
-	libreoffice --headless --convert-to pdf --outdir $(dir $@) $<
-$(PDF_FROM_ODT): %.pdf: %.odt
-	libreoffice --headless --convert-to pdf --outdir $(dir $@) $<
+override_dh_auto_build-indep: $(HTML_FROM_DOC) $(HTML_FROM_ODT)
+$(HTML_FROM_DOC): %.html: %.doc
+	libreoffice --headless --convert-to html --outdir $(dir $@) $<
+$(HTML_FROM_ODT): %.html: %.odt
+	libreoffice --headless --convert-to html --outdir $(dir $@) $<
 override_dh_auto_clean::
-	rm -f $(PDF_FROM_DOC) $(PDF_FROM_ODT)
+	rm -f $(HTML_FROM_DOC) $(HTML_FROM_ODT)
 
-######################################################################
 RESOURCES := oolite.app/Resources
 SOUNDS    := Music Sounds
+
+.PHONY: override_dh_install
 override_dh_install:
 	dh_install --package=oolite-data-sounds \
           $(addprefix $(RESOURCES)/,$(SOUNDS)) usr/share/oolite
@@ -146,8 +147,13 @@ override_dh_install:
 	dh_install --package=oolite-data \
           $(addprefix --exclude=$(RESOURCES)/,$(SOUNDS)) \
           $(RESOURCES)/* usr/share/oolite
+	dh_install --package=oolite-doc \
+	  $(HTML_FROM_DOC) $(subst .html,.doc,$(HTML_FROM_DOC)) \
+	  $(HTML_FROM_ODT) $(subst .html,.odt,$(HTML_FROM_DOC)) \
+	  usr/share/doc/oolite
 	dh_install --remaining-packages
 
 ######################################################################
+.PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:
 	dh_installchangelogs --all Doc/CHANGELOG.TXT

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/oolite.git

More information about the Pkg-games-commits mailing list