[Python-apps-commits] r13928 - in packages/vdirsyncer/trunk/debian (changelog rules)

[jelmer at users.alioth.debian.org]

    Date: Wednesday, March 22, 2017 @ 02:15:57
  Author: jelmer
Revision: 13928

Force building sphinx documentation with python3 version.

Modified:
  packages/vdirsyncer/trunk/debian/changelog
  packages/vdirsyncer/trunk/debian/rules

Modified: packages/vdirsyncer/trunk/debian/changelog
===================================================================
--- packages/vdirsyncer/trunk/debian/changelog	2017-03-22 02:11:33 UTC (rev 13927)
+++ packages/vdirsyncer/trunk/debian/changelog	2017-03-22 02:15:57 UTC (rev 13928)
@@ -3,6 +3,7 @@
   * New upstream release.
   * Add myself to uploaders.
   * d/patches: Rebased for new release.
+  * Force building sphinx documentation with python3 version.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Wed, 22 Mar 2017 02:00:10 +0000
 

Modified: packages/vdirsyncer/trunk/debian/rules
===================================================================
--- packages/vdirsyncer/trunk/debian/rules	2017-03-22 02:11:33 UTC (rev 13927)
+++ packages/vdirsyncer/trunk/debian/rules	2017-03-22 02:15:57 UTC (rev 13928)
@@ -3,16 +3,18 @@
 export PYBUILD_DESTDIR_python3=debian/vdirsyncer
 export PYBUILD_AFTER_INSTALL=rm -rf '{destdir}/{install_dir}/.hypothesis'
 export PYBUILD_NAME=vdirsyncer
+export SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
+
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
-	PYTHONPATH=$(CURDIR) make -C docs man
+	PYTHONPATH=$(CURDIR) make -C docs man SPHINXBUILD=$(SPHINXBUILD)
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. sphinx-build -b html docs $(CURDIR)/debian/vdirsyncer-doc/usr/share/doc/vdirsyncer-doc/html
+	PYTHONPATH=. $(SPHINXBUILD) -b html docs $(CURDIR)/debian/vdirsyncer-doc/usr/share/doc/vdirsyncer-doc/html
 	dh_sphinxdoc -O--buildsystem=python_distutils
 	# Remove unwanted license file, we already reference d/copyright
 	rm -f $(CURDIR)/debian/vdirsyncer-doc/usr/share/doc/vdirsyncer-doc/html/_sources/license.txt