[debian-edu-commits] debian-edu/ 11/18: tasks/*: Use "yes - ..." in NeedConfig: fields instead of "yes, ...".
Mike Gabriel
sunweaver at debian.org
Sat Aug 5 04:25:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository debian-edu.
commit 8bc23c6dce4175e5e2902175f52734aee3c2cb5a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Aug 4 16:49:10 2017 -0400
tasks/*: Use "yes - ..." in NeedConfig: fields instead of "yes, ...".
---
debian/changelog | 1 +
tasks/common | 2 +-
tasks/desktop-kde | 2 +-
tasks/desktop-lxde | 2 +-
tasks/desktop-other | 4 ++--
tasks/ltsp-server | 2 +-
tasks/main-server | 6 +++---
tasks/networked-common | 6 +++---
tasks/roaming-workstation | 4 ++--
tasks/workstation | 2 +-
10 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c4f7b8..a77df51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ debian-edu (1.925) UNRELEASED; urgency=medium
* tasks/*: Rewrite Needconfig: fields to NeedConfig:.
* tasks/*: De-capitalize the word "yes" in NeedConfig: fields.
* tasks/*: NeedConfig: fields with no explicit "yes", add the "yes".
+ * tasks/*: Use "yes - ..." in NeedConfig: fields instead of "yes, ...".
-- Mike Gabriel <sunweaver at debian.org> Fri, 04 Aug 2017 15:47:02 -0400
diff --git a/tasks/common b/tasks/common
index 8990794..f191090 100644
--- a/tasks/common
+++ b/tasks/common
@@ -67,7 +67,7 @@ Suggests: popularity-contest, debian-goodies
to http://popcon.skolelinux.org/popcon/. The popcon package
is pulled in by Debian Installer, so no need to list it in
our tasks.
-NeedConfig: yes, get it to submit to both debian and debian-edu.
+NeedConfig: yes - get it to submit to both debian and debian-edu.
Depends: consolekit, libpam-ck-connector
for dbus to know who to give access to local devices.
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index a89f16d..4f45f0a 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -30,7 +30,7 @@ Depends: lightdm | x-display-manager
Avoid: xdm
Pick lightdm and not the most feature complete one gdm3,
because gdm3 pulls in Gnome.
-NeedConfig: yes, artwork
+NeedConfig: yes - artwork
Depends: dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index e5195c5..0dbcf1b 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -22,7 +22,7 @@ Avoid: xdm
manager by default. Keep it, and do not override and
pick the most feature complete one gdm3 instead because
it pull in Gnome when installed.
-NeedConfig: yes, artwork
+NeedConfig: yes - artwork
Depends: totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 70fc8d1..70b7064 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -163,7 +163,7 @@ Recommends: thunderbird, \
thunderbird-l10n-es-es, \
thunderbird-l10n-fr, \
thunderbird-l10n-it
-NeedConfig: yes, Cache, Printerapp, proxy server
+NeedConfig: yes - Cache, Printerapp, proxy server
Depends: konqueror-plugin-gnash, browser-plugin-gnash | mozilla-plugin-gnash
Suggests: flashplugin-nonfree
@@ -182,7 +182,7 @@ Recommends: default-jre, icedtea-8-plugin
<URL:http://www.debian.org/doc/manuals/debian-java-faq/>.
Depends: debian-edu-artwork, plymouth, plymouth-themes
-NeedConfig: yes, kdm and kde need to be configured to use it.
+NeedConfig: yes - kdm and kde need to be configured to use it.
Depends: gnupg2 | gnupg, gnupg-agent
Suggests: gnupg-doc
diff --git a/tasks/ltsp-server b/tasks/ltsp-server
index c80eeb0..aba4db0 100644
--- a/tasks/ltsp-server
+++ b/tasks/ltsp-server
@@ -39,6 +39,6 @@ Suggests: libpulse-mainloop-glib0
Recommends: nagios-nrpe-server, monitoring-plugins-standard
probe their status.
-NeedConfig: yes, done by sitesummary-client using preseeding
+NeedConfig: yes - done by sitesummary-client using preseeding
Recommends: xrdp, tightvncserver
diff --git a/tasks/main-server b/tasks/main-server
index a901726..49f21da 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -80,11 +80,11 @@ Avoid: telnetd, ftpd
should be listed.
Depends: munin
-NeedConfig: yes, done automatically by preseeding sitesummary
+NeedConfig: yes - done automatically by preseeding sitesummary
Depends: icinga, monitoring-plugins-standard, \
nagios-nrpe-plugin
-NeedConfig: yes, done via preseeding: icingaadmin password, enable cgi.
+NeedConfig: yes - done via preseeding: icingaadmin password, enable cgi.
Depends: sitesummary
Suggests: ocsinventory-server, ocsinventory-reports, default-mysql-client
@@ -111,6 +111,6 @@ NeedConfig: yes - configure realm and the LDAP server as backend
Recommends: libapache2-mod-auth-kerb
See <URL: http://www.itefix.no/i2/node/11683 > for a recipe.
-NeedConfig: yes, individual services like Nagios need to use the apache module
+NeedConfig: yes - individual services like Nagios need to use the apache module
Suggests: krb5-doc, libsasl2-modules-ldap
diff --git a/tasks/networked-common b/tasks/networked-common
index 821aa82..5b3d9b6 100644
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -25,7 +25,7 @@ Avoid: fam
for now.
Depends: autofs-ldap | autofs5-ldap
-NeedConfig: yes, making sure autofs is disabled on mainserver
+NeedConfig: yes - making sure autofs is disabled on mainserver
Depends: sudo-ldap
@@ -34,11 +34,11 @@ Depends: krb5-clients, krb5-user, libsasl2-modules-gssapi-mit
Suggests: cifs-utils, libpam-mount
Depends: munin-node
-NeedConfig: yes, configured by sitesummary-client preseeding.
+NeedConfig: yes - configured by sitesummary-client preseeding.
Depends: sitesummary-client
Suggests: ocsinventory-agent
-NeedConfig: yes, specify URL to collector
+NeedConfig: yes - specify URL to collector
Recommends: killer
diff --git a/tasks/roaming-workstation b/tasks/roaming-workstation
index 088fafa..953b88f 100644
--- a/tasks/roaming-workstation
+++ b/tasks/roaming-workstation
@@ -20,11 +20,11 @@ Depends: libpam-mklocaluser
Depends: libpam-sss, libnss-sss
offline.
-NeedConfig: yes, sssd.conf need to point to our LDAP and Kerberos server
+NeedConfig: yes - sssd.conf need to point to our LDAP and Kerberos server
Recommends: krb5-auth-dialog
task and not networked task, as it should not be included
on main-server installations.
Depends: gosa-desktop
-NeedConfig: yes, override upstream url using /etc/gosa/desktoprc
+NeedConfig: yes - override upstream url using /etc/gosa/desktoprc
diff --git a/tasks/workstation b/tasks/workstation
index 4daf994..dad26ee 100644
--- a/tasks/workstation
+++ b/tasks/workstation
@@ -24,4 +24,4 @@ Suggests: kredentials
Recommends: jxplorer
Depends: gosa-desktop
-NeedConfig: yes, override upstream url using /etc/gosa/desktoprc
+NeedConfig: yes - override upstream url using /etc/gosa/desktoprc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git
More information about the debian-edu-commits
mailing list