[debian-edu-commits] [Git][debian-edu/debian-edu][master] 3 commits: Revert "tasks/networked: Replace Recommends with Depends."

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu


Commits:
c178bcf6 by Wolfgang Schweer at 2019-01-26T18:14:22Z
Revert "tasks/networked: Replace Recommends with Depends."

This reverts commit eea5c2cdfbd484c7a9bd012c0524afe66e15f3cd.
The intention had been to improve the Edu BD image setup, but failed to do so.

- - - - -
19c130c9 by Wolfgang Schweer at 2019-01-26T18:18:52Z
Revert "tasks/ltsp-server: Depend on ltsp-server and ldm-server"

This reverts commit 363e7337fb9ba405f0c7e4284bf0996a60b06761.
The intention had been to improve the Edu BD image setup, but failed to do so.

- - - - -
d53f8495 by Wolfgang Schweer at 2019-01-26T18:28:53Z
Document the reason for the reverted commits.

The intended BD ISO image improvement needs to be done via debian-cd.

debian/control: Update after running 'make dist'.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- tasks/ltsp-server
- tasks/networked


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+debian-edu (2.10.46) UNRELEASED; urgency=medium
+
+  * Revert commits in 2.10.45 concerning tasks/ltsp-server and tasks/networked.
+    The intended BD ISO image improvement needs to be done via debian-cd.
+  * debian/control: Update after running 'make dist'.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 26 Jan 2019 19:20:30 +0100
+
 debian-edu (2.10.45) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
@@ -664,13 +664,13 @@ Section: metapackages
 Architecture: any
 Depends: ${misc:Depends},
          education-tasks (= ${binary:Version}),
-         ldm-server,
-         ltsp-server,
          lwm,
          tftpd-hpa
 Recommends: education-workstation,
             iptables,
             isc-dhcp-server-ldap,
+            ldm-server,
+            ltsp-server,
             monitoring-plugins-standard,
             nagios-nrpe-server,
             rdiff-backup,
@@ -859,11 +859,11 @@ Package: education-networked
 Section: metapackages
 Architecture: any
 Depends: ${misc:Depends},
-         education-networked-common,
-         education-tasks (= ${binary:Version}),
-         libpam-krb5,
-         network-manager,
-         nscd
+         education-tasks (= ${binary:Version})
+Recommends: education-networked-common,
+            libpam-krb5,
+            network-manager,
+            nscd
 Description: Debian Edu additional packages for networked systems
  A metapackage containing dependencies for packages required on
  networked installations (with the exception of roaming workstation


=====================================
tasks/ltsp-server
=====================================
@@ -10,8 +10,6 @@ Description: Debian Edu LTSP server packages
 Depends:
  lwm,
  tftpd-hpa,
- ltsp-server,
- ldm-server,
 NeedConfig: yes - done using preseeding
 
 Recommends:
@@ -21,6 +19,11 @@ Recommends:
  isc-dhcp-server-ldap,
 NeedConfig: yes
 
+Recommends:
+ ltsp-server,
+ ldm-server,
+NeedConfig: yes
+
 Recommends:
  ltsp-docs,
 


=====================================
tasks/networked
=====================================
@@ -8,15 +8,15 @@ Description: Debian Edu additional packages for networked systems
  networked installations (with the exception of roaming workstation
  and minimal) in the Debian Edu Blend.
 
-Depends:
+Recommends:
  education-networked-common,
 
-Depends:
+Recommends:
  libpam-krb5,
 
-Depends:
+Recommends:
  nscd,
 
-Depends:
+Recommends:
  network-manager,
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/3c91cf3718660512c156891f847f442ece56fe2b...d53f8495ddad6f6bbc85601216886a2d704684df

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/3c91cf3718660512c156891f847f442ece56fe2b...d53f8495ddad6f6bbc85601216886a2d704684df
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/20190126/8c1ec8f3/attachment-0001.html>