update figures

1 files changed, 33 insertions, 30 deletions

diff --git a/build/entities/common.ent b/build/entities/common.ent
index aac1d6787..1e8dc1852 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -36,8 +36,10 @@
 <!ENTITY notation-megabytes "MB">
 
 <!-- minimum hard disk size for base system -->
-<!-- As measured on a completed squeeze install, minimal ~200MB work space included. -->
-<!ENTITY minimum-fs-size "600&notation-megabytes;">
+<!-- As measured just before reboot (i.e. before the cleanup script drops
+.debs), plus some margin. This is also approximately the used size after
+cleanup, plus minimal ~150MB work space included. -->
+<!ENTITY minimum-fs-size "650&notation-megabytes;">
 
 <!--
 Size of install as used in appendix/files.xml; all values based on amd64.
@@ -70,20 +72,20 @@ to first switch tasksel to that DE using the following command, e.g:
   <!ENTITY std-system-size    "532">
 <!-- Desktop environment task
      (obsolete; can be removed when all translations have been updated) -->
-  <!ENTITY task-desktop-inst "2588">
-  <!ENTITY task-desktop-dl    "962">
-  <!ENTITY task-desktop-tot  "3550">
+  <!ENTITY task-desktop-inst "2567">
+  <!ENTITY task-desktop-dl    "954">
+  <!ENTITY task-desktop-tot  "3521">
 <!-- Desktop environment task - GNOME -->
-  <!ENTITY task-desktop-gnome-inst "2588">
-  <!ENTITY task-desktop-gnome-dl    "962">
-  <!ENTITY task-desktop-gnome-tot  "3550">
+  <!ENTITY task-desktop-gnome-inst "2567">
+  <!ENTITY task-desktop-gnome-dl    "954">
+  <!ENTITY task-desktop-gnome-tot  "3521">
 <!-- Desktop environment task - KDE -->
-  <!ENTITY task-desktop-kde-inst   "2162">
-  <!ENTITY task-desktop-kde-dl      "861">
-  <!ENTITY task-desktop-kde-tot    "3023">
+  <!ENTITY task-desktop-kde-inst   "2159">
+  <!ENTITY task-desktop-kde-dl      "860">
+  <!ENTITY task-desktop-kde-tot    "3019">
 <!-- Desktop environment task - Xfce -->
-  <!ENTITY task-desktop-xfce-inst  "1671">
-  <!ENTITY task-desktop-xfce-dl     "638">
+  <!ENTITY task-desktop-xfce-inst  "1672">
+  <!ENTITY task-desktop-xfce-dl     "637">
   <!ENTITY task-desktop-xfce-tot   "2309">
 <!-- Desktop environment task - LXDE -->
   <!ENTITY task-desktop-lxde-inst  "1452">
@@ -102,9 +104,9 @@ to first switch tasksel to that DE using the following command, e.g:
   <!ENTITY task-dns-dl          "1">
   <!ENTITY task-dns-tot         "5">
 <!-- File server task -->
-  <!ENTITY task-file-inst     "127">
+  <!ENTITY task-file-inst     "126">
   <!ENTITY task-file-dl        "42">
-  <!ENTITY task-file-tot      "169">
+  <!ENTITY task-file-tot      "168">
 <!-- Mail server task -->
   <!ENTITY task-mail-inst      "64">
   <!ENTITY task-mail-dl        "23">
@@ -127,28 +129,29 @@ to first switch tasksel to that DE using the following command, e.g:
 <!-- use:
      for i in binary-*; do echo -n "$i: "; zgrep '^Package:' $i/Packages.gz | wc -l; done
 -->
-<!-- last updated: October 27 2010 for Squeeze (sthibault) -->
+<!-- last updated: January 16 2011 for Squeeze (sthibault) -->
 <!ENTITY num-of-distrib-pkgs
-  "<phrase arch='amd64'>28300</phrase>
-   <phrase arch='armel'>27750</phrase>
-   <phrase arch='hppa'>27400</phrase>
-   <phrase arch='i386'>28450</phrase>
-   <phrase arch='ia64'>27500</phrase>
-   <phrase arch='kfreebsd-amd64'>26050</phrase>
-   <phrase arch='kfreebsd-i386'>26000</phrase>
-   <phrase arch='mips'>27700</phrase>
-   <phrase arch='mipsel'>27700</phrase>
-   <phrase arch='powerpc'>28050</phrase>
-   <phrase arch='s390'>27750</phrase>
-   <phrase arch='sparc'>27900</phrase>
+  "<phrase arch='amd64'>28150</phrase>
+   <phrase arch='armel'>27600</phrase>
+   <phrase arch='hppa'>27250</phrase>
+   <phrase arch='i386'>28250</phrase>
+   <phrase arch='ia64'>27300</phrase>
+   <phrase arch='kfreebsd-amd64'>25900</phrase>
+   <phrase arch='kfreebsd-i386'>25900</phrase>
+   <phrase arch='mips'>27500</phrase>
+   <phrase arch='mipsel'>27550</phrase>
+   <phrase arch='powerpc'>27900</phrase>
+   <phrase arch='s390'>27600</phrase>
+   <phrase arch='sparc'>27750</phrase>
    ">
 
 <!-- Number of current Debian developers -->
 <!-- Can be found for example on vote.debian.org (use last vote) -->
 <!ENTITY num-of-debian-developers "886">
 
-<!-- Number of current Debian maillists -->
-<!ENTITY num-of-debian-maillists "238">
+<!-- Number of current Debian maillists (see
+     http://lists.debian.org/completeindex.html) -->
+<!ENTITY num-of-debian-maillists "245">
 
 <!-- version of X11 shipping with the current release -->
 <!ENTITY x11ver "7.5">