diff options
| author | Michael Biebl <biebl@debian.org> | 2007-11-05 10:45:29 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2007-11-05 10:45:29 +0000 |
| commit | 03fa7df025f400e7e294fd22ec7f4961c7a806b5 (patch) | |
| tree | fbbb6f2c10f0d254359ee4ecc80faf19a0dc1ec1 | |
| parent | 11f862cd6ca2b17ab281610ff3ca7680e386b1cb (diff) | |
| download | dbus-03fa7df025f400e7e294fd22ec7f4961c7a806b5.tar.gz | |
- revert r1611. this is a special case.
- new upstream release.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@1852 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/dbus.preinst | 11 |
2 files changed, 7 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 05359f67..80b1b10b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,6 @@ -dbus (1.1.1-4) UNRELEASED; urgency=low +dbus (1.1.2-1) 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) + * New upstream release. -- Michael Biebl <biebl@debian.org> Wed, 18 Jul 2007 14:43:41 +0200 diff --git a/debian/dbus.preinst b/debian/dbus.preinst index 69c49853..9ed5d65c 100644 --- a/debian/dbus.preinst +++ b/debian/dbus.preinst @@ -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 @@ rm_conffile() { 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 |