Merge tag 'debian/0.12-1' into squeeze-backports

notmuch Debian 0.12-1 upload (same as 0.12 + debian changelog fix)

Conflicts:
	debian/changelog

5 files changed, 37 insertions, 3 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
index 801ca02d..9f09f22d 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,3 +1,10 @@
+tmp/
+libnotmuch-dev/
+libnotmuch2/
+notmuch-emacs/
+notmuch-vim/
+notmuch/
+python-notmuch/
 *.debhelper
 *.debhelper.log
 *.substvars
diff --git a/debian/changelog b/debian/changelog
index 3cb2ad5a..026871dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+notmuch (0.12-1) unstable; urgency=low
+
+  * New upstream release
+    - Python 3.2 support
+    - GMime 2.6 support
+    - Many updates to emacs interface (see /usr/share/doc/notmuch/NEWS)
+    - Optionally ignore some files/directories within mail hierarchy
+
+ -- David Bremner <bremner@debian.org>  Tue, 20 Mar 2012 18:45:22 -0300
+
+notmuch (0.12~rc2-1) experimental; urgency=low
+
+  * Upstream pre-release
+  * New bug fixes since ~rc1
+    - fix for uninitialized variable
+    - fix for python bindings type signatures
+
+ -- David Bremner <bremner@debian.org>  Sun, 18 Mar 2012 08:10:35 -0300
+
+notmuch (0.12~rc1-1) experimental; urgency=low
+
+  * Upstream pre-release.
+  * Bump standards version to 3.9.3; no changes.
+
+ -- David Bremner <bremner@debian.org>  Thu, 01 Mar 2012 07:51:45 -0400
+
 notmuch (0.11.1-1~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze-backports.
diff --git a/debian/control b/debian/control
index f6f415ed..ed27c587 100644
--- a/debian/control
+++ b/debian/control
@@ -10,14 +10,14 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  pkg-config,
  libxapian-dev,
- libgmime-2.4-dev,
+ libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev,
  libtalloc-dev,
  libz-dev,
  python-all (>= 2.6.6-3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
  gdb,
  dtach (>= 0.8)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
 Vcs-Browser: http://git.notmuchmail.org/git/notmuch
diff --git a/debian/libnotmuch2.symbols b/debian/libnotmuch2.symbols
index 507600c8..272467a3 100644
--- a/debian/libnotmuch2.symbols
+++ b/debian/libnotmuch2.symbols
@@ -46,6 +46,7 @@ libnotmuch.so.2 libnotmuch2 #MINVER#
  notmuch_messages_get@Base 0.3
  notmuch_messages_move_to_next@Base 0.3
  notmuch_messages_valid@Base 0.3
+ notmuch_query_add_tag_exclude@Base 0.12~rc1
  notmuch_query_count_messages@Base 0.3
  notmuch_query_count_threads@Base 0.10~rc1
  notmuch_query_create@Base 0.3
diff --git a/debian/notmuch.install b/debian/notmuch.install
index fff498d2..86e891d4 100644
--- a/debian/notmuch.install
+++ b/debian/notmuch.install
@@ -1,3 +1,3 @@
 usr/bin
-usr/share/man/man1
+usr/share/man
 etc/bash_completion.d