From: David Bremner <david@tethera.net>
Date: Sun, 3 Nov 2019 12:09:13 +0000 (-0400)
Subject: Merge tag 'debian/0.29.2-2'
X-Git-Tag: archive/debian/0.30_rc0-1~134
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=7ad7cfbff232431377562271901ee00202bf0bd0;hp=60ddce8a161772583e8d223498997ee866d04ede

Merge tag 'debian/0.29.2-2'

notmuch release 0.29.2-2 for experimental (experimental) [dgit]

[dgit distro=debian no-split --quilt=linear]
---

diff --git a/debian/changelog b/debian/changelog
index 21010a1a..92b97449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notmuch (0.29.2-2) experimental; urgency=medium
+
+  * Drop python-notmuch binary package.
+  * Drop python2 build-dependency (Closes: #937161).
+  * Convert to pybuild for python bindings
+
+ -- David Bremner <bremner@debian.org>  Sat, 02 Nov 2019 18:21:06 -0300
+
 notmuch (0.29.2-1) unstable; urgency=medium
 
   * New upstream bug fix release: fix file descriptor leak with gzipped
diff --git a/debian/control b/debian/control
index ff646c6b..b1829582 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends:
  libgmime-3.0-dev (>= 3.0.3~),
  libtalloc-dev,
  libz-dev,
- python-all (>= 2.6.6-3~),
  python3-all (>= 3.1.2-7~),
  dh-python,
  dh-elpa (>= 1.3),
@@ -73,21 +72,6 @@ Description: thread-based email index, search and tagging (development)
  This package provides the necessary development libraries and header
  files to allow you to develop new software using libnotmuch.
 
-Package: python-notmuch
-Architecture: all
-Section: python
-Depends: ${misc:Depends}, ${python:Depends}, libnotmuch5 (>= ${source:Version})
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: Python 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 a Python interface to the notmuch
- functionality, directly interfacing with a shared notmuch library.
-
 Package: python3-notmuch
 Architecture: all
 Section: python
diff --git a/debian/python3-notmuch.install b/debian/python3-notmuch.install
deleted file mode 100644
index 4606faae..00000000
--- a/debian/python3-notmuch.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index ebd10481..bf9d0bbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
-python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
+export PYBUILD_NAME=notmuch
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with python2,python3,elpa
+	dh $@ --with python3,elpa
 
 override_dh_auto_configure:
 	BASHCMD=/bin/bash ./configure --prefix=/usr \
@@ -19,20 +19,17 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build -- V=1
-	dh_auto_build --sourcedirectory bindings/python
-	cd bindings/python && $(python3_all) setup.py build
+	dh_auto_build --buildsystem=pybuild --sourcedirectory bindings/python
 	$(MAKE) -C contrib/notmuch-mutt
 
 override_dh_auto_clean:
 	dh_auto_clean
-	dh_auto_clean --sourcedirectory bindings/python
-	cd bindings/python && $(python3_all) setup.py clean -a
+	dh_auto_clean --buildsystem=pybuild --sourcedirectory bindings/python
 	dh_auto_clean --sourcedirectory bindings/ruby
 	$(MAKE) -C contrib/notmuch-mutt clean
 
 override_dh_auto_install:
 	dh_auto_install
-	dh_auto_install --sourcedirectory bindings/python
-	cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp
+	dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python
 	$(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install
 	dh_auto_install --sourcedirectory bindings/ruby