X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=debian%2Frules;h=dfcf2cc8bb6ed0368e8f713a58742975ee5e3ebc;hb=25c933d7e6aeff5267112ce926335d6fd712da4b;hp=ebd1048170839dfc90aa75c789b1669af252bee2;hpb=60ddce8a161772583e8d223498997ee866d04ede;p=notmuch

diff --git a/debian/rules b/debian/rules
index ebd10481..dfcf2cc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,14 @@
 #!/usr/bin/make -f
-
-python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
+include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with python2,python3,elpa
+	dh $@ --with python3,elpa,sphinxdoc
 
 override_dh_auto_configure:
 	BASHCMD=/bin/bash ./configure --prefix=/usr \
-		--libdir=/usr/lib/$$(dpkg-architecture -q DEB_TARGET_MULTIARCH) \
+		--libdir=/usr/lib/${DEB_TARGET_MULTIARCH} \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -18,21 +17,21 @@ override_dh_auto_configure:
 		--localstatedir=/var
 
 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 -- V=1 all sphinx-html
+	PYBUILD_NAME=notmuch dh_auto_build --buildsystem=pybuild --sourcedirectory bindings/python
+	PYBUILD_NAME=notmuch2 dh_auto_build --buildsystem=pybuild --sourcedirectory bindings/python-cffi
 	$(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
+	PYBUILD_NAME=notmuch dh_auto_clean --buildsystem=pybuild --sourcedirectory bindings/python
+	PYBUILD_NAME=notmuch2 dh_auto_clean --buildsystem=pybuild --sourcedirectory bindings/python-cffi
 	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
+	PYBUILD_NAME=notmuch dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python
+	PYBUILD_NAME=notmuch2 dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python-cffi
 	$(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install
 	dh_auto_install --sourcedirectory bindings/ruby