Merge commit 'debian/0.11-1' into squeeze-backports

Conflicts:
	debian/changelog

3 files changed, 34 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 4f90a134..28f56587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+notmuch (0.11-1) unstable; urgency=low
+
+  * New upstream release.
+    - New 'hook' feature for notmuch-new
+    - performance and memory use improvements
+    - new add-on tool notmuch-deliver
+
+ -- David Bremner <bremner@debian.org>  Fri, 13 Jan 2012 19:59:23 -0400
+
+notmuch (0.11~rc3-1) experimental; urgency=low
+
+  * New upstream release candidate
+    - Fix for uninitialized variable(s) in notmuch-reply
+
+ -- David Bremner <bremner@debian.org>  Mon, 09 Jan 2012 07:07:46 -0400
+
+notmuch (0.11~rc2-1) experimental; urgency=low
+
+  * New upstream release candidate.
+    - Includes fix for one python bindings segfault.
+
+ -- David Bremner <bremner@debian.org>  Mon, 02 Jan 2012 06:57:29 -0400
+
+notmuch (0.11~rc1-1) experimental; urgency=low
+
+  * New upstream release candidate.
+
+ -- David Bremner <bremner@debian.org>  Sun, 25 Dec 2011 23:07:08 -0400
+
 notmuch (0.10.2-1~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze-backports.
diff --git a/debian/control b/debian/control
index 3252f32c..f6f415ed 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  python-all (>= 2.6.6-3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
  gdb,
- dtach
+ dtach (>= 0.8)
 Standards-Version: 3.9.2
 Homepage: http://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
diff --git a/debian/gbp.conf b/debian/gbp.conf
index dba526f6..6cb451a4 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -10,5 +10,8 @@ debian-branch = master
 # Directory for performing the build
 export-dir = ./debian-build
 
+# Format for upstream tags
+upstream-tag = %(version)s
+
 # Format for the debian tag
-debian-tag = debian-%(version)s
+debian-tag = debian/%(version)s