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

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Jul 18 13:01:25 UTC 2007


Author: biebl
Date: Wed Jul 18 13:01:25 2007
New Revision: 1611

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1611
Log:
* 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)

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=1611&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Wed Jul 18 13:01:25 2007
@@ -1,8 +1,16 @@
 dbus (1.1.1-4) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Merge 1.1.1-2 and 1.1.1-3 changelog entries as 1.1.1-2 was never uploaded.
 
- -- Loic Minier <lool at dooz.org>  Wed, 27 Jun 2007 17:10:58 +0200
+  [ Michael Biebl ]
+  * 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)
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 18 Jul 2007 14:43:41 +0200
 
 dbus (1.1.1-3) unstable; urgency=low
 

Modified: packages/unstable/dbus/debian/dbus.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.preinst?rev=1611&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.preinst (original)
+++ packages/unstable/dbus/debian/dbus.preinst Wed Jul 18 13:01:25 2007
@@ -3,11 +3,12 @@
 set -e
 
 rm_conffile() {
-  CONFFILE="$1"
-  OLD_MD5SUM="$2"
+  PKGNAME="$1"
+  CONFFILE="$2"
   if [ -e "$CONFFILE" ]; then
-   md5sum="$(md5sum "$CONFFILE" | sed -e 's/ .*//')"
-   if [ "$md5sum" != "$OLD_MD5SUM" ]; 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
      echo "Obsolete conffile $CONFFILE has been modified by you."
      echo "Saving as $CONFFILE.dpkg-bak ..."
      mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
@@ -21,7 +22,7 @@
 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
+    rm_conffile dbus-1-utils "/etc/X11/Xsession.d/75dbus-1-utils_dbus-launch"
   fi
 esac
 




More information about the Pkg-utopia-commits mailing list