summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/entities/common.ent82
-rw-r--r--debian/changelog1
-rw-r--r--en/appendix/files.xml7
3 files changed, 51 insertions, 39 deletions
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 9df2057fe..4e5ada0da 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -66,57 +66,61 @@ to first switch tasksel to that DE using the following command, e.g:
-->
<!-- Size of the basic installation -->
- <!ENTITY base-system-size "250">
- <!ENTITY std-system-size "397">
+ <!ENTITY base-system-size "343">
+ <!ENTITY std-system-size "491">
<!-- Desktop environment task
(obsolete; can be removed when all translations have been updated) -->
- <!ENTITY task-desktop-inst "1830">
- <!ENTITY task-desktop-dl "703">
- <!ENTITY task-desktop-tot "2533">
+ <!ENTITY task-desktop-inst "2689">
+ <!ENTITY task-desktop-dl "976">
+ <!ENTITY task-desktop-tot "3665">
<!-- Desktop environment task - GNOME -->
- <!ENTITY task-desktop-gnome-inst "1830">
- <!ENTITY task-desktop-gnome-dl "703">
- <!ENTITY task-desktop-gnome-tot "2533">
+ <!ENTITY task-desktop-gnome-inst "2689">
+ <!ENTITY task-desktop-gnome-dl "976">
+ <!ENTITY task-desktop-gnome-tot "3665">
<!-- Desktop environment task - KDE -->
- <!ENTITY task-desktop-kde-inst "1592">
- <!ENTITY task-desktop-kde-dl "613">
- <!ENTITY task-desktop-kde-tot "2205">
+ <!ENTITY task-desktop-kde-inst "2119">
+ <!ENTITY task-desktop-kde-dl "823">
+ <!ENTITY task-desktop-kde-tot "2942">
<!-- Desktop environment task - Xfce -->
- <!ENTITY task-desktop-xfce-inst "1056">
- <!ENTITY task-desktop-xfce-dl "403">
- <!ENTITY task-desktop-xfce-tot "1459">
+ <!ENTITY task-desktop-xfce-inst "1771">
+ <!ENTITY task-desktop-xfce-dl "650">
+ <!ENTITY task-desktop-xfce-tot "2421">
<!-- Desktop environment task - LXDE -->
- <!ENTITY task-desktop-lxde-inst "963">
- <!ENTITY task-desktop-lxde-dl "370">
- <!ENTITY task-desktop-lxde-tot "1333">
-<!-- Laptop task -->
- <!ENTITY task-laptop-inst "26">
- <!ENTITY task-laptop-dl "9">
- <!ENTITY task-laptop-tot "35">
+ <!ENTITY task-desktop-lxde-inst "1546">
+ <!ENTITY task-desktop-lxde-dl "575">
+ <!ENTITY task-desktop-lxde-tot "2121">
<!-- Web server task -->
- <!ENTITY task-web-inst "42">
- <!ENTITY task-web-dl "13">
- <!ENTITY task-web-tot "55">
+ <!ENTITY task-web-inst "121">
+ <!ENTITY task-web-dl "36">
+ <!ENTITY task-web-tot "157">
<!-- Print server task -->
- <!ENTITY task-print-inst "215">
- <!ENTITY task-print-dl "84">
- <!ENTITY task-print-tot "299">
+ <!ENTITY task-print-inst "427">
+ <!ENTITY task-print-dl "114">
+ <!ENTITY task-print-tot "541">
<!-- DNS server task -->
- <!ENTITY task-dns-inst "3">
- <!ENTITY task-dns-dl "1">
- <!ENTITY task-dns-tot "4">
+ <!ENTITY task-dns-inst "51">
+ <!ENTITY task-dns-dl "16">
+ <!ENTITY task-dns-tot "67">
<!-- File server task -->
- <!ENTITY task-file-inst "74">
- <!ENTITY task-file-dl "29">
- <!ENTITY task-file-tot "103">
+ <!ENTITY task-file-inst "165">
+ <!ENTITY task-file-dl "52">
+ <!ENTITY task-file-tot "217">
<!-- Mail server task -->
- <!ENTITY task-mail-inst "14">
- <!ENTITY task-mail-dl "5">
- <!ENTITY task-mail-tot "19">
+ <!ENTITY task-mail-inst "125">
+ <!ENTITY task-mail-dl "41">
+ <!ENTITY task-mail-tot "166">
<!-- SQL database task -->
- <!ENTITY task-sql-inst "50">
- <!ENTITY task-sql-dl "18">
- <!ENTITY task-sql-tot "68">
+ <!ENTITY task-sql-inst "103">
+ <!ENTITY task-sql-dl "26">
+ <!ENTITY task-sql-tot "129">
+<!-- SSH server task -->
+ <!ENTITY task-ssh-inst "18">
+ <!ENTITY task-ssh-dl "7">
+ <!ENTITY task-ssh-tot "25">
+<!-- Laptop task -->
+ <!ENTITY task-laptop-inst "237">
+ <!ENTITY task-laptop-dl "76">
+ <!ENTITY task-laptop-tot "313">
<!-- number of packages, approx, in the main distribution -->
diff --git a/debian/changelog b/debian/changelog
index 66cfbe2cc..9a9f0faf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
* Rename debian entity to debian-gnu. Introduce new debian entity which just
stands for "Debian".
* Rename Mandrake into Mandriva (Closes: Bug#601308).
+ * Update installation sizes.
[ Joey Hess ]
* Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/appendix/files.xml b/en/appendix/files.xml
index 14efe3756..5e32802c8 100644
--- a/en/appendix/files.xml
+++ b/en/appendix/files.xml
@@ -340,6 +340,13 @@ is (temporarily) required in <filename>/var</filename>.
<entry>&task-sql-tot;</entry>
</row>
+<row>
+ <entry>SSH server</entry>
+ <entry>&task-ssh-inst;</entry>
+ <entry>&task-ssh-dl;</entry>
+ <entry>&task-ssh-tot;</entry>
+</row>
+
</tbody>
</tgroup></informaltable>