From 198f9ee59b70237bf9199f2db25a59cfb2fe0fa8 Mon Sep 17 00:00:00 2001
From: Holger Wansing <hwansing@mailbox.org>
Date: Mon, 21 Jan 2019 09:26:53 +0100
Subject: Trim copyright years

---
 build/entities/common.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build/entities')

diff --git a/build/entities/common.ent b/build/entities/common.ent
index ed2892ef8..186afa781 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -4,7 +4,7 @@
 
 <!-- current year (to be used for copyright declaration). -->
 <!-- When changing this, also change in "debian/copyright" file! -->
-<!ENTITY current-year "2017">
+<!ENTITY current-year "2019">
 
 <!-- short name to use for Debian -->
 <!ENTITY debian "Debian">
-- 
cgit v1.2.3


From 2b121d7ddc9491eafd849391de29f3d9f318f388 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 2 Jun 2019 14:24:59 +0200
Subject: Update numbers

---
 build/entities/common.ent | 86 +++++++++++++++++++++++------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

(limited to 'build/entities')

diff --git a/build/entities/common.ent b/build/entities/common.ent
index 186afa781..128095798 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -62,7 +62,7 @@
 cleanup, plus minimal ~150MB work space included.
 Also update the value in debian-installer/build/boot/x86/f2.txt
 -->
-<!ENTITY minimum-fs-size "780&notation-megabytes;">
+<!ENTITY minimum-fs-size "850&notation-megabytes;">
 
 <!--
 Size of install as used in appendix/files.xml; all values based on amd64.
@@ -91,46 +91,46 @@ to first switch tasksel to that DE using the following command, e.g:
 -->
 
 <!-- Size of the basic installation -->
-  <!ENTITY base-system-size   "613">
-  <!ENTITY std-system-size    "800">
+  <!ENTITY base-system-size   "701">
+  <!ENTITY std-system-size    "933">
 <!-- Desktop environment task - GNOME -->
-  <!ENTITY task-desktop-gnome-inst "3163">
-  <!ENTITY task-desktop-gnome-dl    "935">
-  <!ENTITY task-desktop-gnome-tot  "4098">
+  <!ENTITY task-desktop-gnome-inst "2724">
+  <!ENTITY task-desktop-gnome-dl    "785">
+  <!ENTITY task-desktop-gnome-tot  "3509">
 <!-- Desktop environment task - KDE -->
-  <!ENTITY task-desktop-kde-inst   "3044">
-  <!ENTITY task-desktop-kde-dl      "911">
-  <!ENTITY task-desktop-kde-tot    "3955">
+  <!ENTITY task-desktop-kde-inst   "4244">
+  <!ENTITY task-desktop-kde-dl     "1280">
+  <!ENTITY task-desktop-kde-tot    "5524">
 <!-- Desktop environment task - Xfce -->
-  <!ENTITY task-desktop-xfce-inst  "2122">
-  <!ENTITY task-desktop-xfce-dl     "593">
-  <!ENTITY task-desktop-xfce-tot   "2715">
+  <!ENTITY task-desktop-xfce-inst  "2342">
+  <!ENTITY task-desktop-xfce-dl     "657">
+  <!ENTITY task-desktop-xfce-tot   "2999">
 <!-- Desktop environment task - LXDE -->
-  <!ENTITY task-desktop-lxde-inst  "2133">
-  <!ENTITY task-desktop-lxde-dl     "602">
-  <!ENTITY task-desktop-lxde-tot   "2735">
+  <!ENTITY task-desktop-lxde-inst  "2486">
+  <!ENTITY task-desktop-lxde-dl     "707">
+  <!ENTITY task-desktop-lxde-tot   "3193">
 <!-- Desktop environment task - MATE -->
-  <!ENTITY task-desktop-mate-inst  "2288">
-  <!ENTITY task-desktop-mate-dl     "644">
-  <!ENTITY task-desktop-mate-tot   "2932">
+  <!ENTITY task-desktop-mate-inst  "2857">
+  <!ENTITY task-desktop-mate-dl     "757">
+  <!ENTITY task-desktop-mate-tot   "3614">
 <!-- Desktop environment task - Cinnamon -->
