Merge remote-tracking branch 'origin/master'

diff --git a/debian/changelog b/debian/changelog
index 6ebbcf6574ef8315fe629733dc1b8452d34ff602..e8f5f150055d8764cda910f436deb9af64543f79 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.6~264) UNRELEASED; urgency=low
+
+  * New snapshot, in progress
+
+ -- David Bremner <bremner@debian.org>  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 (file)
index 0000000..d1496b5
--- /dev/null
+++ b/debian/notmuch-vim.docs
@@ -0,0 +1 @@
+vim/README

diff --git a/debian/rules b/debian/rules
index fbd863db3939c30acadc4a8de64b5a7d20b8c7a8..169a805021a5f71acd7e7dd836f5dc7d9e12d2bf 100755 (executable)
--- 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=""