[debian-edu-commits] [Git][debian-edu/debian-edu][master] 4 commits: Add debian-edu-doc-legacy-en package to tasks/common

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu


Commits:
5a616977 by Wolfgang Schweer at 2020-11-07T17:53:14+01:00
Add debian-edu-doc-legacy-en package to tasks/common

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
fe17ec90 by Wolfgang Schweer at 2020-11-07T17:54:34+01:00
Drop ntp and ntpdate packages from tasks/networked-common

The ntpdate package is deprecated (and unused).

The ntp package is only needed on the main server (see tasks/main-server);
cfengine is used to configure timesyncd as ntp client on networked clients.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
67e44867 by Wolfgang Schweer at 2020-11-07T17:58:59+01:00
Update debian/control after running 'make dist'

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
af44a0fc by Wolfgang Schweer at 2020-11-07T21:02:42+01:00
Add changelog entries for last commits

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


4 changed files:

- debian/changelog
- debian/control
- tasks/common
- tasks/networked-common


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+debian-edu (2.11.26) UNRELEASED; urgency=medium
+
+  * tasks/common: Add debian-edu-doc-legacy-en package.
+  * tasks/networked-common: Drop ntp and ntpdate packages.
+    - the ntpdate package is deprecated.
+    - ntp is only needed on the main server (see tasks/main-server); cfengine
+      is used to configure timesyncd as ntp client on networked clients.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 07 Nov 2020 09:53:12 +0100
+
 debian-edu (2.11.25) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
@@ -69,12 +69,12 @@ Recommends: avogadro,
             chemtool,
             easychem,
             education-menus,
+            gchempaint,
             gdis,
             gperiodic,
             kalzium,
             pymol
-Suggests: gchempaint,
-          rasmol,
+Suggests: rasmol,
           viewmol
 Description: Debian Edu chemistry related applications
  This metapackage depends on various applications that can be used to
@@ -92,6 +92,7 @@ Recommends: bc,
             debconf-utils,
             debian-edu-config,
             debian-edu-doc-en,
+            debian-edu-doc-legacy-en,
             debian-edu-install,
             deborphan,
             dhcping,
@@ -174,6 +175,7 @@ Recommends: education-astronomy,
             education-misc,
             education-music,
             education-physics,
+            fotoxx,
             kdeedu,
             lightdm,
             osmo,
@@ -181,7 +183,6 @@ Recommends: education-astronomy,
 Suggests: education-development,
           education-primaryschool,
           education-video,
-          fotoxx,
           mtpaint
 Description: Debian Edu Cinnamon desktop applications
  This metapackage depends on various Cinnanon components and desktop
@@ -265,6 +266,7 @@ Recommends: blueman,
             education-misc,
             education-music,
             education-physics,
+            fotoxx,
             hexchat,
             kdeedu,
             network-manager-gnome,
@@ -275,7 +277,6 @@ Recommends: blueman,
 Suggests: education-development,
           education-primaryschool,
           education-video,
-          fotoxx,
           mtpaint
 Description: Debian Edu LXDE desktop applications
  This metapackage depends on various LXDE components and lightweight
@@ -299,6 +300,7 @@ Recommends: blueman,
             education-misc,
             education-music,
             education-physics,
+            fotoxx,
             galculator,
             kdeedu,
             lightdm,
@@ -308,7 +310,6 @@ Recommends: blueman,
 Suggests: education-development,
           education-primaryschool,
           education-video,
-          fotoxx,
           mtpaint
 Description: Debian Edu LXQt desktop applications
  This metapackage depends on various LXQt components and lightweight
@@ -915,8 +916,6 @@ Recommends: autofs-ldap,
             nfs-common,
             ng-utils,
             nslcd,
-            ntp,
-            ntpdate,
             nvram-wakeup,
             openssh-server,
             p910nd,
@@ -930,7 +929,6 @@ Suggests: cifs-utils,
           libpam-mount,
           libpam-sss,
           nscd,
-          ntp-doc,
           ocsinventory-agent
 Description: Debian Edu common packages for networked systems
  A metapackage containing dependencies for packages required on all networked


=====================================
tasks/common
=====================================
@@ -93,6 +93,7 @@ Suggests:
 
 Recommends:
  debian-edu-doc-en,
+ debian-edu-doc-legacy-en,
 
 Recommends:
  debian-edu-config,


=====================================
tasks/networked-common
=====================================
@@ -22,14 +22,6 @@ Recommends:
  ldap-utils,
 NeedConfig: yes - configure /etc/ldap/ldap.conf
 
-Recommends:
- ntpdate,
- ntp,
-
-Suggests:
- ntp-doc,
-NeedConfig: yes - set NTP server (client: ntp.local, server: ntp.extern)
-
 Recommends:
  nfs-common,
 NeedConfig: yes - configure at least idmapd



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/ed089760fd5ef177cfee205ec2d0d8102d4deec2...af44a0fc3ea57f76e94469e89c6615edeae7f820

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/ed089760fd5ef177cfee205ec2d0d8102d4deec2...af44a0fc3ea57f76e94469e89c6615edeae7f820
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20201107/a9e1c964/attachment-0001.html>