diff options
| -rw-r--r-- | debian/TEMPLATE.doc-base (renamed from debian/doc-base.TEMPLATE) | 2 | ||||
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 19 |
4 files changed, 25 insertions, 13 deletions
diff --git a/debian/doc-base.TEMPLATE b/debian/TEMPLATE.doc-base index f2910cc97..564d371d0 100644 --- a/debian/doc-base.TEMPLATE +++ b/debian/TEMPLATE.doc-base @@ -1,4 +1,4 @@ -Document: installation-guide-%ARCH%-%LANG% +Document: installation-guide-%ARCH%-%LANG_ID% Title: Debian Installation Guide for %ARCH_FULL% in %LANG_FULL% Author: Debian Installer team Abstract: Manual describing how to install a Debian system diff --git a/debian/changelog b/debian/changelog index 88ca9271a..734207177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,11 +57,18 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low well as preseeding the partman confirmation messages. [ Frans Pop ] - * Make copyright refer explicitly to GPL version 2 as that is the version we - include in the appendix; add reference to /usr/share/common-licenses to + * Make copyright refer explicitly to GPL version 2 as that is the version + included in the appendix; add reference to /usr/share/common-licenses to make Lintian happy. - - -- Frans Pop <fjp@debian.org> Sun, 23 Dec 2007 07:53:56 +0100 + * Rename doc-base.TEMPLATE to TEMPLATE.doc-base to avoid its inclusion in + the package for the first architecture. + * Modify language codes that include a country for the doc-base document ID + so they only contain valid characters. + * Remove the PDF section in doc-base files if PDF format is not built for a + language. + * Update standards version to 3.7.3; no changes needed. + + -- Frans Pop <fjp@debian.org> Sun, 23 Dec 2007 08:34:09 +0100 installation-guide (20070319) unstable; urgency=low diff --git a/debian/control b/debian/control index d1d6955ca..3729ba5f9 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: doc Priority: optional Maintainer: Debian Install System Team <debian-boot@lists.debian.org> Uploaders: Joey Hess <joeyh@debian.org>, Frans Pop <fjp@debian.org> -Standards-Version: 3.6.2 +Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/d-i/trunk/manual Build-Depends: debhelper (>= 4), docbook, docbook-xml, docbook-xsl, xsltproc, gawk, libhtml-parser-perl, w3m, poxml, jadetex, openjade | openjade1.3, docbook-dsssl, gs-common, texlive-lang-cyrillic, texlive-lang-czechslovak, texlive-lang-finnish, texlive-lang-french, texlive-lang-german, texlive-lang-italian, texlive-lang-other, texlive-lang-portuguese, texlive-lang-spanish, texlive-lang-swedish, texlive-lang-vietnamese, latex-hangul-ucs-hlatex, cm-super # This comment can also be used to generate a Build-Depends line, by diff --git a/debian/rules b/debian/rules index b1834e859..d23549751 100755 --- a/debian/rules +++ b/debian/rules @@ -25,15 +25,20 @@ doc-base-stamp: @echo $(ARCHS) rm -f $@ rm -rf debian/installation-guide-*.doc-base.* - set -e && cd debian && \ - for arch in $(ARCHS) ; do \ - for lang in $(LANGS) ; do \ - arch_full="$$(grep "^$$arch[[:space:]]" archlist | cut -f 2)" ; \ - lang_full="$$(grep "^$$lang[[:space:]]" langlist | cut -f 2)" ; \ + set -e; cd debian && \ + for arch in $(ARCHS); do \ + for lang in $(LANGS); do \ + arch_full="$$(grep "^$$arch[[:space:]]" archlist | cut -f 2)"; \ + lang_full="$$(grep "^$$lang[[:space:]]" langlist | cut -f 2)"; \ + lang_id="$$(echo $$lang | tr A-Z a-z | sed "s/_/-/")"; \ sed -e "s:%ARCH%:$$arch:g" -e "s:%ARCH_FULL%:$$arch_full:g" \ -e "s:%LANG%:$$lang:g" -e "s:%LANG_FULL%:$$lang_full:g" \ - doc-base.TEMPLATE > installation-guide-$$arch.doc-base.$$lang ; \ - done ; \ + -e "s:%LANG_ID%:$$lang_id:g" \ + TEMPLATE.doc-base >installation-guide-$$arch.doc-base.$$lang; \ + if [ ! -e manual/$$arch/$$lang/install.$$lang.pdf ]; then \ + sed -i "/Format: pdf/,/^$$/d" installation-guide-$$arch.doc-base.$$lang; \ + fi; \ + done; \ done touch $@ |