From: Gerfried Fuchs Date: Thu, 12 Apr 2012 18:06:30 +0000 (+0200) Subject: merge changes from 0.5.6-2 X-Git-Tag: debian/0.6.0_pre2-2~16 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=be37f49b82e880df6dbd4bd80dbe8b93b8574943;p=pkg%2Fabook.git merge changes from 0.5.6-2 --- diff --git a/debian/changelog b/debian/changelog index 8f09c18..c32bd2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +abook (0.6.0~pre2-2) unstable; urgency=low + + * Finally uploading to unstable. Making sure the changes are carried over, + especially: + - from 0.5.6-2: + - Swedish debconf translation, already mentioned in changelog but without + closes: #387518 + - Fixed quoting in mutt config snippet noticed by Georg Neis, thanks + (closes: #394532) + + -- + abook (0.6.0~pre2-1) experimental; urgency=low * New upstream release diff --git a/debian/postinst b/debian/postinst index fc02555..408f6dc 100644 --- a/debian/postinst +++ b/debian/postinst @@ -18,6 +18,11 @@ if [ "$action" = 'configure' ] && [ -e /etc/Muttrc.d/abook.rc.removed ] && [ ! - mv /etc/Muttrc.d/abook.rc.removed /etc/Muttrc.d/abook.rc || true fi +# fix for #394532 breakage +if grep "abook --mutt-query '%s'" /etc/Muttrc.d/abook.rc >/dev/null 2>/dev/null ; then + sed -i "s/abook --mutt-query '%s'/abook --mutt-query %s/" /etc/Muttrc.d/abook.rc +fi + # only on new install, upgrade from < 0.5.6 or reconfigure if dpkg --compare-versions "$version" lt "0.5.6" || [ "$action" = "reconfigure" ]; then mutt=true @@ -31,7 +36,7 @@ if dpkg --compare-versions "$version" lt "0.5.6" || [ "$action" = "reconfigure" if [ ! -e /etc/Muttrc.d/abook.rc ] ; then mkdir /etc/Muttrc.d 2> /dev/null || true cat > /etc/Muttrc.d/abook.rc << EOF -set query_command="abook --mutt-query '%s'" +set query_command="abook --mutt-query %s" macro pager A |'abook --add-email'\n EOF fi