merge changes from 0.5.6-2

diff --git a/debian/changelog b/debian/changelog
index 8f09c180f051939cab69b0b7034dbe65f0241011..c32bd2bc3d0ba715e82d0b9f09956c8c4d39d6d6 100644 (file)
--- 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 fc025551dc3f14343977ba514259a4a6dd361512..408f6dcd34194516ca79586f09ab9ab71d9ad794 100644 (file)
--- 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