Update disk usage, package numbers, lists number values.

2 files changed, 58 insertions, 58 deletions

diff --git a/build/entities/common.ent b/build/entities/common.ent
index 3aa8f8813..f1edf0de8 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -39,7 +39,7 @@
 <!-- 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 "700&notation-megabytes;">
+<!ENTITY minimum-fs-size "580&notation-megabytes;">
 
 <!--
 Size of install as used in appendix/files.xml; all values based on amd64.
@@ -68,82 +68,82 @@ to first switch tasksel to that DE using the following command, e.g:
 -->
 
 <!-- Size of the basic installation -->
-  <!ENTITY base-system-size   "510">
-  <!ENTITY std-system-size    "701">
+  <!ENTITY base-system-size   "429">
+  <!ENTITY std-system-size    "570">
 <!-- Desktop environment task
      (obsolete; can be removed when all translations have been updated) -->
-  <!ENTITY task-desktop-inst "2519">
-  <!ENTITY task-desktop-dl    "923">
-  <!ENTITY task-desktop-tot  "3473">
+  <!ENTITY task-desktop-inst "2546">
+  <!ENTITY task-desktop-dl    "844">
+  <!ENTITY task-desktop-tot  "3390">
 <!-- Desktop environment task - GNOME -->
-  <!ENTITY task-desktop-gnome-inst "2519">
-  <!ENTITY task-desktop-gnome-dl    "923">
-  <!ENTITY task-desktop-gnome-tot  "3473">
+  <!ENTITY task-desktop-gnome-inst "2546">
+  <!ENTITY task-desktop-gnome-dl    "844">
+  <!ENTITY task-desktop-gnome-tot  "3390">
 <!-- Desktop environment task - KDE -->
-  <!ENTITY task-desktop-kde-inst   "2342">
-  <!ENTITY task-desktop-kde-dl      "927">
-  <!ENTITY task-desktop-kde-tot    "3269">
+  <!ENTITY task-desktop-kde-inst   "2460">
+  <!ENTITY task-desktop-kde-dl      "866">
+  <!ENTITY task-desktop-kde-tot    "3326">
 <!-- Desktop environment task - Xfce -->
-  <!ENTITY task-desktop-xfce-inst  "1754">
-  <!ENTITY task-desktop-xfce-dl     "622">
-  <!ENTITY task-desktop-xfce-tot   "2376">
+  <!ENTITY task-desktop-xfce-inst  "1885">
+  <!ENTITY task-desktop-xfce-dl     "596">
+  <!ENTITY task-desktop-xfce-tot   "2481">
 <!-- Desktop environment task - LXDE -->
-  <!ENTITY task-desktop-lxde-inst  "1694">
-  <!ENTITY task-desktop-lxde-dl     "605">
-  <!ENTITY task-desktop-lxde-tot   "2299">
+  <!ENTITY task-desktop-lxde-inst  "1601">
+  <!ENTITY task-desktop-lxde-dl     "519">
+  <!ENTITY task-desktop-lxde-tot   "2120">
 <!-- Web server task -->
-  <!ENTITY task-web-inst       "23">
-  <!ENTITY task-web-dl         "5">
-  <!ENTITY task-web-tot        "28">
+  <!ENTITY task-web-inst       "60">
+  <!ENTITY task-web-dl         "15">
+  <!ENTITY task-web-tot        "71">
 <!-- Print server task -->
-  <!ENTITY task-print-inst    "224">
-  <!ENTITY task-print-dl       "73">
-  <!ENTITY task-print-tot     "297">
+  <!ENTITY task-print-inst    "310">
+  <!ENTITY task-print-dl       "97">
+  <!ENTITY task-print-tot     "407">
 <!-- DNS server task -->
-  <!ENTITY task-dns-inst        "3">
-  <!ENTITY task-dns-dl          "1">
-  <!ENTITY task-dns-tot         "4">
+  <!ENTITY task-dns-inst       "47">
+  <!ENTITY task-dns-dl         "14">
+  <!ENTITY task-dns-tot        "61">
 <!-- File server task -->
-  <!ENTITY task-file-inst     "126">
-  <!ENTITY task-file-dl        "26">
-  <!ENTITY task-file-tot      "152">
+  <!ENTITY task-file-inst     "185">
+  <!ENTITY task-file-dl        "44">
+  <!ENTITY task-file-tot      "229">
 <!-- Mail server task -->