-  <!ENTITY task-desktop-cinnamon-inst  "2878">
-  <!ENTITY task-desktop-cinnamon-dl     "843">
-  <!ENTITY task-desktop-cinnamon-tot   "3721">
+  <!ENTITY task-desktop-cinnamon-inst  "3824">
+  <!ENTITY task-desktop-cinnamon-dl    "1102">
+  <!ENTITY task-desktop-cinnamon-tot   "4926">
 <!-- Web server task -->
-  <!ENTITY task-web-inst       "40">
-  <!ENTITY task-web-dl          "9">
-  <!ENTITY task-web-tot        "49">
+  <!ENTITY task-web-inst       "44">
+  <!ENTITY task-web-dl         "11">
+  <!ENTITY task-web-tot        "55">
 <!-- Print server task -->
-  <!ENTITY task-print-inst    "407">
-  <!ENTITY task-print-dl       "95">
-  <!ENTITY task-print-tot     "502">
+  <!ENTITY task-print-inst    "440">
+  <!ENTITY task-print-dl       "91">
+  <!ENTITY task-print-tot     "531">
 <!-- SSH server task -->
-  <!ENTITY task-ssh-inst        "1">
+  <!ENTITY task-ssh-inst        "2">
   <!ENTITY task-ssh-dl          "0">
-  <!ENTITY task-ssh-tot         "1">
+  <!ENTITY task-ssh-tot         "2">
 
-<!-- Size needed by base and gnome desktop task for / with separate /usr, /var, /boot, for amd64 -->
+<!-- Size needed by base and gnome/kde desktop task for / with separate /usr, /var, /boot, for amd64 -->
   <!ENTITY root-system-size-min     "250">
   <!ENTITY root-system-size-max     "350">
 
@@ -138,18 +138,18 @@ to first switch tasksel to that DE using the following command, e.g:
 <!-- use:
      for i in binary-*; do echo -n "$i: "; zgrep '^Package:' ./binary-all/Packages.gz ./$i/Packages.gz | wc -l; done
 -->
-<!-- last updated: 2017-02-11 for Stretch (Samuel Thibault) -->
+<!-- last updated: 2019-06-02 for Buster (Samuel Thibault) -->
 <!ENTITY num-of-distrib-pkgs
-  "<phrase arch='amd64'>75746</phrase>
-   <phrase arch='arm64'>74365</phrase>
-   <phrase arch='armel'>74134</phrase>
-   <phrase arch='armhf'>74360</phrase>
-   <phrase arch='i386'>75573</phrase>
-   <phrase arch='mips'>73821</phrase>
-   <phrase arch='mips64el'>73793</phrase>
-   <phrase arch='mipsel'>74037</phrase>
-   <phrase arch='ppc64el'>74309</phrase>
-   <phrase arch='s390x'>73878</phrase>
+  "<phrase arch='amd64'>85212</phrase>
+   <phrase arch='arm64'>83841</phrase>
+   <phrase arch='armel'>82997</phrase>
+   <phrase arch='armhf'>83498</phrase>
+   <phrase arch='i386'>84902</phrase>
+   <phrase arch='mips'>82790</phrase>
+   <phrase arch='mips64el'>83004</phrase>
+   <phrase arch='mipsel'>83095</phrase>
+   <phrase arch='ppc64el'>83524</phrase>
+   <phrase arch='s390x'>82943</phrase>
    ">
 
 <!-- Number of current Debian developers -->
@@ -159,13 +159,13 @@ 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 "283">
+<!ENTITY num-of-debian-maillists "317">
 
 <!-- version of X11 shipping with the current release, see version of the xorg package -->
 <!ENTITY x11ver "7.7">
 
 <!-- version of BRLTTY shipping with the current release, see version of the brltty package -->
-<!ENTITY brlttyver "5.4">
+<!ENTITY brlttyver "5.6">
 
 <!-- version of Speakup shipping with the current release, see version of the speakup-doc package -->
 <!ENTITY speakupver "3.1.6">
-- 
cgit v1.2.3