Bug#570480: [Pkg-utopia-maintainers] Bug#570480: dbus-x11: Optimize speed of Xsession.d script

[Martin Pitt]

Hello Michael,

Michael Biebl [2010-03-21 23:53 +0100]:
> you marked this bug with "patch", yet it seems the patch is missing.

Ah, sorry. Attached.

> Also, does this mean, dbus-x11 has to add a versioned Conflicts or Breaks
> against x11-common?

This might be a good idea, yes.

Thanks!

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)

diff -u dbus-1.2.16/debian/changelog dbus-1.2.16/debian/changelog
--- dbus-1.2.16/debian/changelog
+++ dbus-1.2.16/debian/changelog
@@ -1,3 +1,10 @@
+dbus (1.2.16-2ubuntu3) lucid; urgency=low
+
+  * debian/dbus-Xsession: Use new "has_option" function from x11-common
+    instead of grepping the option file, to avoid calling an external program.
+
+ -- Martin Pitt <martin.p...@ubuntu.com>  Fri, 19 Feb 2010 07:35:37 +0100
+
 dbus (1.2.16-2ubuntu2) lucid; urgency=low
 
   * Fix installation of dbus-arch-deps.h.
diff -u dbus-1.2.16/debian/dbus-Xsession dbus-1.2.16/debian/dbus-Xsession
--- dbus-1.2.16/debian/dbus-Xsession
+++ dbus-1.2.16/debian/dbus-Xsession
@@ -6,7 +6,7 @@
 STARTDBUS=
 DBUSLAUNCH=/usr/bin/dbus-launch
 
-if grep -qs ^use-session-dbus "$OPTIONFILE"; then
+if has_option use-session-dbus; then
   if [ -x "$DBUSLAUNCH" ]; then
     STARTDBUS=yes
   fi

signature.asc
Description: Digital signature