Update task sizes, and number of packages and developers

2 files changed, 40 insertions, 36 deletions

diff --git a/build/entities/common.ent b/build/entities/common.ent
index 895a97895..406bba33b 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -40,7 +40,10 @@
 Size of install as used in appendix/files.xml; all values based on i386.
 
 To determine the size of the base system and tasks, start with a default
-installation without selecting _any_ tasks with use of network mirror.
+installation:
+- in English
+- with use of network mirror
+- without selecting _any_ tasks.
 After the reboot, the size for the minimal base system should be determined
 after running 'aptitude clean' using 'du -hsx /'. After that the "Standard
 system" task should be installed and the size of the standard system can be
@@ -56,40 +59,40 @@ install recommended packages while selecting a task from aptitude will.
 -->
 
 <!-- Size of the basic installation -->
-  <!ENTITY base-system-size   "225">
-  <!ENTITY std-system-size    "353">
+  <!ENTITY base-system-size   "248">
+  <!ENTITY std-system-size    "410">
 <!-- Desktop environment task -->
-  <!ENTITY task-desktop-inst "1360">
-  <!ENTITY task-desktop-dl    "454">
-  <!ENTITY task-desktop-tot  "1814">
+  <!ENTITY task-desktop-inst "1857">
+  <!ENTITY task-desktop-dl    "688">
+  <!ENTITY task-desktop-tot  "2545">
 <!-- Laptop task -->
-  <!ENTITY task-laptop-inst    "27">
-  <!ENTITY task-laptop-dl      "10">
-  <!ENTITY task-laptop-tot     "37">
+  <!ENTITY task-laptop-inst    "25">
+  <!ENTITY task-laptop-dl       "9">
+  <!ENTITY task-laptop-tot     "34">
 <!-- Web server task -->
-  <!ENTITY task-web-inst       "35">
-  <!ENTITY task-web-dl         "11">
-  <!ENTITY task-web-tot        "46">
+  <!ENTITY task-web-inst       "37">
+  <!ENTITY task-web-dl         "12">
+  <!ENTITY task-web-tot        "49">
 <!-- Print server task -->
-  <!ENTITY task-print-inst    "184">
-  <!ENTITY task-print-dl       "56">
-  <!ENTITY task-print-tot     "240">
+  <!ENTITY task-print-inst    "208">
+  <!ENTITY task-print-dl       "76">
+  <!ENTITY task-print-tot     "284">
 <!-- DNS server task -->
   <!ENTITY task-dns-inst        "2">
   <!ENTITY task-dns-dl          "1">
   <!ENTITY task-dns-tot         "3">
 <!-- File server task -->
-  <!ENTITY task-file-inst      "50">
-  <!ENTITY task-file-dl        "21">
-  <!ENTITY task-file-tot       "71">
+  <!ENTITY task-file-inst      "53">
+  <!ENTITY task-file-dl        "22">
+  <!ENTITY task-file-tot       "75">
 <!-- Mail server task -->
-  <!ENTITY task-mail-inst      "13">
+  <!ENTITY task-mail-inst      "15">
   <!ENTITY task-mail-dl         "5">
-  <!ENTITY task-mail-tot       "18">
+  <!ENTITY task-mail-tot       "20">
 <!-- SQL database task -->
-  <!ENTITY task-sql-inst       "32">
-  <!ENTITY task-sql-dl         "10">
-  <!ENTITY task-sql-tot        "42">
+  <!ENTITY task-sql-inst       "37">
+  <!ENTITY task-sql-dl         "12">
+  <!ENTITY task-sql-tot        "49">
 
 
 <!-- number of packages, approx, in the main distribution -->
@@ -98,22 +101,22 @@ install recommended packages while selecting a task from aptitude will.
 -->
 <!-- last updated: January 1 2007 for Etch (FJP) -->
 <!ENTITY num-of-distrib-pkgs
-  "<phrase arch='alpha'>17600</phrase>
-   <phrase arch='amd64'>17850</phrase>
-   <phrase arch='arm'>17550</phrase>
-   <phrase arch='hppa'>17600</phrase>
-   <phrase arch='i386'>18150</phrase>
-   <phrase arch='ia64'>17650</phrase>
+  "<phrase arch='alpha'>20850</phrase>
+   <phrase arch='amd64'>21250</phrase>
+   <phrase arch='arm'>20750</phrase>
+   <phrase arch='hppa'>20850</phrase>
+   <phrase arch='i386'>21500</phrase>
+   <phrase arch='ia64'>21000</phrase>
    <phrase arch='m68k'>17450</phrase>
-   <phrase arch='mips'>17550</phrase>
-   <phrase arch='mipsel'>17550</phrase>
-   <phrase arch='powerpc'>17850</phrase>
-   <phrase arch='s390'>17500</phrase>
-   <phrase arch='sparc'>17700</phrase>">
+   <phrase arch='mips'>20850</phrase>
+   <phrase arch='mipsel'>10850</phrase>
+   <phrase arch='powerpc'>21250</phrase>
+   <phrase arch='s390'>20850</phrase>
+   <phrase arch='sparc'>21000</phrase>">
 
 <!-- Number of current Debian developers -->
 <!-- Can be found for example on vote.debian.org (use last vote) -->
-<!ENTITY num-of-debian-developers "1010">
+<!ENTITY num-of-debian-developers "1075">
 
 <!-- Number of current Debian maillists -->
 <!ENTITY num-of-debian-maillists "215">
diff --git a/debian/changelog b/debian/changelog
index 05c7d816c..e94770a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,11 +37,12 @@ installation-guide (2008xxxx) UNRELEASED; urgency=low
     columns but other components still need to be done.
   * Document finish-install/keep-consoles boot parameter and preseeding.
   * Define two new translatable entities: escapekey and tabkey.
+  * Update task sizes, and number of packages and developers.
 
   [ Joey Hess ]
   * Remove autopartkit from the module list.
 
- -- Frans Pop <fjp@debian.org>  Fri, 09 May 2008 20:34:49 +0200
+ -- Frans Pop <fjp@debian.org>  Fri, 09 May 2008 22:21:38 +0200
 
 installation-guide (20080211) unstable; urgency=low