[debian-edu-commits] debian-edu/ 01/01: tasks/desktop.xfce: stop recommending default-dbus-session-bus | dbus-session-bus (Closes: #835874)

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu.

commit 2241c36a8d8e39bedec51844c0631dfc2b0652af
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Oct 2 12:48:51 2016 +0200

    tasks/desktop.xfce: stop recommending default-dbus-session-bus | dbus-session-bus (Closes: #835874)
    
    tasks/desktop.xfce: stop recommending default-dbus-session-bus | dbus-session-bus explicitly as xfce4 depends on xfce4-session which recommends dbus-x11 already. Also none of the other desktop tasks explicitly recommends it, yet it's still used by them all.
---
 debian-edu-tasks.desc | 4 ----
 debian/changelog      | 8 ++++++++
 debian/control        | 8 +++-----
 tasks/desktop-xfce    | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index bd7270e..6c108db 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -803,8 +803,6 @@ Packages: list
  lightdm
  system-config-printer
  tango-icon-theme
- default-dbus-session-bus
- dbus-session-bus
  blueman
  ssh-askpass
 
@@ -1361,8 +1359,6 @@ Packages: list
  slbackup
  slbackup-php
  munin
- icinga2
- icinga2-classicui
  monitoring-plugins-standard
  nagios-nrpe-plugin
  sitesummary
diff --git a/debian/changelog b/debian/changelog
index dd9320c..f34c40a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu (1.909) UNRELEASED; urgency=medium
+
+  * tasks/desktop.xfce: stop recommending default-dbus-session-bus |
+    dbus-session-bus explicitly as xfce4 depends on xfce4-session which
+    recommends dbus-x11 already. (Closes: #835874)
+
+ -- Holger Levsen <holger at debian.org>  Sun, 02 Oct 2016 12:46:50 +0200
+
 debian-edu (1.908) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/control b/debian/control
index c7282db..f86f687 100644
--- a/debian/control
+++ b/debian/control
@@ -624,9 +624,7 @@ Recommends: blueman,
  tango-icon-theme,
  xfce4,
  xfce4-goodies
-Suggests: dbus-session-bus,
- default-dbus-session-bus,
- x-display-manager
+Suggests: x-display-manager
 Description: Debian Edu Xfce desktop applications
  This metapackage depends on various XFCE components that are useful
  for teachers and their students.
@@ -1107,8 +1105,6 @@ Recommends: apache2,
  gosa-plugin-sudo,
  gosa-plugin-sudo-schema,
  gosa-schema,
- icinga2,
- icinga2-classicui,
  iptables,
  isc-dhcp-server-ldap,
  krb5-admin-server,
@@ -1149,6 +1145,8 @@ Suggests: apache2-doc,
  dnswalk,
  dovecot-pop3d,
  dsh,
+ icinga2,
+ icinga2-classicui,
  krb5-doc,
  libsasl2-modules-ldap,
  mdns-scan,
diff --git a/tasks/desktop-xfce b/tasks/desktop-xfce
index cbdf80e..f817cf0 100644
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -20,7 +20,7 @@ Why:          The Xfce desktop environment do not pull in a display manager.
               Pick lightdm like for LXDE.  Do not override and pick
               the most feature complete one gdm3 instead because it
               pull in Gnome when installed.
-Recommends:   system-config-printer, tango-icon-theme, default-dbus-session-bus | dbus-session-bus
+Recommends:   system-config-printer, tango-icon-theme
 Why:          The Xfce desktop environment tools recommended by tasksel.
 
 Recommends:  blueman

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git