From 2b121d7ddc9491eafd849391de29f3d9f318f388 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 2 Jun 2019 14:24:59 +0200 Subject: Update numbers --- build/arch-options/amd64 | 6 +-- build/arch-options/arm64 | 2 +- build/arch-options/armel | 2 +- build/arch-options/armhf | 2 +- build/arch-options/hppa | 2 +- build/arch-options/hurd-i386 | 2 +- build/arch-options/i386 | 4 +- build/arch-options/ia64 | 2 +- build/arch-options/kfreebsd-amd64 | 4 +- build/arch-options/kfreebsd-i386 | 4 +- build/arch-options/mips | 2 +- build/arch-options/mips64el | 2 +- build/arch-options/mipsel | 2 +- build/arch-options/powerpc | 4 +- build/arch-options/ppc64el | 4 +- build/arch-options/s390 | 2 +- build/arch-options/s390x | 2 +- build/arch-options/sparc | 2 +- build/entities/common.ent | 86 +++++++++++++++++++-------------------- debian/changelog | 3 ++ 20 files changed, 71 insertions(+), 68 deletions(-) diff --git a/build/arch-options/amd64 b/build/arch-options/amd64 index 3fcf373ab..8ceaa66ad 100644 --- a/build/arch-options/amd64 +++ b/build/arch-options/amd64 @@ -6,9 +6,9 @@ archspec="amd64;any-amd64;x86;any-x86;not-s390;not-powerpc" arch_listname="amd64" arch_porturl="amd64" # This is coming from the lowmem package -minimum_memory=178 +minimum_memory=550 # This is coming from the rootskel package, S60frontend -minimum_memory_gtk=229 +minimum_memory_gtk=800 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" @@ -25,4 +25,4 @@ goodies="supports-lang-chooser" # To re-add the "checked for this arch" or "not-checked for this arch" warnings # back (see en/bookinfo.xml file), add "checked" or "not-checked" to status here. -status="" \ No newline at end of file +status="" diff --git a/build/arch-options/arm64 b/build/arch-options/arm64 index d57e43b47..bb6d8e1af 100644 --- a/build/arch-options/arm64 +++ b/build/arch-options/arm64 @@ -10,7 +10,7 @@ archspec="arm;arm64;not-x86;not-s390;not-powerpc" arch_listname="arm" arch_porturl="arm" # This is coming from the lowmem package -minimum_memory=31 +minimum_memory=80 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel Features" smp_config_option="Symmetric Multi-Processing" diff --git a/build/arch-options/armel b/build/arch-options/armel index 0045a3366..3170f792b 100644 --- a/build/arch-options/armel +++ b/build/arch-options/armel @@ -10,7 +10,7 @@ archspec="arm;armel;not-x86;not-s390;not-powerpc" arch_listname="arm" arch_porturl="arm" # This is coming from the lowmem package -minimum_memory=31 +minimum_memory=80 # These two options should be set if condition 'smp' is set below smp_config_section="N/A" smp_config_option="N/A" diff --git a/build/arch-options/armhf b/build/arch-options/armhf index e14bbefe5..abb4105eb 100644 --- a/build/arch-options/armhf +++ b/build/arch-options/armhf @@ -10,7 +10,7 @@ archspec="arm;armhf;not-x86;not-s390;not-powerpc" arch_listname="arm" arch_porturl="arm" # This is coming from the lowmem package -minimum_memory=31 +minimum_memory=80 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel Features" smp_config_option="Symmetric Multi-Processing" diff --git a/build/arch-options/hppa b/build/arch-options/hppa index 5320ddde5..75d517e43 100644 --- a/build/arch-options/hppa +++ b/build/arch-options/hppa @@ -6,7 +6,7 @@ archspec="hppa;not-x86;not-s390;not-powerpc" arch_listname="hppa" arch_porturl="hppa" # This is coming from the lowmem package -minimum_memory=32 +minimum_memory=64 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/hurd-i386 b/build/arch-options/hurd-i386 index 2f08d42ea..6953314f5 100644 --- a/build/arch-options/hurd-i386 +++ b/build/arch-options/hurd-i386 @@ -6,7 +6,7 @@ archspec="hurd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc" arch_listname="hurd" arch_porturl="hurd" # This is coming from the lowmem package -minimum_memory=365 +minimum_memory=500 # This is coming from the rootskel package, S60frontend minimum_memory_gtk=750 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/i386 b/build/arch-options/i386 index e044b6332..af7c055ae 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -6,9 +6,9 @@ archspec="i386;any-i386;x86;any-x86;not-s390;not-powerpc" arch_listname="boot" arch_porturl="i386" # This is coming from the lowmem package -minimum_memory=135 +minimum_memory=400 # This is coming from the rootskel package, S60frontend -minimum_memory_gtk=293 +minimum_memory_gtk=550 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/ia64 b/build/arch-options/ia64 index 4e6fcf630..1acb689b4 100644 --- a/build/arch-options/ia64 +++ b/build/arch-options/ia64 @@ -7,7 +7,7 @@ arch_listname="ia64" arch_porturl="ia64" # TODO: update # This is coming from the lowmem package -minimum_memory=32 +minimum_memory=64 # These two options should be set if condition 'smp' is set below smp_config_section="General setup" smp_config_option="SMP support" diff --git a/build/arch-options/kfreebsd-amd64 b/build/arch-options/kfreebsd-amd64 index 2db9389a1..c9ff22ca6 100644 --- a/build/arch-options/kfreebsd-amd64 +++ b/build/arch-options/kfreebsd-amd64 @@ -6,9 +6,9 @@ archspec="kfreebsd-amd64;any-amd64;any-x86;not-x86;not-s390;not-powerpc" arch_listname="bsd" arch_porturl="kfreebsd-gnu" # This is coming from the lowmem package -minimum_memory=170 +minimum_memory=232 # This is coming from the rootskel package, S60frontend -minimum_memory_gtk=224 +minimum_memory_gtk=256 # These two options should be set if condition 'smp' is set below # TODO: update smp_config_section="Processor type and features" diff --git a/build/arch-options/kfreebsd-i386 b/build/arch-options/kfreebsd-i386 index 2d075c697..1eea6c41e 100644 --- a/build/arch-options/kfreebsd-i386 +++ b/build/arch-options/kfreebsd-i386 @@ -6,9 +6,9 @@ archspec="kfreebsd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc" arch_listname="bsd" arch_porturl="kfreebsd-gnu" # This is coming from the lowmem package -minimum_memory=90 +minimum_memory=104 # This is coming from the rootskel package, S60frontend -minimum_memory_gtk=293 +minimum_memory_gtk=256 # These two options should be set if condition 'smp' is set below # TODO: update smp_config_section="Processor type and features" diff --git a/build/arch-options/mips b/build/arch-options/mips index c34dc5d16..16f9e7fb3 100644 --- a/build/arch-options/mips +++ b/build/arch-options/mips @@ -6,7 +6,7 @@ archspec="mips;not-x86;not-s390;not-powerpc" arch_listname="mips" arch_porturl="mips" # This is coming from the lowmem package -minimum_memory=33 +minimum_memory=85 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel type" smp_config_option="Multi-Processing support" diff --git a/build/arch-options/mips64el b/build/arch-options/mips64el index 9343cba0a..145cbc393 100644 --- a/build/arch-options/mips64el +++ b/build/arch-options/mips64el @@ -6,7 +6,7 @@ archspec="mips64el;not-x86;not-s390;not-powerpc" arch_listname="mips" arch_porturl="mips" # This is coming from the lowmem package -minimum_memory=33 +minimum_memory=85 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel type" smp_config_option="Multi-Processing support" diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel index 9c5389df2..81c8f0e53 100644 --- a/build/arch-options/mipsel +++ b/build/arch-options/mipsel @@ -6,7 +6,7 @@ archspec="mipsel;not-x86;not-s390;not-powerpc" arch_listname="mips" arch_porturl="mips" # This is coming from the lowmem package -minimum_memory=33 +minimum_memory=85 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel type" smp_config_option="Multi-Processing support" diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc index 4929a7a2e..ead04a502 100644 --- a/build/arch-options/powerpc +++ b/build/arch-options/powerpc @@ -7,9 +7,9 @@ arch_listname="powerpc" arch_porturl="powerpc" # TODO: update # This is coming from the lowmem package -minimum_memory=32 +minimum_memory=64 # This is coming from the rootskel package, S60frontend -minimum_memory_gtk=293 +minimum_memory_gtk=800 # These two options should be set if condition 'smp' is set below smp_config_section="Processor support" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/ppc64el b/build/arch-options/ppc64el index 2d012e10d..f183e7b04 100644 --- a/build/arch-options/ppc64el +++ b/build/arch-options/ppc64el @@ -7,9 +7,9 @@ arch_listname="powerpc" arch_porturl="powerpc" # TODO: update # This is coming from the lowmem package -minimum_memory=32 +minimum_memory=64 # This is coming from the rootskel package, S60frontend -minimum_memory_gtk=170 +minimum_memory_gtk=800 # These two options should be set if condition 'smp' is set below smp_config_section="Processor support" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/s390 b/build/arch-options/s390 index 7d3781894..311048c90 100644 --- a/build/arch-options/s390 +++ b/build/arch-options/s390 @@ -7,7 +7,7 @@ arch_listname="s390" arch_porturl="s390" # TODO: update # This is coming from the lowmem package -minimum_memory=20 +minimum_memory=44 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/s390x b/build/arch-options/s390x index 8d45cb17b..d5a1fe665 100644 --- a/build/arch-options/s390x +++ b/build/arch-options/s390x @@ -11,7 +11,7 @@ arch_listname="s390" arch_porturl="s390" # TODO: update # This is coming from the lowmem package -minimum_memory=20 +minimum_memory=44 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/sparc b/build/arch-options/sparc index 4fdd4658f..83ad65f91 100644 --- a/build/arch-options/sparc +++ b/build/arch-options/sparc @@ -7,7 +7,7 @@ arch_listname="sparc" arch_porturl="sparc" # TODO: update # This is coming from the lowmem package -minimum_memory=32 +minimum_memory=64 # These two options should be set if condition 'smp' is set below smp_config_section="General setup" smp_config_option="Symmetric multi-processing support" diff --git a/build/entities/common.ent b/build/entities/common.ent index 186afa781..128095798 100644 --- a/build/entities/common.ent +++ b/build/entities/common.ent @@ -62,7 +62,7 @@ cleanup, plus minimal ~150MB work space included. Also update the value in debian-installer/build/boot/x86/f2.txt --> - + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - + @@ -138,18 +138,18 @@ to first switch tasksel to that DE using the following command, e.g: - + 75746 - 74365 - 74134 - 74360 - 75573 - 73821 - 73793 - 74037 - 74309 - 73878 + "85212 + 83841 + 82997 + 83498 + 84902 + 82790 + 83004 + 83095 + 83524 + 82943 "> @@ -159,13 +159,13 @@ to first switch tasksel to that DE using the following command, e.g: - + - + diff --git a/debian/changelog b/debian/changelog index 3ae22d6fb..0b95747d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ installation-guide (20190324) UNRELEASED; urgency=medium [ Changwoo Ryu ] * Improve Korean pdf + [ Samuel Thibault ] + * Update numbers. + -- Samuel Thibault Wed, 29 May 2019 21:19:05 +0200 installation-guide (20190323) unstable; urgency=medium -- cgit v1.2.3