debian upload 0.29.2-2: goodbye python2 support

Convert to pybuild while we are at it.

diff --git a/debian/changelog b/debian/changelog
index 21010a1af6445abb203242b1ee6a4ceb3ac742b3..92b974494b0f0ce61ca0f70c125ce5935c028862 100644 (file)
--- 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
 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 31d6471c28b29dee9a19e567e57196493302afee..84be657dd7e266bbab551e730d115eae2ed63dab 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends:
  libgmime-3.0-dev (>= 3.0.3~),
  libtalloc-dev,
  libz-dev,
  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),
  python3-all (>= 3.1.2-7~),
  dh-python,
  dh-elpa (>= 1.3),


@@ -73,19 +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.
 
  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})
-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
 Package: python3-notmuch
 Architecture: all
 Section: python

diff --git a/debian/python3-notmuch.install b/debian/python3-notmuch.install
deleted file mode 100644 (file)
index 4606faa..0000000
--- a/debian/python3-notmuch.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3*

diff --git a/debian/rules b/debian/rules
index d056edb623944822730fcb7ca13ad40457e27daa..5a378f6e6fc4285c9a08139b9f2b8beb383fda9f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
 #!/usr/bin/make -f
 

-python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
+export PYBUILD_NAME=notmuch

 
 %:
 
 %:

-       dh $@ --with python2,python3,elpa
+       dh $@ --with python3,elpa

 
 override_dh_auto_configure:
        BASHCMD=/bin/bash ./configure --prefix=/usr \
 
 override_dh_auto_configure:
        BASHCMD=/bin/bash ./configure --prefix=/usr \


@@ -17,20 +17,17 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
        dh_auto_build -- V=1
 
 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
        $(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_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
        $(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install
        dh_auto_install --sourcedirectory bindings/ruby