diff -Nru notmuch-0.27/debian/changelog notmuch-0.27/debian/changelog
--- notmuch-0.27/debian/changelog	2018-06-13 22:12:49.000000000 +0000
+++ notmuch-0.27/debian/changelog	2018-07-02 14:13:35.000000000 +0000
@@ -1,3 +1,17 @@
+notmuch (0.27-2ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 02 Jul 2018 16:13:35 +0200
+
+notmuch (0.27-2) unstable; urgency=medium
+
+  * Add texinfo as a build-dep, build info version of documentation.
+
+ -- David Bremner <bremner@debian.org>  Thu, 28 Jun 2018 21:01:29 -0300
+
 notmuch (0.27-1ubuntu2) cosmic; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru notmuch-0.27/debian/control notmuch-0.27/debian/control
--- notmuch-0.27/debian/control	2018-06-13 22:12:18.000000000 +0000
+++ notmuch-0.27/debian/control	2018-06-29 10:18:38.000000000 +0000
@@ -27,7 +27,8 @@
  dtach (>= 0.8) <!nocheck>,
  gpgsm <!nocheck>,
  gnupg <!nocheck>,
- bash-completion (>=1.9.0~)
+ bash-completion (>=1.9.0~),
+ texinfo
 Standards-Version: 4.1.3
 Homepage: https://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch