diff options
author | Holger Wansing <holgerw@debian.org> | 2017-08-17 16:26:13 +0000 |
---|---|---|
committer | Holger Wansing <holgerw@debian.org> | 2017-08-17 16:26:13 +0000 |
commit | 3aa082a832ed636874995bf9e7bd25d0910c3365 (patch) | |
tree | c9c9fdcb666affa76c3f15f0e41d1c855db672a4 | |
parent | f57b9f29fa41bfa96c57f85e9a0a86746ba30ec5 (diff) | |
download | installation-guide-3aa082a832ed636874995bf9e7bd25d0910c3365.zip |
Remove support for 'ps' format. Remove some dependencies accordingly.
Closes 871751.
-rwxr-xr-x | build/build.sh | 1 | ||||
-rwxr-xr-x | build/buildone.sh | 70 | ||||
-rwxr-xr-x | build/buildone_ng.sh | 70 | ||||
-rw-r--r-- | build/stylesheets/style-print.dsl | 73 | ||||
-rw-r--r-- | build/templates/header.ko.tex | 104 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 11 | ||||
-rw-r--r-- | doc/building.txt | 8 |
8 files changed, 10 insertions, 329 deletions
diff --git a/build/build.sh b/build/build.sh index fb79a7396..6b45db531 100755 --- a/build/build.sh +++ b/build/build.sh @@ -23,7 +23,6 @@ if [ -z "$destination" ]; then fi if [ -z "$formats" ]; then - #formats="html pdf ps txt" formats="html pdf txt" fi diff --git a/build/buildone.sh b/build/buildone.sh index beff32b60..3b8dc442c 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -4,7 +4,7 @@ if [ "$1" = "--help" ]; then echo "$0: Generate the Debian Installer Manual in several different formats" echo "Usage: $0 [arch] [lang] [format]" echo "[format] may consist of multiple formats provided they are quoted (e.g. \"html pdf\")" - echo "Supported formats: html, ps, pdf, txt" + echo "Supported formats: html, pdf, txt" exit 0 fi @@ -179,53 +179,6 @@ create_text () { return 0 } -create_dvi () { - - [ -x "`which openjade 2>/dev/null`" ] || return 9 - [ -x "`which jadetex 2>/dev/null`" ] || return 9 - - # Skip this step if the .dvi file already exists - [ -f "$tempdir/install.${language}.dvi" ] && return - - echo "Info: creating temporary .tex file..." - - # And use openjade to generate a .tex file - export SP_ENCODING="utf-8" - openjade -t tex \ - -b utf-8 \ - -o $tempdir/install.${language}.tex \ - -d $stylesheet_dsssl \ - -V tex-backend declaration/xml.dcl \ - $tempdir/install.${language}.profiled.xml - RET=$?; [ $RET -ne 0 ] && return $RET - - # some languages need additional macro - case "$language" in - ko) - mv $tempdir/install.${language}.tex \ - $tempdir/install.${language}.orig.tex - cat templates/header.${language}.tex \ - $tempdir/install.${language}.orig.tex \ - > $tempdir/install.${language}.tex - rm $tempdir/install.${language}.orig.tex - ;; - esac - - echo "Info: creating temporary .dvi file..." - - # Next we use jadetex to generate a .dvi file - # This needs three passes to properly generate the index (page numbering) - cd $tempdir - for PASS in 1 2 3 ; do - jadetex install.${language}.tex >/dev/null - RET=$?; [ $RET -ne 0 ] && break - done - cd .. - [ $RET -ne 0 ] && return $RET - - return 0 -} - create_pdf() { [ -x "`which dblatex 2>/dev/null`" ] || return 9 @@ -242,22 +195,6 @@ create_pdf() { return 0 } -create_ps() { - - [ -x "`which dvips 2>/dev/null`" ] || return 9 - - create_dvi - RET=$?; [ $RET -ne 0 ] && return $RET - - echo "Info: creating .ps file..." - - dvips -q $tempdir/install.${language}.dvi - RET=$?; [ $RET -ne 0 ] && return $RET - mv install.${language}.ps $destdir/ - - return 0 -} - ## MAINLINE # Clean old builds @@ -281,8 +218,8 @@ BUILD_FAIL="" for format in $formats ; do case "$language" in __) - if [ "$format" = "pdf" -o "$format" = "ps" ] ; then - echo "Warning: pdf and ps formats are currently not supported for __." + if [ "$format" = "pdf" ] ; then + echo "Warning: pdf format is currently not supported for __." BUILD_SKIP="$BUILD_SKIP $format" continue fi @@ -291,7 +228,6 @@ for format in $formats ; do case $format in html) create_html;; - ps) create_ps;; pdf) create_pdf;; txt) create_text;; *) diff --git a/build/buildone_ng.sh b/build/buildone_ng.sh index fef20696a..a2fb0ffee 100755 --- a/build/buildone_ng.sh +++ b/build/buildone_ng.sh @@ -8,7 +8,7 @@ if [ "$1" = "--help" ]; then echo "from xml or po files." echo "Usage: $0 [arch] [lang] [format]" echo "[format] may consist of multiple formats provided they are quoted (e.g. \"html pdf\")" - echo "Supported formats: html, ps, pdf, txt" + echo "Supported formats: html, pdf, txt" exit 0 fi @@ -199,53 +199,6 @@ create_text () { return 0 } -create_dvi () { - - [ -x "`which openjade 2>/dev/null`" ] || return 9 - [ -x "`which jadetex 2>/dev/null`" ] || return 9 - - # Skip this step if the .dvi file already exists - [ -f "$tempdir/install.${languages}.dvi" ] && return - - echo "Info: creating temporary .tex file..." - - # And use openjade to generate a .tex file - export SP_ENCODING="utf-8" - openjade -t tex \ - -b utf-8 \ - -o $tempdir/install.${languages}.tex \ - -d $stylesheet_dsssl \ - -V tex-backend declaration/xml.dcl \ - $tempdir/install.${languages}.profiled.xml - RET=$?; [ $RET -ne 0 ] && return $RET - - # some languages need additional macro - case "$languages" in - ko) - mv $tempdir/install.${languages}.tex \ - $tempdir/install.${languages}.orig.tex - cat templates/header.${languages}.tex \ - $tempdir/install.${languages}.orig.tex \ - > $tempdir/install.${languages}.tex - rm $tempdir/install.${languages}.orig.tex - ;; - esac - - echo "Info: creating temporary .dvi file..." - - # Next we use jadetex to generate a .dvi file - # This needs three passes to properly generate the index (page numbering) - cd $tempdir - for PASS in 1 2 3 ; do - jadetex install.${languages}.tex >/dev/null - RET=$?; [ $RET -ne 0 ] && break - done - cd .. - [ $RET -ne 0 ] && return $RET - - return 0 -} - create_pdf() { [ -x "`which dblatex 2>/dev/null`" ] || return 9 @@ -262,22 +215,6 @@ create_pdf() { return 0 } -create_ps() { - - [ -x "`which dvips 2>/dev/null`" ] || return 9 - - create_dvi - RET=$?; [ $RET -ne 0 ] && return $RET - - echo "Info: creating .ps file..." - - dvips -q $tempdir/install.${languages}.dvi - RET=$?; [ $RET -ne 0 ] && return $RET - mv install.${languages}.ps $destdir/ - - return 0 -} - ## MAINLINE # Clean old builds @@ -301,8 +238,8 @@ BUILD_FAIL="" for format in $formats ; do case "$languages" in __) - if [ "$format" = "pdf" -o "$format" = "ps" ] ; then - echo "Warning: pdf and ps formats are currently not supported for __." + if [ "$format" = "pdf" ] ; then + echo "Warning: pdf format is currently not supported for __." BUILD_SKIP="$BUILD_SKIP $format" continue fi @@ -311,7 +248,6 @@ for format in $formats ; do case $format in html) create_html;; - ps) create_ps;; pdf) create_pdf;; txt) create_text;; *) diff --git a/build/stylesheets/style-print.dsl b/build/stylesheets/style-print.dsl deleted file mode 100644 index 02ddc1fc0..000000000 --- a/build/stylesheets/style-print.dsl +++ /dev/null @@ -1,73 +0,0 @@ -<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ -<!ENTITY dbstyle SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/print/docbook.dsl" CDATA DSSSL> -]> -<style-sheet> -<style-specification use="docbook"> -<style-specification-body> - -(define %section-autolabel% - ;; Are sections enumerated? - #t ) - -(define %paper-type% - ;; Name of paper type - "A4" - ;; "USletter" - ) -(define %hyphenation% - ;; Allow automatic hyphenation? - #t) - -(define %default-quadding% - 'justify) - -(define bop-footnotes - ;; Make "bottom-of-page" footnotes? - #t) - -(define %admon-graphics% - ;; Use graphics in admonitions? - ;; Also removes black box around warnings - #f) - -(define ($peril$) - (let* ((title (select-elements - (children (current-node)) (normalize "title"))) - (has-title (not (node-list-empty? title))) - (adm-title (if has-title - (make sequence - (with-mode title-sosofo-mode - (process-node-list (node-list-first title)))) - (literal - (gentext-element-name - (current-node))))) - (hs (HSIZE 2))) - (if %admon-graphics% - ($graphical-admonition$) - (make display-group - space-before: %block-sep% - space-after: %block-sep% - font-family-name: %admon-font-family% - font-size: (- %bf-size% 1pt) - font-weight: 'medium - font-posture: 'upright - line-spacing: (* (- %bf-size% 1pt) %line-spacing-factor%) - (make paragraph - space-before: %para-sep% - space-after: %para-sep% - start-indent: (+ (inherited-start-indent) (* 2 (ILSTEP)) 1em) - end-indent: (+ (inherited-end-indent) 1em) - font-family-name: %title-font-family% - font-weight: 'bold - font-size: hs - line-spacing: (* hs %line-spacing-factor%) - quadding: 'center - keep-with-next?: #t - adm-title) - (process-children))))) - - -</style-specification-body> -</style-specification> -<external-specification id="docbook" document="dbstyle"> -</style-sheet> diff --git a/build/templates/header.ko.tex b/build/templates/header.ko.tex deleted file mode 100644 index b45549679..000000000 --- a/build/templates/header.ko.tex +++ /dev/null @@ -1,104 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% hangul typesetting along with jadetex -%%% -%%% (C) 2005 Dohyun Kim <nomosnomos@gmail.com> -%%% -%%% This program is free software; you can redistribute it and/or modify -%%% it under the terms of version 2 of the GNU General Public License as -%%% published by the Free Software Foundation. -%%% -%%% This program is distributed in the hope that it will be useful, but -%%% WITHOUT ANY WARRANTY; without even the implied warranty of -%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -%%% General Public License for more details. -%%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 -%%% USA -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\hangulfontnormal{outbtm} -\def\hangulfontbold{outbtb} -\def\hangulfonttitlenormal{outgtm} -\def\hangulfonttitlebold{outgtb} -\def\chaptername{Chapter} -\let\ucshanguljadetex@character@orig\Character -\def\Character#1{% - \expandafter\ifx\csname!#1\endcsname\relax - \hangulunichar{#1}% - \else - \ucshanguljadetex@character@orig{#1}% - \fi} -\edef\ucshanguljadetex@f@series{\f@series}% -\def\hangulunichar#1{% - \begingroup - \edef\temp@f@series{\f@series}% - \ifx\temp@f@series\ucshanguljadetex@f@series - \ifx\ProcessingMode{book-title-verso-mode} - \let\myhangulfont\hangulfonttitlenormal - \else - \let\myhangulfont\hangulfontnormal - \fi - \else - \ifx\ProcessingMode{book-title-verso-mode} - \let\myhangulfont\hangulfonttitlebold - \else - \let\myhangulfont\hangulfontbold - \fi - \fi - \count2=#1 % \count2 = "AC01 - \divide\count2 256 % \count2 = "AC - \count4\count2 % \count4 = "AC - \divide\count2 16 % \count2 = "A ; determined - \count255\count2 % \count255 = "A - \multiply\count255 16 % \count255 = "A0 - \advance\count4 -\count255 % \count4 = "C ; determined - \edef\mymyfont{\myhangulfont - \ifcase\count2 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or - 8\or 9\or a\or b\or c\or d\or e\or f\fi - \ifcase\count4 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or - 8\or 9\or a\or b\or c\or d\or e\or f\fi}% - \font\myfont\mymyfont\space at \f@size pt\relax - % calculate hangul char number - \count2=#1 % \count2 = "AC01 - \count255\count2 % \count255 = "AC01 - \divide\count255 256 % \count255 = "AC - \multiply\count255 256 % \count255 = "AC00 - \advance\count2 -\count255 % \count2 = "1 ; determined - \breakbeforehangulchar{#1}% allow linebreak before hangul chars - \myfont\char\count2 % print character - \hangulspacefactor{#1}% insert hangul spacefactor - \endgroup - \futurelet\nextglyph\breakbeforeasciioparen% allowbreak before ascii OP ( -} -% disallow linebreak after OP -\sfcode`\(=998 -\sfcode`\`=998 -\sfcode`\[=998 -\def\breakbeforehangulchar#1{% - \ifnum#1> 13311 - \ifnum#1< 64255 - \ifhmode - \ifdim\lastskip=0pt - \ifnum\spacefactor>998 - \ifnum\spacefactor=1001 - \discretionary{}{}{\kern-.085em}% - \else - \allowbreak - \fi\fi\fi\fi\fi\fi -} -\def\hangulspacefactor#1{% - \ifnum#1>13311 - \ifnum#1<64255 \spacefactor=1001 \else% hangul, hanja - \ifnum#1=65288 \spacefactor=998 \else% ( - \ifnum#1=65308 \spacefactor=998 \else% < - \ifnum#1=65339 \spacefactor=998 \else% [ - \ifnum#1=65371 \spacefactor=998 % { - \fi\fi\fi\fi\fi\else - \ifnum#1>12295 - \ifnum#1<12316 % 〈〉《》「」 etc - \ifodd#1 \else \spacefactor=998 \fi% 〈《「『【 etc - \fi\fi\fi -} -\def\breakbeforeasciioparen{\ifx (\nextglyph\allowbreak\fi} -\linespread{1.3} diff --git a/debian/changelog b/debian/changelog index 275c6beb7..0dc235e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ installation-guide (2017XXXX) UNRELEASED; urgency=medium Closes: #692314 * Icedove was de-branded to Thunderbird (see #816679): related changings. * Fix typo in supported ARM devices section. Closes: #869932 + * Remove support for 'ps' output format, therefore remove depends openjade, + jadetex, ko.tex-base and cm-super as well. Closes: #871751 [ Martin Michlmayr ] * Remove QNAP TS-109, TS-209 and TS-409 as they are no longer supported. diff --git a/debian/control b/debian/control index 7310b09a3..debce9a3e 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 4.0.1 Vcs-Svn: svn://svn.debian.org/d-i/trunk/manual Vcs-Browser: http://anonscm.debian.org/viewvc/d-i/trunk/manual/ Build-Depends: debhelper (>= 6) -Build-Depends-Indep: docbook, docbook-xml, docbook-xsl, xsltproc, gawk, libhtml-parser-perl, w3m, poxml, jadetex, openjade, dblatex, docbook-dsssl, ghostscript, texlive-xetex, lmodern, texlive-lang-cyrillic, texlive-lang-czechslovak, texlive-lang-european, texlive-lang-french, texlive-lang-german, texlive-lang-greek, texlive-lang-italian, texlive-lang-other, texlive-lang-portuguese, texlive-lang-spanish, ko.tex-base, cm-super, fonts-wqy-microhei, fonts-vlgothic, fonts-freefont-ttf +Build-Depends-Indep: docbook, docbook-xml, docbook-xsl, xsltproc, gawk, libhtml-parser-perl, w3m, poxml, dblatex, docbook-dsssl, ghostscript, texlive-xetex, lmodern, texlive-lang-cyrillic, texlive-lang-czechslovak, texlive-lang-european, texlive-lang-french, texlive-lang-german, texlive-lang-greek, texlive-lang-italian, texlive-lang-other, texlive-lang-portuguese, texlive-lang-spanish, fonts-wqy-microhei, fonts-vlgothic, fonts-freefont-ttf # This comment can also be used to generate a Build-Depends-Indep line, by # running the debian/genbuilddeps program. So put each build dep on its own # line, prefixed by " - " and to comment out a build dep, start the line @@ -25,13 +25,10 @@ Build-Depends-Indep: docbook, docbook-xml, docbook-xsl, xsltproc, gawk, libhtml- # Used to generate plain text manual from html. # - poxml # Translations of the manual are done in po files via poxml. -# - jadetex -# - openjade -# ps variants are build using jade. # - dblatex # pdf variants are build using dblatex. # - docbook-dsssl -# Used for producing pdf and ps files. +# Used for producing pdf files. # - ghostscript # For pdfs. # - texlive-xetex @@ -55,10 +52,6 @@ Build-Depends-Indep: docbook, docbook-xml, docbook-xsl, xsltproc, gawk, libhtml- ## - texlive-lang-vietnamese # All texlive-lang-* packages provide hyphenation and other # language-specific support. -# - ko.tex-base -# Font for Korean ps. -# - cm-super -# Font for Russian ps. # - fonts-wqy-microhei # Font for Korean and Chinese pdf. # - fonts-vlgothic diff --git a/doc/building.txt b/doc/building.txt index ec894b21d..9aaa6c18b 100644 --- a/doc/building.txt +++ b/doc/building.txt @@ -6,7 +6,6 @@ different languages and in different document types. The currently supported document types are: - html - pdf -- ps (currently not enabled) - txt @@ -16,7 +15,6 @@ The currently supported document types are: The build dependencies depend on which document types you wish to generate: all : dpkg-dev, docbook, docbook-xml, docbook-xsl, xsltproc, poxml html : (no additional packages required) -ps : openjade, jadetex, docbook-dsssl pdf : docbook-dsssl, ghostscript, dblatex txt : w3m @@ -26,10 +24,6 @@ ru : cm-super (type1 fonts) zh : fonts-wqy-microhei ja : fonts-vlgothic -Note: jadetex depends on tetex-bin which unfortunately depends on some X libs, - so installing jadetex will pull in a basic X installation. - There are several open bugs about this (the oldest over 3 years old, but - it seems nobody cares enough to fix it (see #223728). 2. Included Files: ================== @@ -75,8 +69,6 @@ style-common.xsl: Common parameters for xsl transformation. style-html.xsl: HTML-specific parameters for xsl transformation. -style-print.dsl: Parameters for dvi transformation. - style-fo.xsl: FO-specific parameters for xsl transformation. (currently unused) |