From d21da9990a9bf890d578fe1ab738685c0ae795c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Sat, 19 Oct 2019 10:25:46 +0200 Subject: switched to compat level 12 --- debian/changelog | 4 +++- debian/control | 2 +- debian/python-silx-doc.doc-base | 6 +++--- debian/rules | 4 +--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 45c8363..73334ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ silx (0.11.0+dfsg-2) UNRELEASED; urgency=medium * Use debhelper-compat instead of debian/compat. - * remove Python2 modules (Closes: #938481) + * remove Python2 modules (Closes: #938481). + * Switched to compat level 12 + - d/rules: Used --doc-main-package python3-silx. -- Picca Frédéric-Emmanuel Sat, 19 Oct 2019 09:41:53 +0200 diff --git a/debian/control b/debian/control index e88babe..e5a8e49 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Section: science Priority: optional Build-Depends: cython3 (>= 0.23.2), cython3-dbg (>= 0.23.2), - debhelper-compat (= 10), + debhelper-compat (= 12), dh-python, help2man, ipython3, diff --git a/debian/python-silx-doc.doc-base b/debian/python-silx-doc.doc-base index b290d8a..c8efa7f 100644 --- a/debian/python-silx-doc.doc-base +++ b/debian/python-silx-doc.doc-base @@ -1,9 +1,9 @@ Document: silx-manual Title: silx documentation manual Author: Jérôme Kieffer -Abstract: Toolbox for X-Ray data analysis +Abstract: Toolbox for X-Ray data analysis Section: Science/Data Analysis Format: HTML -Index: /usr/share/doc/python-silx-doc/html/index.html -Files: /usr/share/doc/python-silx-doc/html/* +Index: /usr/share/doc/python3-silx/html/index.html +Files: /usr/share/doc/python3-silx/html/* diff --git a/debian/rules b/debian/rules index 2066404..d086f63 100755 --- a/debian/rules +++ b/debian/rules @@ -65,8 +65,6 @@ override_dh_python3: # SILX_TEST_LOW_MEM=True to disable tests taking large amount of memory # GPU=False to disable the use of a GPU with OpenCL test # WITH_GL_TEST=False to disable tests using OpenGL -# UNACTIVATED UNTIL dh_python from UNSTABLE IS FIXED -# https://lists.debian.org/debian-python/2017/08/msg00095.html override_dh_auto_test: mkdir -p $(POCL_CACHE_DIR) # create POCL cachedir in order to avoid an FTBFS in sbuild dh_auto_test -- -s custom --test-args="env PYTHONPATH={build_dir} GPU=False WITH_QT_TEST=False SILX_OPENCL=False SILX_TEST_LAW_MEM=True xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} run_tests.py -vv --installed" @@ -79,6 +77,6 @@ ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) #mkdir -p $(POCL_CACHE_DIR) # create POCL cachedir in order to avoid an FTBFS in sbuild mkdir -p -m 700 $(XDG_RUNTIME_DIR) pybuild --build -s custom -p $(PY3VER) --build-args="cd doc && env PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} -m sphinx -N -bhtml source build/html" - dh_installdocs "doc/build/html" -p python-silx-doc + dh_installdocs "doc/build/html" -p python-silx-doc --doc-main-package=python3-silx dh_sphinxdoc -O--buildsystem=pybuild endif -- cgit v1.2.3