[Pkg-utopia-commits] r1513 - in /packages/unstable/dbus/debian: changelog control dbus.init

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jun  6 13:54:53 2007
New Revision: 1513

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1513
Log:
  * debian/control
    + Fix small typo in the dbus-x11 package description. (Closes: #425132)
  * debian/dbus.init
    + Suppress error messages about nonexistent or unreadable files.
      (Closes: #426296)
    + Do not fail on grep errors. (Closes: #423380)


Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/control
    packages/unstable/dbus/debian/dbus.init

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1513&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Wed Jun  6 13:54:53 2007
@@ -6,7 +6,15 @@
   [ Tim Dijkstra ]
   * Disable userdb cache. If you need a cache, use nscd. (closes: #370569)
 
- -- Tim Dijkstra <tim at famdijkstra.org>  Fri,  1 Jun 2007 21:00:17 +0200
+  [ Michael Biebl ]
+  * debian/control
+    + Fix small typo in the dbus-x11 package description. (Closes: #425132)
+  * debian/dbus.init
+    + Suppress error messages about nonexistent or unreadable files. 
+      (Closes: #426296)
+    + Do not fail on grep errors. (Closes: #423380)
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Jun 2007 15:39:23 +0200
 
 dbus (1.0.2-5) unstable; urgency=low
 

Modified: packages/unstable/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/control?rev=1513&op=diff
==============================================================================
--- packages/unstable/dbus/debian/control (original)
+++ packages/unstable/dbus/debian/control Wed Jun  6 13:54:53 2007
@@ -43,7 +43,7 @@
  applications.  Conceptually, it fits somewhere in between raw sockets
  and CORBA in terms of complexity.
  .
- This package contains the dbus-lauch utitility which is necessary for
+ This package contains the dbus-launch utitility which is necessary for
  packages using a D-Bus session bus.
  .
  See the dbus description for more information about D-Bus in general.

Modified: packages/unstable/dbus/debian/dbus.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.init?rev=1513&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.init (original)
+++ packages/unstable/dbus/debian/dbus.init Wed Jun  6 13:54:53 2007
@@ -68,9 +68,9 @@
 
   # Get the list of services active in this runlevel
   if [ -d /etc/rc${r}.d/ ] ; then # sysv-rc
-    services=$(grep -l "^# Required-Start:.*dbus" /etc/rc${r}.d/S??* | sort $param)
+    services=$(grep -s -l "^# Required-Start:.*dbus" /etc/rc${r}.d/S??* | sort $param)
   elif [ -f /etc/runlevel.conf ] ; then # file-rc
-    list=$(grep -l "^# Required-Start:.*dbus" /etc/init.d/*)
+    list=$(grep -s -l "^# Required-Start:.*dbus" /etc/init.d/* || true)
     services=$( for i in $list ; do
       grep -E "^[[:digit:]]{2}[[:space:]]+([0-9,S]+|[-])[[:space:]]+.*$r.*[[:space:]]+$i$" /etc/runlevel.conf
     done  | sort $param | awk '{print $4}' )