[debian-edu-commits] debian-edu/ 01/01: tasks/desktop-xfce: replace dependency on dbus-x11 with 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 15b3207ecdbb7459cc52200c19d3498a2054389a
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Sep 17 10:54:34 2016 +0200

    tasks/desktop-xfce: replace dependency on dbus-x11 with default-dbus-session-bus | dbus-session-bus. (Closes: #835874)
---
 debian-edu-tasks.desc | 3 ++-
 debian/changelog      | 2 ++
 debian/control        | 5 +++--
 tasks/desktop-xfce    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index da322b8..bd7270e 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -803,7 +803,8 @@ Packages: list
  lightdm
  system-config-printer
  tango-icon-theme
- dbus-x11
+ default-dbus-session-bus
+ dbus-session-bus
  blueman
  ssh-askpass
 
diff --git a/debian/changelog b/debian/changelog
index f5c4fd1..723b093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ debian-edu (1.908) UNRELEASED; urgency=medium
   * Require at least blends-dev 0.6.94 as build-depends.
   * Move education-lang-(da|es)-desktop-kde packages to Section: kde as
     Section: l10n does not exist.
+  * tasks/desktop-xfce: replace dependency on dbus-x11 with
+    default-dbus-session-bus | dbus-session-bus. (Closes: #835874)
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 15 Sep 2016 16:15:44 +0200
 
diff --git a/debian/control b/debian/control
index 82e857b..c7282db 100644
--- a/debian/control
+++ b/debian/control
@@ -617,7 +617,6 @@ Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
 Recommends: blueman,
- dbus-x11,
  education-common,
  lightdm,
  ssh-askpass,
@@ -625,7 +624,9 @@ Recommends: blueman,
  tango-icon-theme,
  xfce4,
  xfce4-goodies
-Suggests: x-display-manager
+Suggests: dbus-session-bus,
+ default-dbus-session-bus,
+ x-display-manager
 Description: Debian Edu Xfce desktop applications
  This metapackage depends on various XFCE components that are useful
  for teachers and their students.
diff --git a/tasks/desktop-xfce b/tasks/desktop-xfce
index d44e333..cbdf80e 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, dbus-x11
+Recommends:   system-config-printer, tango-icon-theme, default-dbus-session-bus | dbus-session-bus
 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