[java-gnome] 05/07: Use dbus-run-session instead of dbus-launch to run metacity and depend on dbus (>= 1.8) instead of dbus-x11 (Closes: #836100)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java-gnome.

commit c147c7a1aa1a6cb5f12064c1fbf5219777b74568
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 11:34:11 2017 +0100

    Use dbus-run-session instead of dbus-launch to run metacity and depend on dbus (>= 1.8) instead of dbus-x11 (Closes: #836100)
---
 debian/changelog                        | 2 ++
 debian/control                          | 2 +-
 debian/patches/01_take_screenshots.diff | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ddfc3c7..46824f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ java-gnome (4.1.3-5) UNRELEASED; urgency=medium
 
   * Team upload.
   * Build with the DH sequencer instead of CDBS (Closes: #849669)
+  * Use dbus-run-session instead of dbus-launch to run metacity
+    and depend on dbus (>= 1.8) instead of dbus-x11 (Closes: #836100)
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index 3b030c7..3f0b043 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 10),
                metacity,
                xfonts-base,
                xvfb,
-               dbus-x11,
+               dbus (>= 1.8),
                python
 Standards-Version: 3.9.8
 Section: java
diff --git a/debian/patches/01_take_screenshots.diff b/debian/patches/01_take_screenshots.diff
index 0b26880..c9588ba 100644
--- a/debian/patches/01_take_screenshots.diff
+++ b/debian/patches/01_take_screenshots.diff
@@ -17,7 +17,7 @@
  
                  System.out.println("EXEC\tmetacity");
 -                windowManager = r.exec("/usr/bin/metacity --display=" + DISPLAY);
-+                windowManager = r.exec("/usr/bin/dbus-launch /usr/bin/metacity --display=" + DISPLAY);
++                windowManager = r.exec("/usr/bin/dbus-run-session -- /usr/bin/metacity --display=" + DISPLAY);
                  Thread.sleep(100);
                  checkAlive(windowManager, "metacity");
  

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