diff options
author | Frédéric-Emmanuel Picca <picca@debian.org> | 2018-08-08 14:09:02 +0200 |
---|---|---|
committer | Frédéric-Emmanuel Picca <picca@debian.org> | 2018-08-08 14:09:02 +0200 |
commit | 75271d5d9979b204baf8172b2a03da4330b14083 (patch) | |
tree | 22a2e31692654f1464c6fc8463cafe6598d9bdc4 /debian | |
parent | 989033673e36f8d9959dd2d3a8285e5339bfae0c (diff) | |
parent | 302d3bcf3ef555284ce1bcf5cd7cd371addfa608 (diff) |
Merge tag 'debian/0.8.0+dfsg-1' into debian/stretch-backports
silx release 0.8.0+dfsg-1 for unstable (sid)
(maintainer view tag generated by dgit --quilt=gbp)
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 17 | ||||
-rw-r--r-- | debian/control | 3 | ||||
-rw-r--r-- | debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch | 4 | ||||
-rw-r--r-- | debian/patches/0007-add-install_requires-dependencies.patch | 6 | ||||
-rwxr-xr-x | debian/rules | 20 | ||||
-rw-r--r-- | debian/upstream/signing-key.asc | 50 |
6 files changed, 86 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index c1553b9..16fb7bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +silx (0.8.0+dfsg-1) unstable; urgency=medium + + * New upstream version 0.8.0+dfsg + * Added the pub 4096R/26F8E116 key to keyring + 2016-04-11 Thomas Vincent <thomas.vincent@esrf.fr> + * d/control + - Build-Depends + + Added pandoc + - Removed obsolete X-Python[3]-Version + * d/rules + - Installed the QtDesgigner files only for Qt5. + - Override dh_python3 to deal with qtdesigner files. + - Run sphinx with xvfb in order to have the right silx.sx documentation. + - Avoid QT warnings by setting XDG_RUNTIME_DIR + + -- Picca Frédéric-Emmanuel <picca@debian.org> Tue, 31 Jul 2018 16:24:57 +0200 + silx (0.7.0+dfsg-2~bpo9+1) stretch-backports; urgency=medium * Rebuild for stretch-backports. diff --git a/debian/control b/debian/control index 30f19b2..f394e6b 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: cython (>= 0.23.2), ipython-qtconsole, ipython3, ipython3-qtconsole, + pandoc <!nodoc>, python-all-dbg, python-all-dev, python-concurrent.futures, @@ -80,8 +81,6 @@ Standards-Version: 4.1.3 Vcs-Browser: https://salsa.debian.org/science-team/silx Vcs-Git: https://salsa.debian.org/science-team/silx.git Homepage: https://github.com/silx-kit/silx -X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.4 Package: silx Architecture: all diff --git a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch b/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch index 87c0449..9a82a2b 100644 --- a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch +++ b/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch @@ -7,10 +7,10 @@ Subject: do not modify PYTHONPATH from setup.py 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 08e4f90..51f9be2 100644 +index 69a6dca..bc7ea27 100644 --- a/setup.py +++ b/setup.py -@@ -251,7 +251,8 @@ class BuildMan(Command): +@@ -257,7 +257,8 @@ class BuildMan(Command): path.insert(0, os.path.abspath(build.build_lib)) env = dict((str(k), str(v)) for k, v in os.environ.items()) diff --git a/debian/patches/0007-add-install_requires-dependencies.patch b/debian/patches/0007-add-install_requires-dependencies.patch index ad127d1..940ac56 100644 --- a/debian/patches/0007-add-install_requires-dependencies.patch +++ b/debian/patches/0007-add-install_requires-dependencies.patch @@ -8,12 +8,12 @@ Subject: add install_requires dependencies 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 51f9be2..d214b5a 100644 +index bc7ea27..8c4dd3d 100644 --- a/setup.py +++ b/setup.py -@@ -777,7 +777,24 @@ def get_project_configuration(dry_run): +@@ -857,7 +857,24 @@ def get_project_configuration(dry_run): # for most of the computation - "numpy", + "numpy %s" % numpy_requested_version, # for the script launcher - "setuptools"] + "setuptools", diff --git a/debian/rules b/debian/rules index 1f3c86d..501910c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,17 @@ #!/usr/bin/make -f +# avoir bbuild FTBFS +export HOME=$(CURDIR)/debian/tmp-home +export XDG_RUNTIME_DIR=$(HOME)/runtime +export POCL_CACHE_DIR=$(HOME)/.cache/ + export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export POCL_CACHE_DIR=$(CURDIR)/.cache/ export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/ export PYBUILD_NAME=silx export SPECFILE_USE_GNU_SOURCE=1 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + # Make does not offer a recursive wildcard function, so here's one: rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2)) @@ -28,7 +34,6 @@ override_dh_clean: rm -rf doc/build/html rm -rf build/man rm -rf *.egg-info - rm -rf $(POCL_CACHE_DIR) override_dh_auto_build: dh_auto_build @@ -47,10 +52,14 @@ override_dh_install: dh_install -p silx package/desktop/silx.xml usr/share/mime/packages # install the qtdesigner files only for the python3 package - dh_install -p python3-silx qtdesigner_plugins/*.py /usr/lib/qt4/plugins/designer/python + dh_install -p python3-silx qtdesigner_plugins/*.py /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/designer/python dh_install +override_dh_python3: + dh_python3 + dh_python3 -p python3-silx /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/designer/python + # WITH_QT_TEST=False to disable graphical tests # SILX_OPENCL=False to disable OpenCL tests # SILX_TEST_LOW_MEM=True to disable tests taking large amount of memory @@ -67,8 +76,9 @@ override_dh_installman: override_dh_sphinxdoc: ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) - mkdir -p $(POCL_CACHE_DIR) # create POCL cachedir in order to avoid an FTBFS in sbuild - pybuild --build -s custom -p $(PY3VER) --build-args="cd doc && env PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' {interpreter} -m sphinx -N -bhtml source build/html" + #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_sphinxdoc -O--buildsystem=pybuild endif diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index e5a0f63..698218a 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -166,6 +166,52 @@ qfzAcJ0GboEzuNNv9Z2BsfI25KO60vucDZBdYv795r1NdcQDAb0ZYnADEGLpZ5mm 9diVvQMuJqhnD0C46WasTSxR8PryxmbPxm0S3WMN2X2iaz6rDEr928XybAKKNACf ZFAjcvCBMRntfEHb8scTSKeR1crUfrCkz9wgHEuTW+CaO3z4+/tomD5wKBW8VqjU Vk1IoD+aNXSQbZYWOluTRu8I9H1ZtMvDx05wkFFonGBu1eOhW94NvZeEldNfYHv+ -2lciT2MpZb1o -=buYp +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 +LokEJwI+XhTYfnftnTA= +=DZLD -----END PGP PUBLIC KEY BLOCK----- |