[Pkg-utopia-commits] r1559 - in /packages/unstable/hal/debian: changelog hal.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Jun 22 18:37:05 2007
New Revision: 1559

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1559
Log:
* debian/hal.preinst
  - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead.

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

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=1559&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Fri Jun 22 18:37:05 2007
@@ -1,12 +1,17 @@
 hal (0.5.9.1-2) unstable; urgency=low
 
+  [ Sjoerd Simons ]
   * debian/control
     + Add libsmbios-dev build-depend on amd64 and i386 to build the dell
       backlight addon (Closes: #429871)
   * debian/patches/70-libhal-changeset-memleak.patch
     + Added. Fixes a memleak when freeing hal changesets. (Closes: #429823)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 21 Jun 2007 14:02:40 +0100
+  [ Michael Biebl ]
+  * debian/hal.preinst
+    - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 22 Jun 2007 19:35:08 +0100
 
 hal (0.5.9.1-1) unstable; urgency=low
 

Modified: packages/unstable/hal/debian/hal.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.preinst?rev=1559&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.preinst (original)
+++ packages/unstable/hal/debian/hal.preinst Fri Jun 22 18:37:05 2007
@@ -3,10 +3,12 @@
 set -e
 
 rm_conffile() {
+  PKGNAME="hal"
   CONFFILE="$1"
+
   if [ -e "$CONFFILE" ]; then
    md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-   old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+   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 ..."