aboutsummaryrefslogtreecommitdiffhomepage
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2011-07-17 22:18:58 -0300
committerGravatar David Bremner <bremner@debian.org>2011-07-17 22:20:37 -0300
commita900ddaba661d693764d1a5f58f8b946bb788c4a (patch)
tree8801ce742859943f2552e328c0e14572846a7160 /debian/changelog
parent8b10e4d56980037e388bf07c27899e34386c28f6 (diff)
parent2d69aba586b52566f322a347d459503d53de6ce6 (diff)
Merge commit '0.6.1'
Conflicts: lib/Makefile.local The conflicts are from three kinds of commits not merged into release: - typo fixes - removal of debug output - fix for CLEAN rule That were never merged into the release branch.
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog11
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0fad868a..37a228c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+notmuch (0.6.1-1) unstable; urgency=low
+
+ * Properly install README.Debian in notmuch-vim (Closes: #632992).
+ Thanks to Jason Woofenden for the report.
+ * Force notmuch to depend on the same version of libnotmuch. Thanks to
+ Uwe Kleine-König for the patch.
+ * Export typeinfo for Xapian exceptions from libnotmuch. This fixes
+ certain mysterious uncaught exception problems.
+
+ -- David Bremner <bremner@debian.org> Sun, 17 Jul 2011 10:20:42 -0300
+
notmuch (0.6) unstable; urgency=low
* New upstream release; see /usr/share/doc/notmuch/NEWS for