-  <!ENTITY task-mail-inst      "77">
-  <!ENTITY task-mail-dl        "30">
-  <!ENTITY task-mail-tot      "107">
+  <!ENTITY task-mail-inst     "137">
+  <!ENTITY task-mail-dl        "50">
+  <!ENTITY task-mail-tot      "187">
 <!-- SQL database task -->
-  <!ENTITY task-sql-inst       "40">
-  <!ENTITY task-sql-dl         "14">
-  <!ENTITY task-sql-tot        "54">
+  <!ENTITY task-sql-inst       "97">
+  <!ENTITY task-sql-dl         "26">
+  <!ENTITY task-sql-tot       "123">
 <!-- SSH server task -->
-  <!ENTITY task-ssh-inst        "1">
-  <!ENTITY task-ssh-dl          "0">
-  <!ENTITY task-ssh-tot         "1">
+  <!ENTITY task-ssh-inst       "21">
+  <!ENTITY task-ssh-dl          "9">
+  <!ENTITY task-ssh-tot        "30">
 <!-- Laptop task -->
-  <!ENTITY task-laptop-inst   "305">
-  <!ENTITY task-laptop-dl      "97">
-  <!ENTITY task-laptop-tot    "402">
+  <!ENTITY task-laptop-inst   "402">
+  <!ENTITY task-laptop-dl     "122">
+  <!ENTITY task-laptop-tot    "524">
 
 
 <!-- number of packages, approx, in the main distribution -->
 <!-- use:
      for i in binary-*; do echo -n "$i: "; zgrep '^Package:' binary-all/Packages.gz $i/Packages.gz | wc -l; done
 -->
-<!-- last updated: August 27 2012 for Wheezy (sthibault) -->
+<!-- last updated: November 25 2012 for Wheezy (sthibault) -->
 <!ENTITY num-of-distrib-pkgs
-  "<phrase arch='amd64'>52941</phrase>
-   <phrase arch='armel'>52168</phrase>
-   <phrase arch='armhf'>52076</phrase>
-   <phrase arch='i386'>53051</phrase>
-   <phrase arch='ia64'>51187</phrase>
-   <phrase arch='kfreebsd-amd64'>50320</phrase>
-   <phrase arch='kfreebsd-i386'>50283</phrase>
-   <phrase arch='mips'>52046</phrase>
-   <phrase arch='mipsel'>52076</phrase>
-   <phrase arch='powerpc'>52340</phrase>
-   <phrase arch='s390'>51833</phrase>
-   <phrase arch='s390'>51653</phrase>
-   <phrase arch='sparc'>52207</phrase>
+  "<phrase arch='amd64'>52581</phrase>
+   <phrase arch='armel'>51832</phrase>
+   <phrase arch='armhf'>51727</phrase>
+   <phrase arch='i386'>52691</phrase>
+   <phrase arch='ia64'>50849</phrase>
+   <phrase arch='kfreebsd-amd64'>50021</phrase>
+   <phrase arch='kfreebsd-i386'>49992</phrase>
+   <phrase arch='mips'>51698</phrase>
+   <phrase arch='mipsel'>51728</phrase>
+   <phrase arch='powerpc'>51987</phrase>
+   <phrase arch='s390'>51488</phrase>
+   <phrase arch='s390'>51324</phrase>
+   <phrase arch='sparc'>51861</phrase>
    ">
 
 <!-- Number of current Debian developers -->
@@ -152,7 +152,7 @@ to first switch tasksel to that DE using the following command, e.g:
 
 <!-- Number of current Debian maillists (see
      http://lists.debian.org/completeindex.html) -->
-<!ENTITY num-of-debian-maillists "253">
+<!ENTITY num-of-debian-maillists "255">
 
 <!-- version of X11 shipping with the current release -->
 <!ENTITY x11ver "7.7">
diff --git a/debian/changelog b/debian/changelog
index 75f974f49..b3e019454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ installation-guide (2012XXXX) UNRELEASED; urgency=low
     Closes: #691164
 
   [ Samuel Thibault ]
-  * Update lowmem values.
+  * Update lowmem, disk usage, package numbers, lists number values.
   * Fix po detection.
   * Fix bogus URLs, thanks Brian Potkin for the hint. Closes: #692310.