diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/network-manager.preinst | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 41d31dec..f6f99b51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ network-manager (0.6.5-1) unstable; urgency=low - debian/patches/09_fix_bigendian_words.patch - debian/patches/12_dbus1.0.patch - debian/patches/13-wep_capabilities + * debian/network-manager.preinst + - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. - -- Michael Biebl <biebl@debian.org> Sat, 25 Aug 2007 00:21:49 +0200 + -- Michael Biebl <biebl@debian.org> Sun, 26 Aug 2007 20:46:05 +0200 network-manager (0.6.4-8) unstable; urgency=low diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 60db6ae0..3f737448 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -18,11 +18,12 @@ # Prepare to remove a no-longer used conffile prep_rm_conffile() { - CONFFILE="$1" + PKGNAME="$1" + CONFFILE="$2" if [ -e "$CONFFILE" ]; then md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;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, renaming to .dpkg-bak" mv -f "$CONFFILE" "$CONFFILE".dpkg-bak @@ -46,8 +47,8 @@ case "$1" in if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then /etc/dbus-1/event.d/26NetworkManagerDispatcher stop fi - prep_rm_conffile /etc/dbus-1/event.d/25NetworkManager - prep_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + prep_rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager + prep_rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher fi ;; |