[Pkg-utopia-commits] r3568 - in /packages/unstable/dbus/debian: changelog dbus-Xsession

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Mar 23 23:47:43 2010
New Revision: 3568

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3568
Log:
* debian/dbus-Xsession
  - Use new "has_option" function from x11-common instead of grepping the
    option file, to avoid calling an external program. (Closes: #570480)
    Thanks to Martin Pitt for the patch.

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/dbus-Xsession

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3568&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Tue Mar 23 23:47:43 2010
@@ -3,6 +3,10 @@
   * New upstream release.
     - Correctly get pointer data from DBusString when creating a syslog
       message. (Closes: #574697)
+  * debian/dbus-Xsession
+    - Use new "has_option" function from x11-common instead of grepping the
+      option file, to avoid calling an external program. (Closes: #570480)
+      Thanks to Martin Pitt for the patch.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 23 Mar 2010 22:28:20 +0100
 

Modified: packages/unstable/dbus/debian/dbus-Xsession
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus-Xsession?rev=3568&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus-Xsession (original)
+++ packages/unstable/dbus/debian/dbus-Xsession Tue Mar 23 23:47:43 2010
@@ -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