Merge branch 'release'

merge back debian-only release into master

diff --combined debian/control
index c59d3ead5f6783f5bfe31137a6de9340aa6de3e0,e571624a195780c0f4497ff865fc77594c912969..08071bee6fbf8177182adeb520f566e8b43191e7
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -15,12 -15,11 +15,12 @@@ Build-Depends
   libz-dev,
   python-all (>= 2.6.6-3~),
   python3-all (>= 3.1.2-7~),
 + ruby, ruby-dev,
   emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
   emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
   gdb,
   dtach (>= 0.8)
- Standards-Version: 3.9.3
+ Standards-Version: 3.9.4
  Homepage: http://notmuchmail.org/
  Vcs-Git: git://notmuchmail.org/git/notmuch
  Vcs-Browser: http://git.notmuchmail.org/git/notmuch
@@@ -90,34 -89,36 +90,34 @@@ Description: Python 3 interface to the 
   This package provides a Python 3 interface to the notmuch
   functionality, directly interfacing with a shared notmuch library.
  
 -Package: notmuch-emacs
 -Architecture: all
 -Section: mail
 -Breaks: notmuch (<<0.6~254~)
 -Replaces: notmuch (<<0.6~254~)
 -Depends: ${misc:Depends}, notmuch (>= ${source:Version}),
 - emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) |
 - emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~)
 -Description: thread-based email index, search and tagging (emacs interface)
 +Package: notmuch-ruby
 +Architecture: any
 +Section: ruby
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: Ruby interface to the notmuch mail search and index library
   Notmuch is a system for indexing, searching, reading, and tagging
   large collections of email messages in maildir or mh format. It uses
   the Xapian library to provide fast, full-text search with a very
   convenient search syntax.
   .
 - This package provides an emacs based mail user agent based on
 - notmuch.
 + This package provides a Ruby interface to the notmuch
 + functionality, directly interfacing with a shared notmuch library.
  
 -Package: notmuch-vim
 +Package: notmuch-emacs
  Architecture: all
  Section: mail
  Breaks: notmuch (<<0.6~254~)
  Replaces: notmuch (<<0.6~254~)
 -Depends: ${misc:Depends}, notmuch, vim-addon-manager
 -Description: thread-based email index, search and tagging (vim interface)
 +Depends: ${misc:Depends}, notmuch (>= ${source:Version}),
 + emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) |
 + emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~)
 +Description: thread-based email index, search and tagging (emacs interface)
   Notmuch is a system for indexing, searching, reading, and tagging
   large collections of email messages in maildir or mh format. It uses
   the Xapian library to provide fast, full-text search with a very
   convenient search syntax.
   .
 - This package provides a vim based mail user agent based on
 + This package provides an emacs based mail user agent based on
   notmuch.
  
  Package: notmuch-mutt