[PATCH 4/5] debian: add python 3 bindings

diff --git a/9a/ff83ca9993056d0f0e84a7e66397240660a1ba b/9a/ff83ca9993056d0f0e84a7e66397240660a1ba
new file mode 100644 (file)
index 0000000..040ff3e
--- /dev/null
+++ b/9a/ff83ca9993056d0f0e84a7e66397240660a1ba
@@ -0,0 +1,154 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id AD9C3431FDB\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Jan 2013 04:44:48 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 3VMrQrwkdFVh for <notmuch@notmuchmail.org>;\r
+       Wed, 16 Jan 2013 04:44:47 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1189A431FD5\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Jan 2013 04:44:44 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TvSMC-0002S2-NX; Wed, 16 Jan 2013 08:44:42 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TvSM7-0004I1-69; Wed, 16 Jan 2013 08:44:35 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/5] debian: add python 3 bindings\r
+Date: Wed, 16 Jan 2013 08:44:21 -0400\r
+Message-Id: <1358340262-16304-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1358340262-16304-1-git-send-email-david@tethera.net>\r
+References: <1358340262-16304-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 16 Jan 2013 12:44:49 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This patch is due to Jakub Wilk <jwilk@debian.org>.\r
+\r
+It does add a build depend on python3 for people using the "make\r
+debian-snapshot" target.\r
+---\r
+ debian/changelog              |    4 +++-\r
+ debian/control                |   14 ++++++++++++++\r
+ debian/python-notmuch.install |    2 +-\r
+ debian/rules                  |    5 +++++\r
+ 4 files changed, 23 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/debian/changelog b/debian/changelog\r
+index f4925a1..40b7695 100644\r
+--- a/debian/changelog\r
++++ b/debian/changelog\r
+@@ -4,8 +4,10 @@ notmuch (0.15~rc1-1) experimental; urgency=low\r
+   * Change priority to optional (Closes: #687217).\r
+   * Remove Dm-Upload-Allowed field, as this is no longer used by\r
+     Debian.\r
++  * Add python3 bindings, thanks to Jakub Wilk (Closes:\r
++    #683515).\r
+ \r
+- -- David Bremner <bremner@debian.org>  Mon, 07 Jan 2013 21:40:52 -0400\r
++ -- David Bremner <bremner@debian.org>  Wed, 16 Jan 2013 08:25:02 -0400\r
+ \r
+ notmuch (0.14-1) experimental; urgency=low\r
+ \r
+diff --git a/debian/control b/debian/control\r
+index 75b55a5..5bb0d05 100644\r
+--- a/debian/control\r
++++ b/debian/control\r
+@@ -14,6 +14,7 @@ Build-Depends:\r
+  libtalloc-dev,\r
+  libz-dev,\r
+  python-all (>= 2.6.6-3~),\r
++ python3-all (>= 3.1.2-7~),\r
+  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |\r
+  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),\r
+  gdb,\r
+@@ -75,6 +76,19 @@ Description: python interface to the notmuch mail search and index library\r
+  This package provides a Python interface to the notmuch\r
+  functionality, directly interfacing with a shared notmuch library.\r
+ \r
++Package: python3-notmuch\r
++Architecture: all\r
++Section: python\r
++Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch3\r
++Description: Python 3 interface to the notmuch mail search and index library\r
++ Notmuch is a system for indexing, searching, reading, and tagging\r
++ large collections of email messages in maildir or mh format. It uses\r
++ the Xapian library to provide fast, full-text search with a very\r
++ convenient search syntax.\r
++ .\r
++ This package provides a Python 3 interface to the notmuch\r
++ functionality, directly interfacing with a shared notmuch library.\r
++\r
+ Package: notmuch-emacs\r
+ Architecture: all\r
+ Section: mail\r
+diff --git a/debian/python-notmuch.install b/debian/python-notmuch.install\r
+index 607c065..b2cc136 100644\r
+--- a/debian/python-notmuch.install\r
++++ b/debian/python-notmuch.install\r
+@@ -1 +1 @@\r
+-usr/lib/python*\r
++usr/lib/python2*\r
+diff --git a/debian/rules b/debian/rules\r
+index 8e30353..45e970a 100755\r
+--- a/debian/rules\r
++++ b/debian/rules\r
+@@ -1,5 +1,7 @@\r
+ #!/usr/bin/make -f\r
+ \r
++python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}\r
++\r
+ %:\r
+       dh $@ --with python2\r
+ \r
+@@ -9,13 +11,16 @@ override_dh_auto_configure:\r
+ override_dh_auto_build:\r
+       dh_auto_build\r
+       dh_auto_build --sourcedirectory bindings/python\r
++      cd bindings/python && $(python3_all) setup.py build\r
+       $(MAKE) -C contrib/notmuch-mutt\r
+ \r
+ override_dh_auto_clean:\r
+       dh_auto_clean\r
+       dh_auto_clean --sourcedirectory bindings/python\r
++      cd bindings/python && $(python3_all) setup.py clean -a\r
+       $(MAKE) -C contrib/notmuch-mutt clean\r
+ \r
+ override_dh_auto_install:\r
+       dh_auto_install\r
+       dh_auto_install --sourcedirectory bindings/python\r
++      cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp\r
+-- \r
+1.7.10.4\r
+\r