[debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: tasks/ltsp-server: Add tftpd-hpa to Depends to prefer this package to dnsmasq.

[WolfgangSchweer]

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


Commits:
24c102df by Wolfgang Schweer at 2018-09-21T08:52:02Z
tasks/ltsp-server: Add tftpd-hpa to Depends to prefer this package to dnsmasq.

(The 'ltsp-server' package recommends dnsmasq (>= 2.41) | tftpd-hpa | atftpd).

- - - - -
6ff2ae67 by Wolfgang Schweer at 2018-09-21T09:19:28Z
Updated after running 'make dist'; add changelog entry.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,13 @@
 debian-edu (2.10.36) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Fix grammar in previous changelog entry, thanks lintian.
 
+  [ Wolfgang Schweer ]
+  * tasks/ltsp-server: Add tftpd-hpa to Depends.
+    It should ensure that this package is preferred to dnsmasq.
+    (The 'ltsp-server' package now recommends dnsmasq | tftpd-hpa | atftpd).
+
  -- Holger Levsen <holger at debian.org>  Sun, 16 Sep 2018 13:10:36 +0200
 
 debian-edu (2.10.35) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -73,13 +73,13 @@ Recommends: avogadro,
             chemtool,
             easychem,
             education-menus,
-            gchempaint,
             gdis,
             gperiodic,
             kalzium,
             pymol,
             viewmol
-Suggests: rasmol
+Suggests: gchempaint,
+          rasmol
 Description: Debian Edu chemistry related applications
  This metapackage depends on various applications that can be used to
  teach chemistry.
@@ -548,7 +548,6 @@ Recommends: alsa-utils,
             totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer,
             unifont,
             unzip,
-            xul-ext-adblock-plus,
             xul-ext-ublock-origin,
             zip
 Suggests: auctex,
@@ -614,7 +613,8 @@ Suggests: auctex,
           wget,
           wine,
           xfonts-100dpi-transcoded,
-          xfonts-75dpi-transcoded
+          xfonts-75dpi-transcoded,
+          xul-ext-adblock-plus
 Description: Debian Edu common desktop applications
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
@@ -1074,7 +1074,8 @@ Section: metapackages
 Architecture: any
 Depends: ${misc:Depends},
          education-tasks (= ${source:Version}),
-         lwm
+         lwm,
+         tftpd-hpa
 Recommends: education-workstation,
             iptables,
             isc-dhcp-server-ldap,


=====================================
tasks/ltsp-server
=====================================
@@ -58,4 +58,5 @@ Recommends:
 
 Depends:
  lwm,
+ tftpd-hpa,
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/3c59c42aa864698450c13f6c3acfddd315c9369b...6ff2ae670734ac7646115ef4964bbcada3251c14

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/3c59c42aa864698450c13f6c3acfddd315c9369b...6ff2ae670734ac7646115ef4964bbcada3251c14
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/20180921/43ae96b8/attachment-0001.html>