debian 9 rules and chagelog

vasole · Apr 27, 2018 · 82b4fd4 · 82b4fd4
1 parent c98f547
commit 82b4fd4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/package/debian9/changelog b/package/debian9/changelog
@@ -1,3 +1,9 @@
+pymca (5.3.1-1) unstable; urgency=low
+
+  * New release 5.3.1
+
+ -- Pierre Knobel <[email protected]>  Thu, 27 Apr 2018 10:01:17 +0200
+
 pymca (5.3.0-2) unstable; urgency=low
 
   * New release 5.3.0

diff --git a/package/debian9/rules b/package/debian9/rules
@@ -25,6 +25,10 @@ override_dh_clean:
 	# remove the build documentation
 	rm -rf doc/build
 
+override_dh_auto_build:
+	dh_auto_build
+	python setup.py build build_doc
+
 override_dh_installchangelogs:
 	dh_installchangelogs changelog.txt
 
@@ -58,10 +62,6 @@ override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="cd {build_dir} && PYMCA_DATA_DIR=$(PYMCA_DATA_DIR_TEST) {interpreter} PyMca5/tests/TestAll.py" dh_auto_test
 
-override_dh_sphinxdoc:
-ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_BUILD_ARGS="cd doc && PYTHONPATH={build_dir} PYMCA_DATA_DIR=$(PYMCA_DATA_DIR_TEST) http_proxy='127.0.0.1:9' {interpreter} -m sphinx -N -bhtml source build/html" dh_auto_build  # HTML generator
-	dh_installdocs "doc/build/html" -p pymca-doc
-	dh_sphinxdoc -O--buildsystem=pybuild
-endif
+override_dh_installdocs:
+	dh_installdocs "build/sphinx/html" -p pymca-doc
+	dh_installdocs