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.cworth.org/git?p=notmuch;a=commitdiff_plain;h=7ad7cfbff232431377562271901ee00202bf0bd0;hp=-c

Merge tag 'debian/0.29.2-2'

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

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

7ad7cfbff232431377562271901ee00202bf0bd0
diff --combined debian/control
index ff646c6b,84be657d..b1829582
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -14,6 +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),
@@@ -29,7 -28,7 +28,7 @@@
   gnupg <!nocheck>,
   bash-completion (>=1.9.0~),
   texinfo
 -Standards-Version: 4.1.3
 +Standards-Version: 4.3.0
  Homepage: https://notmuchmail.org/
  Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
  Vcs-Browser: https://git.notmuchmail.org/git/notmuch
@@@ -73,21 -72,6 +72,6 @@@ Description: thread-based email index, 
   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
@@@ -154,8 -138,7 +138,8 @@@ Depends
   notmuch (>= 0.4),
   libmail-box-perl, libmailtools-perl,
   libstring-shellquote-perl, libterm-readline-gnu-perl,
 - ${misc:Depends}
 + ${misc:Depends},
 + ${perl:Depends},
  Recommends: mutt
  Enhances: notmuch, mutt
  Description: thread-based email index, search and tagging (Mutt interface)
diff --combined debian/rules
index ebd10481,5a378f6e..bf9d0bbd
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,9 +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 -17,17 +19,17 @@@
  
  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