From 828c8af8877738ddfe892383cbe1ae668727e31a Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 26 Feb 2012 16:29:38 -0800 Subject: [PATCH] Install HTML upgrading-checklist in policy.html directory * Install the HTML version of upgrading-checklist in the policy.html directory as upgrading-checklist.html so that it can be deployed on www.debian.org in a way that will allow links to Policy sections to work easily. Thanks, Charles Plessy. (Closes: #639663) For right now, this is done with a bit of a hack to copy the file into the appropriate directory and to turn the one-page HTML version of it into a symlink inside the constructed package. The clean solution will be to make the upgrading checklist an appendix of Policy, which may be done as part of a DocBook conversion. --- Makefile | 10 ++++++++++ debian/changelog | 4 ++++ debian/rules | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/Makefile b/Makefile index 1f3675c..a10b93d 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,16 @@ perl-policy.sgml: version.ent %.pdf.gz: %.pdf gzip -cf9 $< > $@ +# This is a temporary hack to fold the upgrading-checklist into the Policy +# HTML directory so that it can be deployed alongside Policy on +# www.debian.org in a way that lets the cross-document links work properly. +# The correct solution is to make upgrading-checklist an appendix of Policy, +# which will probably be done as part of a general conversion to DocBook. +policy.html.tar.gz:: policy.html/upgrading-checklist.html +policy.html/upgrading-checklist.html: upgrading-checklist-1.html \ + policy.html/index.html + cp -p $< $@ + # convenience aliases :) html: policy.html/index.html html-1: policy-1.html diff --git a/debian/changelog b/debian/changelog index d189ecb..bf14fe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ debian-policy (3.9.3.1) UNRELEASED; urgency=low + * Install the HTML version of upgrading-checklist in the policy.html + directory as upgrading-checklist.html so that it can be deployed on + www.debian.org in a way that will allow links to Policy sections to + work easily. Thanks, Charles Plessy. (Closes: #639663) * Fix mistaken word choice (prefix instead of suffix) in the upgrading checklist entry for 3.9.3.0. * Add some missing entries to the virtual package names list changelog. diff --git a/debian/rules b/debian/rules index d242b66..e0e8c13 100755 --- a/debian/rules +++ b/debian/rules @@ -131,6 +131,13 @@ stamp-binary: stamp-build tar -C $(DOCDIR) -zxf $$file.html.tar.gz; \ done # +# Make upgrading-checklist-1.html a symlink to the copy in the policy.html +# directory. This is temporary until it becomes a proper appendix. +# + rm -f $(DOCDIR)/upgrading-checklist-1.html + ln -s policy.html/upgrading-checklist.html \ + $(DOCDIR)/upgrading-checklist-1.html +# # Install doc-base files. # @set -ex; for file in $(DESC_FILES); do \ -- 2.39.2