diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rw-r--r-- | build/arch-options/hurd-i386 | 2 | ||||
| -rw-r--r-- | build/arch-options/i386 | 2 | ||||
| -rw-r--r-- | build/arch-options/kfreebsd-i386 | 2 | ||||
| -rw-r--r-- | build/arch-options/powerpc | 2 | ||||
| -rwxr-xr-x | build/build.sh | 2 | ||||
| -rwxr-xr-x | build/buildone.sh | 7 | ||||
| -rwxr-xr-x | build/buildone_ng.sh | 7 | ||||
| -rwxr-xr-x | build/buildweb.sh | 5 | ||||
| -rw-r--r-- | build/entities/common.ent | 15 | ||||
| -rw-r--r-- | build/lang-options/cs | 3 | ||||
| -rw-r--r-- | build/lang-options/da | 2 | ||||
| -rw-r--r-- | build/lang-options/de | 2 | ||||
| -rw-r--r-- | build/lang-options/pt | 2 | ||||
| -rw-r--r-- | build/lang-options/ru | 2 | ||||
| -rw-r--r-- | build/stylesheets/dblatex.xsl | 16 | ||||
| -rw-r--r-- | build/templates/docstruct.ent | 6 |
17 files changed, 34 insertions, 45 deletions
diff --git a/build/Makefile b/build/Makefile index 61413df52..dbb406c6a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -35,7 +35,7 @@ $(TARGETS): %: else \ # Do not fail because of missing PDF support for some languages \ if [ -n "$$web" ] ; then \ - mv ./$$destdir/install.$$lang.$$format "$$arch_destination/$$destsuffix/install.$$format.$$lang_id" 2>/dev/null || true ; \ + mv ./$$destdir/install.$$lang.$$format "$$arch_destination/$$destsuffix/install.$$lang_id.$$format" 2>/dev/null || true ; \ else \ mv ./$$destdir/install.$$lang.$$format "$$arch_destination/$$destsuffix" 2>/dev/null || true ; \ fi ; \ diff --git a/build/arch-options/hurd-i386 b/build/arch-options/hurd-i386 index 0b341aeb6..160c79642 100644 --- a/build/arch-options/hurd-i386 +++ b/build/arch-options/hurd-i386 @@ -19,8 +19,6 @@ smp_config_option="N/A" # in the build scripts fdisk="fdisk.txt;cfdisk.txt" network="" -# For Lenny i386 does not have floppy images -#boot="supports-floppy-boot;bootable-disk" boot="bootable-disk" frontend="newt" other="" diff --git a/build/arch-options/i386 b/build/arch-options/i386 index 4cb7d5316..9d155392f 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -19,8 +19,6 @@ smp_config_option="Symmetric multi-processing support" # in the build scripts fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-bootp;supports-nfsroot" -# For Lenny i386 does not have floppy images -#boot="supports-floppy-boot;bootable-disk;bootable-usb" boot="bootable-disk;bootable-usb;isohybrid-supported" frontend="newt;gtk" other="supports-wireless;supports-pcmcia;supports-serial-console" diff --git a/build/arch-options/kfreebsd-i386 b/build/arch-options/kfreebsd-i386 index 46be8b717..8357cbf24 100644 --- a/build/arch-options/kfreebsd-i386 +++ b/build/arch-options/kfreebsd-i386 @@ -21,8 +21,6 @@ smp_config_option="Symmetric multi-processing support" # TODO: update fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-bootp;supports-nfsroot" -# For Lenny i386 does not have floppy images -#boot="supports-floppy-boot;bootable-disk;bootable-usb" boot="bootable-disk;bootable-usb;isohybrid-unsupported" frontend="newt;not-gtk" other="supports-wireless;supports-pcmcia;supports-serial-console" diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc index d885d54e2..db8a8d8fa 100644 --- a/build/arch-options/powerpc +++ b/build/arch-options/powerpc @@ -20,7 +20,7 @@ smp_config_option="Symmetric multi-processing support" # in the build scripts fdisk="mac-fdisk.txt;cfdisk.txt" network="supports-tftp;supports-bootp;supports-nfsroot" -boot="supports-floppy-boot;bootable-disk" +boot="bootable-disk" frontend="newt;gtk" other="supports-wireless;supports-pcmcia;supports-serial-console" smp="supports-smp-sometimes" diff --git a/build/build.sh b/build/build.sh index 6b45db531..4f722f694 100755 --- a/build/build.sh +++ b/build/build.sh @@ -5,7 +5,7 @@ set -e [ -r ./po_functions ] || exit 1 . ./po_functions -manual_release=${manual_release:=buster} +manual_release=${manual_release:=bullseye} if [ -z "$languages" ]; then # Buildlist of languages diff --git a/build/buildone.sh b/build/buildone.sh index 7375838ff..2e68ff496 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -8,6 +8,8 @@ if [ "$1" = "--help" ]; then exit 0 fi +DEBVERSION=`dpkg-parsechangelog -l ../debian/changelog -S Version` + arch=${1:-i386} language=${2:-en} formats=${3:-html} @@ -57,7 +59,7 @@ create_profiled () { fi if [ -z "$manual_release" ]; then - manual_release="buster" + manual_release="bullseye" fi if [ -z "$manual_target" ]; then manual_target="for_cd" @@ -86,6 +88,7 @@ create_profiled () { # Write dynamic non-profilable entities into the file echo "<!-- arch- and lang-specific non-profilable entities -->" > $dynamic + echo "<!ENTITY debversion \"$DEBVERSION\">" >> $dynamic echo "<!ENTITY langext \".${language}\">" >> $dynamic echo "<!ENTITY architecture \"${arch}\">" >> $dynamic echo "<!ENTITY arch-kernel \"${arch_kernel}\">" >> $dynamic @@ -187,7 +190,7 @@ create_pdf() { echo "Info: creating .pdf file..." mkdir -p $tempdir/dblatex - (TMPDIR=$tempdir/dblatex dblatex -d -V -T db2latex -b xetex -p ./stylesheets/dblatex.xsl \ + (TMPDIR=$tempdir/dblatex dblatex -q -V -T db2latex -b xetex -p ./stylesheets/dblatex.xsl \ -o $tempdir/install.${language}.pdf \ $tempdir/install.${language}.profiled.xml --param=lingua=${language} ) RET=$?; [ $RET -ne 0 ] && return $RET diff --git a/build/buildone_ng.sh b/build/buildone_ng.sh index c251e132b..a70e43284 100755 --- a/build/buildone_ng.sh +++ b/build/buildone_ng.sh @@ -12,6 +12,8 @@ if [ "$1" = "--help" ]; then exit 0 fi +DEBVERSION=`dpkg-parsechangelog -l ../debian/changelog -S Version` + arch=${1:-i386} languages=${2:-en} formats=${3:-html} @@ -61,7 +63,7 @@ create_profiled () { fi if [ -z "$manual_release" ]; then - manual_release="buster" + manual_release="bullseye" fi if [ -z "$manual_target" ]; then manual_target="for_cd" @@ -90,6 +92,7 @@ create_profiled () { # Write dynamic non-profilable entities into the file echo "<!-- arch- and lang-specific non-profilable entities -->" > $dynamic + echo "<!ENTITY debversion \"$DEBVERSION\">" >> $dynamic echo "<!ENTITY langext \".${languages}\">" >> $dynamic echo "<!ENTITY architecture \"${arch}\">" >> $dynamic echo "<!ENTITY arch-kernel \"${arch_kernel}\">" >> $dynamic @@ -207,7 +210,7 @@ create_pdf() { echo "Info: creating .pdf file..." mkdir -p $tempdir/dblatex - (TMPDIR=$tempdir/dblatex dblatex -d -V -T db2latex -b xetex -p ./stylesheets/dblatex.xsl \ + (TMPDIR=$tempdir/dblatex dblatex -q -V -T db2latex -b xetex -p ./stylesheets/dblatex.xsl \ -o $tempdir/install.${languages}.pdf \ $tempdir/install.${languages}.profiled.xml --param=lingua=${languages} ) RET=$?; [ $RET -ne 0 ] && return $RET diff --git a/build/buildweb.sh b/build/buildweb.sh index f17e410ff..f309d45fe 100755 --- a/build/buildweb.sh +++ b/build/buildweb.sh @@ -5,7 +5,7 @@ set -e [ -r ./po_functions ] || exit 1 . ./po_functions -manual_release=${manual_release:=buster} +manual_release=${manual_release:=bullseye} if [ -z "$languages" ]; then # Buildlist of languages to be included on the official website @@ -52,7 +52,8 @@ make languages="$languages" architectures="$architectures" destination="$destina PRESEED="../en/appendix/preseed.xml" if [ -f $PRESEED ] && [ -f preseed.pl ] ; then - ./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt + echo '#_preseed_V1' >$destination/example-preseed.txt + ./preseed.pl -r $manual_release $PRESEED >>$destination/example-preseed.txt fi # Delete temporary PO files and generated XML files diff --git a/build/entities/common.ent b/build/entities/common.ent index 128095798..f54b5875f 100644 --- a/build/entities/common.ent +++ b/build/entities/common.ent @@ -4,7 +4,7 @@ <!-- current year (to be used for copyright declaration). --> <!-- When changing this, also change in "debian/copyright" file! --> -<!ENTITY current-year "2019"> +<!ENTITY current-year "2020"> <!-- short name to use for Debian --> <!ENTITY debian "Debian"> @@ -14,10 +14,10 @@ <!ENTITY d-i "<classname>debian-installer</classname>"> -<!ENTITY release "10"> -<!ENTITY releasename "buster"> -<!ENTITY releasename-cap "Buster"> -<!ENTITY releasename-uc "BUSTER"> +<!ENTITY release "11"> +<!ENTITY releasename "bullseye"> +<!ENTITY releasename-cap "Bullseye"> +<!ENTITY releasename-uc "BULLSEYE"> <!ENTITY FIXME "<emphasis>Documentation not complete, text missing.</emphasis>"> @@ -121,10 +121,6 @@ to first switch tasksel to that DE using the following command, e.g: <!ENTITY task-web-inst "44"> <!ENTITY task-web-dl "11"> <!ENTITY task-web-tot "55"> -<!-- Print server task --> - <!ENTITY task-print-inst "440"> - <!ENTITY task-print-dl "91"> - <!ENTITY task-print-tot "531"> <!-- SSH server task --> <!ENTITY task-ssh-inst "2"> <!ENTITY task-ssh-dl "0"> @@ -184,5 +180,4 @@ to first switch tasksel to that DE using the following command, e.g: "install.<filename arch='i386'>386</filename><filename arch='amd64'>amd</filename>"> <!-- prefix for files that can be downloaded --> -<!-- <![ %official-web-build; [ <!ENTITY downloadable-file "&url-boot-floppies;"> ]]> --> <!ENTITY downloadable-file "&url-debian-installer;"> diff --git a/build/lang-options/cs b/build/lang-options/cs index 7fdda7b3d..f7220a4e6 100644 --- a/build/lang-options/cs +++ b/build/lang-options/cs @@ -1,2 +1 @@ -optional_paras="outdated-translation" - +optional_paras="about-langteam;outdated-translation" diff --git a/build/lang-options/da b/build/lang-options/da index 6c87bd96e..2d784b3a5 100644 --- a/build/lang-options/da +++ b/build/lang-options/da @@ -1,2 +1,2 @@ -# empty placeholder file +optional_paras="translation-status" diff --git a/build/lang-options/de b/build/lang-options/de index 08f24d26d..6ad439378 100644 --- a/build/lang-options/de +++ b/build/lang-options/de @@ -1 +1 @@ -optional_paras="about-langteam;gpl-unofficial" +optional_paras="translation-status;about-langteam;gpl-unofficial" diff --git a/build/lang-options/pt b/build/lang-options/pt index d8c73783c..6ad439378 100644 --- a/build/lang-options/pt +++ b/build/lang-options/pt @@ -1 +1 @@ -optional_paras="bookinfo-langteam;gpl-unofficial" +optional_paras="translation-status;about-langteam;gpl-unofficial" diff --git a/build/lang-options/ru b/build/lang-options/ru index 6c87bd96e..2d784b3a5 100644 --- a/build/lang-options/ru +++ b/build/lang-options/ru @@ -1,2 +1,2 @@ -# empty placeholder file +optional_paras="translation-status" diff --git a/build/stylesheets/dblatex.xsl b/build/stylesheets/dblatex.xsl index e59a1464b..8a490cae5 100644 --- a/build/stylesheets/dblatex.xsl +++ b/build/stylesheets/dblatex.xsl @@ -16,15 +16,13 @@ </xsl:when> <xsl:when test="contains(/book/@lang,'ko')"> <xsl:text>\usepackage{xeCJK} </xsl:text> - <xsl:text>\xeCJKsetup{CJKspace=true,CJKmath=true,CJKecglue={}} </xsl:text> - <xsl:text>\usepackage{setspace} </xsl:text> - <xsl:text>\onehalfspacing </xsl:text> - <xsl:text>\setCJKmainfont{나눔명조} </xsl:text> - <xsl:text>\setCJKsansfont{나눔고딕} </xsl:text> - <xsl:text>\setCJKmonofont{나눔고딕코딩} </xsl:text> - <xsl:text>\setmainfont{나눔명조} </xsl:text> - <xsl:text>\setsansfont{나눔고딕} </xsl:text> - <xsl:text>\setmonofont{나눔고딕코딩} </xsl:text> + <xsl:text>\usepackage[hangul]{kotex} </xsl:text> + <xsl:text>\setCJKmainfont{Noto Serif CJK KR} </xsl:text> + <xsl:text>\setCJKsansfont{Noto Sans CJK KR} </xsl:text> + <xsl:text>\setCJKmonofont{Noto Sans Mono CJK KR} </xsl:text> + <xsl:text>\setmainfont{Noto Serif CJK KR} </xsl:text> + <xsl:text>\setsansfont{Noto Sans CJK KR} </xsl:text> + <xsl:text>\setmonofont{Noto Sans Mono CJK KR} </xsl:text> </xsl:when> <xsl:when test="contains(/book/@lang,'zh')"> <xsl:text>\usepackage{xeCJK} </xsl:text> diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent index 7cc2aa4fa..112c7881b 100644 --- a/build/templates/docstruct.ent +++ b/build/templates/docstruct.ent @@ -60,10 +60,6 @@ <!ENTITY download-powerpc.xml SYSTEM "##SRCPATH##/install-methods/download/powerpc.xml"> <!ENTITY ipl-tape.xml SYSTEM "##SRCPATH##/install-methods/ipl-tape.xml"> - <!ENTITY create-floppy.xml SYSTEM "##SRCPATH##/install-methods/create-floppy.xml"> - <!ENTITY floppy-i386.xml SYSTEM "##SRCPATH##/install-methods/floppy/i386.xml"> - <!ENTITY floppy-powerpc.xml SYSTEM "##SRCPATH##/install-methods/floppy/powerpc.xml"> - <!ENTITY boot-usb-files.xml SYSTEM "##SRCPATH##/install-methods/boot-usb-files.xml"> <!ENTITY usb-setup-x86.xml SYSTEM "##SRCPATH##/install-methods/usb-setup/x86.xml"> <!ENTITY usb-setup-powerpc.xml SYSTEM "##SRCPATH##/install-methods/usb-setup/powerpc.xml"> @@ -115,7 +111,7 @@ <!ENTITY module-autopartkit.xml SYSTEM "##SRCPATH##/using-d-i/modules/autopartkit.xml"> <!ENTITY module-partitioner.xml SYSTEM "##SRCPATH##/using-d-i/modules/partitioner.xml"> <!ENTITY module-partconf.xml SYSTEM "##SRCPATH##/using-d-i/modules/partconf.xml"> - <!ENTITY module-mdcfg.xml SYSTEM "##SRCPATH##/using-d-i/modules/mdcfg.xml"> + <!ENTITY module-partman-md.xml SYSTEM "##SRCPATH##/using-d-i/modules/partman-md.xml"> <!ENTITY module-partman-lvm.xml SYSTEM "##SRCPATH##/using-d-i/modules/partman-lvm.xml"> <!ENTITY module-partman-crypto.xml SYSTEM "##SRCPATH##/using-d-i/modules/partman-crypto.xml"> <!ENTITY module-finish-install.xml SYSTEM "##SRCPATH##/using-d-i/modules/finish-install.xml"> |