Make base system size and task sizes into entities to avoid translations to have to update on changes

2 files changed, 79 insertions, 42 deletions

diff --git a/build/entities/common.ent b/build/entities/common.ent
index a884553d1..5f4a1bbc1 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -31,6 +31,59 @@
 <!-- As measured on a completed etch install, minimal work space included. -->
 <!ENTITY minimum-fs-size "500&notation-megabytes;">
 
+<!--
+Size of install as used in appendix/files.xml; all values based on i386.
+
+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 determined
+using the same method.
+
+Sizes of tasks should be determined by running tasksel with the "new-install"
+option on a system that been fully installed without selecting any tasks. By
+selecting a task together with the "manual selection" option, aptitude will
+be started and show the sizes for the task. Use "cancel pending actions" to
+clear the slate, quit aptitude and repeat for other tasks.
+Space requirements need to be determined from tasksel as tasksel will not
+install recommended packages while selecting a task from aptitude will.
+-->
+
+<!-- Size of the basic installation -->
+  <!ENTITY base-system-size   "230">
+  <!ENTITY std-system-size    "442">
+<!-- Desktop environment task -->
+  <!ENTITY task-desktop-inst "1267">
+  <!ENTITY task-desktop-dl    "420">
+  <!ENTITY task-desktop-tot  "1667">
+<!-- Laptop task -->
+  <!ENTITY task-laptop-inst    "50">
+  <!ENTITY task-laptop-dl      "17">
+  <!ENTITY task-laptop-tot     "67">
+<!-- Web server task -->
+  <!ENTITY task-web-inst       "35">
+  <!ENTITY task-web-dl         "11">
+  <!ENTITY task-web-tot        "46">
+<!-- Print server task -->
+  <!ENTITY task-print-inst    "277">
+  <!ENTITY task-print-dl       "79">
+  <!ENTITY task-print-tot     "356">
+<!-- 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      "49">
+  <!ENTITY task-file-dl        "21">
+  <!ENTITY task-file-tot       "70">
+<!-- Mail server task -->
+  <!ENTITY task-mail-inst      "13">
+  <!ENTITY task-mail-dl         "5">
+  <!ENTITY task-mail-tot       "18">
+<!-- SQL database task -->
+  <!ENTITY task-sql-inst       "24">
+  <!ENTITY task-sql-dl          "8">
+  <!ENTITY task-sql-tot        "32">
+
 
 <!-- number of packages, approx, in the main distribution -->
 <!-- use:
diff --git a/en/appendix/files.xml b/en/appendix/files.xml
index 0f01b3d15..ae1c1683a 100644
--- a/en/appendix/files.xml
+++ b/en/appendix/files.xml
@@ -199,28 +199,12 @@ when your mouse only has one button. Just add the following lines to
 
  <sect1 id="tasksel-size-list">
  <title>Disk Space Needed for Tasks</title>
-
-<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running tasksel with the "new-install"
- option on a system that been fully installed without selecting any tasks. By
- selecting a task together with the "manual selection" option, aptitude will
- be started and show the sizes for the task. Use "cancel pending actions" to
- clear the slate, quit aptitude and repeat for other tasks.
- Space requirements need to be determined from tasksel as tasksel will not
- install recommended packages while selecting a task from aptitude will.
-
- 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 after which the size of the standard system should be
- determined using the same method.
--->
-
 <para>
 
 A standard installation for the i386 architecture, including all standard
-packages and using the default 2.6 kernel, takes up 442MB of disk space.
+packages and using the default 2.6 kernel, takes up &std-system-size;MB of disk space.
 A minimal base installation, without the <quote>Standard system</quote>
-task selected, will take 230MB.
+task selected, will take &base-system-size;MB.
 
 </para>
 <important><para>
@@ -263,9 +247,9 @@ is (temporarily) required in <filename>/var</filename>.
 <tbody>
 <row>
   <entry>Desktop environment</entry>
-  <entry>1267</entry>
-  <entry>420</entry>
-  <entry>1667</entry>
+  <entry>&task-desktop-inst;</entry>
+  <entry>&task-desktop-dl;</entry>
+  <entry>&task-desktop-tot;</entry>
 </row>
 
 <row>
@@ -278,51 +262,51 @@ is (temporarily) required in <filename>/var</filename>.
   </para>
 
   </footnote></entry>
-  <entry>50</entry>
-  <entry>17</entry>
-  <entry>67</entry>
+  <entry>&task-laptop-inst;</entry>
+  <entry>&task-laptop-dl;</entry>
+  <entry>&task-laptop-tot;</entry>
 </row>
 
 <row>
   <entry>Web server</entry>
-  <entry>35</entry>
-  <entry>11</entry>
-  <entry>46</entry>
+  <entry>&task-web-inst;</entry>
+  <entry>&task-web-dl;</entry>
+  <entry>&task-web-tot;</entry>
 </row>
 
 <row>
   <entry>Print server</entry>
-  <entry>277</entry>
-  <entry>79</entry>
-  <entry>356</entry>
+  <entry>&task-print-inst;</entry>
+  <entry>&task-print-dl;</entry>
+  <entry>&task-print-tot;</entry>
 </row>
 
 <row>
   <entry>DNS server</entry>
-  <entry>2</entry>
-  <entry>1</entry>
-  <entry>3</entry>
+  <entry>&task-dns-inst;</entry>
+  <entry>&task-dns-dl;</entry>
+  <entry>&task-dns-tot;</entry>
 </row>
 
 <row>
   <entry>File server</entry>
-  <entry>49</entry>
-  <entry>21</entry>
-  <entry>70</entry>
+  <entry>&task-file-inst;</entry>
+  <entry>&task-file-dl;</entry>
+  <entry>&task-file-tot;</entry>
 </row>
 
 <row>
   <entry>Mail server</entry>
-  <entry>13</entry>
-  <entry>5</entry>
-  <entry>18</entry>
+  <entry>&task-mail-inst;</entry>
+  <entry>&task-mail-dl;</entry>
+  <entry>&task-mail-tot;</entry>
 </row>
 
 <row>
   <entry>SQL database</entry>
-  <entry>24</entry>
-  <entry>8</entry>
-  <entry>32</entry>
+  <entry>&task-sql-inst;</entry>
+  <entry>&task-sql-dl;</entry>
+  <entry>&task-sql-tot;</entry>
 </row>
 
 </tbody>