[debian-edu-commits] [Git][debian-edu/debian-edu][master] 3 commits: tasks/main-server: R: tftpd-hpa | atftpd (same order as ltsp-server uses).

[WolfgangSchweer]

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


Commits:
8a8c2e2c by Wolfgang Schweer at 2018-07-10T13:40:31+02:00
tasks/main-server: R: tftpd-hpa | atftpd (same order as ltsp-server uses).

- - - - -
373af19a by Wolfgang Schweer at 2018-07-10T13:49:26+02:00
Add changelog entry.

- - - - -
24b8acf0 by Wolfgang Schweer at 2018-07-10T13:51:27+02:00
Updated after running 'make dist'.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- tasks/main-server


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu (2.10.30) UNRELEASED; urgency=medium
+
+  * tasks/main-server:
+    - Recommend tftpd-hpa | atftpd (same order package ltsp-server uses).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 10 Jul 2018 13:46:52 +0200
+
 debian-edu (2.10.29) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1057,7 +1057,6 @@ Architecture: any
 Depends: ${misc:Depends},
          education-tasks (= ${source:Version})
 Recommends: apache2,
-            atftpd | tftpd-hpa,
             avahi-daemon,
             bind9,
             debian-installer-9-netboot-amd64,
@@ -1113,7 +1112,8 @@ Recommends: apache2,
             smbclient,
             squid,
             syslinux-common,
-            tdb-tools
+            tdb-tools,
+            tftpd-hpa | atftpd
 Suggests: apache2-doc,
           avahi-autoipd,
           avahi-discover,


=====================================
tasks/main-server
=====================================
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -38,7 +38,7 @@ Recommends:
  syslinux-common,
  debian-installer-10-netboot-i386 | debian-installer-9-netboot-i386,
  debian-installer-10-netboot-amd64 | debian-installer-9-netboot-amd64,
- atftpd | tftpd-hpa,
+ tftpd-hpa | atftpd,
 NeedConfig: yes - set local IP range, DNS name and default routing
 
 Recommends:



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/9284f83d9679f697cdf71ea1652450898f931a19...24b8acf0536b6c80f65a8da0ff4199412563a115

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/9284f83d9679f697cdf71ea1652450898f931a19...24b8acf0536b6c80f65a8da0ff4199412563a115
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/20180710/f2a28e7f/attachment-0001.html>