[debian-edu-commits] [Git][debian-edu/debian-edu][master] 3 commits: Drop atftpd from tasks/main-server

[WolfgangSchweer]

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


Commits:
3a1375a3 by Wolfgang Schweer at 2018-07-11T18:22:19+02:00
Drop atftpd from tasks/main-server

- - - - -
81d976eb by Wolfgang Schweer at 2018-07-11T18:23:55+02:00
Updated after running 'make dist'.

- - - - -
90ff5c50 by Wolfgang Schweer at 2018-07-11T18:24:27+02:00
Add changelog entry.

- - - - -


4 changed files:

- debian-edu-tasks.desc
- debian/changelog
- debian/control
- tasks/main-server


Changes:

=====================================
debian-edu-tasks.desc
=====================================
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -699,7 +699,6 @@ Key:
  education-main-server
 Packages: list
  apache2
- atftpd
  avahi-daemon
  bind9
  debian-installer-9-netboot-amd64


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu (2.10.31) UNRELEASED; urgency=medium
+
+  * Drop atftpd from tasks/main-server. 
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 11 Jul 2018 18:22:49 +0200
+
 debian-edu (2.10.30) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1113,7 +1113,7 @@ Recommends: apache2,
             squid,
             syslinux-common,
             tdb-tools,
-            tftpd-hpa | atftpd
+            tftpd-hpa
 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,
- tftpd-hpa | atftpd,
+ tftpd-hpa,
 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/47866af5f9f88ed5b9ff62eadf2f8e076b18da67...90ff5c5023413c1a9c61a4ff75e4d782e176bd04

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/47866af5f9f88ed5b9ff62eadf2f8e076b18da67...90ff5c5023413c1a9c61a4ff75e4d782e176bd04
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/20180711/883756ce/attachment-0001.html>