From: David Bremner Date: Fri, 24 Jun 2011 00:54:50 +0000 (-0300) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 0.7_rc1~60 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=68a2c7a8b0f749cb33a8ce7cfa2aa7781d2529bb;hp=8bf0c1c3deb49d54e86c04826a05f0217a81cf47 Merge remote-tracking branch 'origin/master' --- diff --git a/debian/changelog b/debian/changelog index 6ebbcf65..e8f5f150 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +notmuch (0.6~264) UNRELEASED; urgency=low + + * New snapshot, in progress + + -- David Bremner Thu, 23 Jun 2011 19:39:05 -0300 + notmuch (0.6~254) experimental; urgency=low [David Bremner] diff --git a/debian/notmuch-vim.docs b/debian/notmuch-vim.docs new file mode 100644 index 00000000..d1496b58 --- /dev/null +++ b/debian/notmuch-vim.docs @@ -0,0 +1 @@ +vim/README diff --git a/debian/rules b/debian/rules index fbd863db..169a8050 100755 --- a/debian/rules +++ b/debian/rules @@ -22,10 +22,3 @@ override_dh_auto_clean: override_dh_auto_install: dh_auto_install dh_auto_install --sourcedirectory bindings/python - -override_dh_installdocs: - dh_installdocs - install -m644 vim/README debian/notmuch/usr/share/doc/notmuch/README.vim - -override_dh_auto_build: - make RPATH_LDFLAGS=""