[Pkg-utopia-commits] r1574 - in /packages/unstable/dbus/debian: changelog control dbus.postinst dbus.preinst rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Jun 27 14:37:44 2007
New Revision: 1574

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1574
Log:
* Misc cleanups, including quoting in maintainer scripts.

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/control
    packages/unstable/dbus/debian/dbus.postinst
    packages/unstable/dbus/debian/dbus.preinst
    packages/unstable/dbus/debian/rules

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1574&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Wed Jun 27 14:37:44 2007
@@ -3,8 +3,9 @@
   * List arches where the build-dep on libselinux1-dev doesn't apply; thanks
     Michael Banck; closes: #430821.
   * Wrap build-deps and deps.
-
- -- Loic Minier <lool at dooz.org>  Wed, 27 Jun 2007 16:24:50 +0200
+  * Misc cleanups, including quoting in maintainer scripts.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 27 Jun 2007 16:36:37 +0200
 
 dbus (1.1.1-2) unstable; urgency=low
 

Modified: packages/unstable/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/control?rev=1574&op=diff
==============================================================================
--- packages/unstable/dbus/debian/control (original)
+++ packages/unstable/dbus/debian/control Wed Jun 27 14:37:44 2007
@@ -46,7 +46,7 @@
  .
  It comes with several bindings, including GLib, Python, Qt and Java.
  .
- This package contains the D-Bus daemon and related utilities; 
+ This package contains the D-Bus daemon and related utilities.
  .
  The client-side library can be found in the libdbus-1-3 package, as it is no
  longer contained in this package.

Modified: packages/unstable/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.postinst?rev=1574&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.postinst (original)
+++ packages/unstable/dbus/debian/dbus.postinst Wed Jun 27 14:37:44 2007
@@ -12,6 +12,11 @@
 
 chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup --system "$MESSAGEUSER"
 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
-	adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+    adduser --system \
+            --home "$MESSAGEHOME" \
+            --no-create-home \
+            --disabled-password \
+            --ingroup "$MESSAGEUSER" \
+            "$MESSAGEUSER"
 
 #DEBHELPER#

Modified: packages/unstable/dbus/debian/dbus.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.preinst?rev=1574&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.preinst (original)
+++ packages/unstable/dbus/debian/dbus.preinst Wed Jun 27 14:37:44 2007
@@ -6,7 +6,7 @@
   CONFFILE="$1"
   OLD_MD5SUM="$2"
   if [ -e "$CONFFILE" ]; then
-   md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+   md5sum="$(md5sum "$CONFFILE" | sed -e 's/ .*//')"
    if [ "$md5sum" != "$OLD_MD5SUM" ]; then
      echo "Obsolete conffile $CONFFILE has been modified by you."
      echo "Saving as $CONFFILE.dpkg-bak ..."
@@ -18,7 +18,7 @@
  fi
 }
 
-case "$1" in 
+case "$1" in
 install|upgrade)
   if dpkg --compare-versions "$2" lt "0.50-2"; then
     rm_conffile "/etc/X11/Xsession.d/75dbus-1-utils_dbus-launch" f16c15c4b018d37ca3ea2b6aba224439

Modified: packages/unstable/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/rules?rev=1574&op=diff
==============================================================================
--- packages/unstable/dbus/debian/rules (original)
+++ packages/unstable/dbus/debian/rules Wed Jun 27 14:37:44 2007
@@ -11,7 +11,10 @@
 # List any files which are not installed
 common-binary-post-install-arch:: list-missing
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-xml-docs --enable-doxygen-docs --disable-userdb-cache
+DEB_CONFIGURE_EXTRA_FLAGS += \
+	--enable-xml-docs \
+	--enable-doxygen-docs \
+	--disable-userdb-cache
 
 binary-post-install/dbus-x11::
 	mkdir -p debian/dbus-x11/etc/X11/Xsession.d