[Git][debian-gis-team/fiona][master] 2 commits: Apply patch by Matthias Klose to fix FTBFS with multiple python3 versions. (closes: #943513)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / fiona


Commits:
b7637ebd by Bas Couwenberg at 2019-10-25T17:55:20Z
Apply patch by Matthias Klose to fix FTBFS with multiple python3 versions. (closes: #943513)

- - - - -
90c0dbb5 by Bas Couwenberg at 2019-10-25T17:55:36Z
Set distribution to unstable.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+fiona (1.8.9-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Bas Couwenberg ]
+  * Apply patch by Matthias Klose to fix FTBFS with multiple python3 versions.
+    (closes: #943513)
+
+  [ Matthias Klose ]
+  * Call python{version} -m sphinx to build the documentation.
+  * Build the docs in a temporary directory.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 25 Oct 2019 19:55:22 +0200
+
 fiona (1.8.9-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -11,7 +11,7 @@ BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "@$(SOURCE_DATE_EPOCH)")
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 export PYBUILD_NAME=fiona
-export PYBUILD_AFTER_BUILD_python3 = PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' /usr/share/sphinx/scripts/python3/sphinx-build -N -bhtml -D today="$(BUILD_DATE)" docs/ build/html
+export PYBUILD_AFTER_BUILD_python3 = mkdir -p doc-build && cd doc-build && PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' python{version} -m sphinx -N -bhtml -D today="$(BUILD_DATE)" ../docs/ ../build/html
 export PYBUILD_TEST_PYTEST=1
 export PYBUILD_BEFORE_TEST=cp -r {dir}/tests {build_dir}
 export PYBUILD_AFTER_TEST=rm -rf {build_dir}/tests
@@ -44,6 +44,7 @@ export PYBUILD_TEST_ARGS=--ignore tests/test_bytescollection.py \
 override_dh_clean:
 	dh_clean
 	rm -rf fiona/*.so gdal-config.txt fiona/*.c VERSION.txt fiona/*.cpp Fiona.egg-info/
+	rm -rf doc-build
 
 override_dh_auto_test:
 # Ignore test failures on problematic architectures only



View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/compare/1a6a8b968ed0767b51fa57aced266dab8c9417ba...90c0dbb58888725c0ec58370b02e0a7d3c68b9e7

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/compare/1a6a8b968ed0767b51fa57aced266dab8c9417ba...90c0dbb58888725c0ec58370b02e0a7d3c68b9e7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20191025/00a396ae/attachment-0001.html>