[Pkg-utopia-commits] r1852 - in /packages/unstable/dbus/debian: changelog dbus.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Nov  5 10:45:29 2007
New Revision: 1852

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1852
Log:
- revert r1611. this is a special case.
- new upstream release.

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/dbus.preinst

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1852&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Mon Nov  5 10:45:29 2007
@@ -1,10 +1,6 @@
-dbus (1.1.1-4) UNRELEASED; urgency=low
-
-  * debian/dbus.preinst
-    - Instead of using a hardcoded md5sum for the
-      /etc/X11/Xsession.d/75dbus-1-utils_dbus-launch conffile, use dpkg-query
-      in rm_conffile() to get the actual value.
-      Patch by Laurent Bigonville. (Closes: #433638)
+dbus (1.1.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 18 Jul 2007 14:43:41 +0200
 

Modified: packages/unstable/dbus/debian/dbus.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.preinst?rev=1852&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.preinst (original)
+++ packages/unstable/dbus/debian/dbus.preinst Mon Nov  5 10:45:29 2007
@@ -3,12 +3,11 @@
 set -e
 
 rm_conffile() {
-  PKGNAME="$1"
-  CONFFILE="$2"
+  CONFFILE="$1"
+  OLD_MD5SUM="$2"
   if [ -e "$CONFFILE" ]; then
-   md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-   old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
-   if [ "$md5sum" != "$old_md5sum" ]; then
+   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 ..."
      mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
@@ -22,7 +21,7 @@
 case "$1" in
 install|upgrade)
   if dpkg --compare-versions "$2" lt "0.50-2"; then
-    rm_conffile dbus-1-utils "/etc/X11/Xsession.d/75dbus-1-utils_dbus-launch"
+    rm_conffile "/etc/X11/Xsession.d/75dbus-1-utils_dbus-launch" f16c15c4b018d37ca3ea2b6aba224439
   fi
 esac