diff -Nru python-bumps-0.7.11/debian/changelog python-bumps-0.7.11/debian/changelog --- python-bumps-0.7.11/debian/changelog 2018-12-11 14:31:28.000000000 +0000 +++ python-bumps-0.7.11/debian/changelog 2018-12-26 07:35:44.000000000 +0000 @@ -1,3 +1,14 @@ +python-bumps (0.7.11-2) unstable; urgency=medium + + * Ensure arch-dep and arch-indep parts can be built separately + (Closes: #917062). + * Only try to build shared object on supported architectures. + * Make the python-bumps modules packages depend on the compiled libraries + in bumps-private-libs where possible (Closes: #916617). + * Update Standards-Version to 4.3.0 (no changes required). + + -- Stuart Prescott Wed, 26 Dec 2018 18:35:44 +1100 + python-bumps (0.7.11-1) unstable; urgency=medium [ Drew Parsons ] diff -Nru python-bumps-0.7.11/debian/control python-bumps-0.7.11/debian/control --- python-bumps-0.7.11/debian/control 2018-12-11 14:31:28.000000000 +0000 +++ python-bumps-0.7.11/debian/control 2018-12-26 07:35:44.000000000 +0000 @@ -20,7 +20,6 @@ python-pyparsing (>= 1.5.2), python-six, python-sklearn, - python-sphinx, python-typing, python-wxgtk3.0, python3-all, @@ -37,7 +36,7 @@ python3-wxgtk4.0, librandom123-dev, texinfo -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Homepage: https://github.com/bumps/bumps Vcs-Git: https://salsa.debian.org/science-team/python-bumps.git Vcs-Browser: https://salsa.debian.org/science-team/python-bumps @@ -55,6 +54,7 @@ ${misc:Depends}, ${python:Depends}, Recommends: + bumps-private-libs, python-wxgtk3.0 Suggests: python-bumps-doc, @@ -96,6 +96,7 @@ ${misc:Depends}, ${python3:Depends}, Recommends: + bumps-private-libs, python3-wxgtk4.0 Suggests: python-bumps-doc, @@ -127,7 +128,7 @@ This package installs the library for Python 3. Package: bumps-private-libs -Architecture: any +Architecture: any-amd64 any-i386 powerpc Section: libs Depends: ${misc:Depends}, diff -Nru python-bumps-0.7.11/debian/gbp.conf python-bumps-0.7.11/debian/gbp.conf --- python-bumps-0.7.11/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ python-bumps-0.7.11/debian/gbp.conf 2018-12-26 07:35:44.000000000 +0000 @@ -0,0 +1,4 @@ +[DEFAULT] +pristine-tar = True +sign-tags = True + diff -Nru python-bumps-0.7.11/debian/patches/series python-bumps-0.7.11/debian/patches/series --- python-bumps-0.7.11/debian/patches/series 2018-12-11 14:31:28.000000000 +0000 +++ python-bumps-0.7.11/debian/patches/series 2018-12-26 07:35:44.000000000 +0000 @@ -1 +1,2 @@ +sphinx_matplotlib.patch sphinx-local-mathjax.patch diff -Nru python-bumps-0.7.11/debian/patches/sphinx_matplotlib.patch python-bumps-0.7.11/debian/patches/sphinx_matplotlib.patch --- python-bumps-0.7.11/debian/patches/sphinx_matplotlib.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-bumps-0.7.11/debian/patches/sphinx_matplotlib.patch 2018-12-26 07:35:44.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Fix sphinx for newer matplotlib + The htmlonly directive has been removed in matplotlib 3. +Author: Stuart Prescott +Forwarded: https://github.com/bumps/bumps/pull/20 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -52,7 +52,6 @@ + 'sphinx.ext.mathjax', + #'only_directives', + #'matplotlib.sphinxext.mathmpl', +- 'matplotlib.sphinxext.only_directives', + 'matplotlib.sphinxext.plot_directive', + #'inheritance_diagram', + 'dollarmath', +@@ -282,4 +281,4 @@ + + # Generate tutorials + import gentut +-gentut.make() +\ No newline at end of file ++gentut.make() +--- a/doc/index.rst ++++ b/doc/index.rst +@@ -1,4 +1,4 @@ +-.. htmlonly:: ++.. only:: html + + :Release: |version| + :Date: |today| diff -Nru python-bumps-0.7.11/debian/rules python-bumps-0.7.11/debian/rules --- python-bumps-0.7.11/debian/rules 2018-12-11 14:31:28.000000000 +0000 +++ python-bumps-0.7.11/debian/rules 2018-12-26 07:35:44.000000000 +0000 @@ -26,9 +26,9 @@ dh_auto_build override_dh_auto_build-indep: override_dh_auto_build-common - PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc/ build/html # HTML generator + PYTHONPATH=. http_proxy='127.0.0.1:9' python3 -m sphinx -N -bhtml doc/ build/html # HTML generator ln -sf /usr/share/javascript/mathjax/ build/html/_static/mathjax - PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -btexinfo doc/ build/texinfo # texinfo generator + PYTHONPATH=. http_proxy='127.0.0.1:9' python3 -m sphinx -N -btexinfo doc/ build/texinfo # texinfo generator override_dh_auto_build-arch: override_dh_auto_build-common (cd bumps/dream && $(CC) compiled.c \ @@ -47,20 +47,20 @@ override_dh_python3: dh_python3 --no-ext-rename -override_dh_auto_install: +override_dh_auto_install-arch: dh_auto_install rm debian/python*-bumps/usr/lib/python*/*packages/bumps/dream/*.so cp bumps/dream/_compiled.so \ debian/bumps-private-libs/usr/lib/bumps/random123_compiled.so -override_dh_installinfo: +override_dh_installinfo-indep: cd build/texinfo; \ for p in *.png; do mv $$p bumps-$$p; done; \ sed "s/@image{/@image{bumps-/" -i bumps.texi; \ makeinfo bumps.texi dh_installinfo -override_dh_installman: +override_dh_installman-indep: cp debian/bumps.1 debian/bumps2.1 dh_installman rm debian/bumps2.1 diff -Nru python-bumps-0.7.11/debian/tests/python-bumps python-bumps-0.7.11/debian/tests/python-bumps --- python-bumps-0.7.11/debian/tests/python-bumps 2018-12-11 14:31:28.000000000 +0000 +++ python-bumps-0.7.11/debian/tests/python-bumps 2018-12-26 07:35:44.000000000 +0000 @@ -7,5 +7,5 @@ cd "$AUTOPKGTEST_TMP" for py in $(pyversions -i); do - $py -m nose -v --all-modules --with-doctest --doctest-options=+ELLIPSIS,+NORMALIZE_WHITESPACE -edream bumps + $py -m nose -v --all-modules --with-doctest --doctest-options=+ELLIPSIS,+NORMALIZE_WHITESPACE -egui -edream bumps done