Commit 4ee8d1ce authored by SVN-Git Migration's avatar SVN-Git Migration

Merge SVN HEAD

parents ea99bbf3 884b1867
veusz (1.21.1-1.3) unstable; urgency=medium
veusz (2.0.1-1) unstable; urgency=low
* Non-maintainer upload.
* Backport a patch from upstream to add compatiblity with numpy 1.13.
(Closes: #876664).
* Update to Veusz 2.0.1 which uses Qt5 (closes: #875232)
* Split out module into python3-veusz and python-veusz packages
* Rename veusz-helpers to python*-veusz.helpers
* Split out common data into veusz-data
-- Aurelien Jarno <aurel32@debian.org> Sun, 24 Sep 2017 23:20:35 +0200
veusz (1.21.1-1.2) unstable; urgency=medium
* Non-maintainer upload.
* Build-Depends on python-astropy instead of python-pyfits. (Closes:
#871550).
-- Aurelien Jarno <aurel32@debian.org> Sun, 24 Sep 2017 12:36:11 +0000
veusz (1.21.1-1.1) unstable; urgency=medium
* Non-maintainer upload.
* Ensure the /usr/lib/python2.7/dist-packages/veusz/resources symlink is
only shipped by the veusz binary package. (Closes: #863594)
-- Andreas Beckmann <anbe@debian.org> Fri, 02 Jun 2017 14:38:41 +0200
-- Jeremy Sanders <jeremy@jeremysanders.net> Sat, 30 Sep 2017 11:45:00 +0200
veusz (1.21.1-1) unstable; urgency=low
......
......@@ -3,81 +3,174 @@ Section: science
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
Uploaders: Jeremy Sanders <jeremy@jeremysanders.net>
Build-Depends: debhelper (>= 7.3.5~),
docbook-utils,
docbook-xml,
fop,
graphicsmagick,
libqt4-dev,
perl,
Build-Depends: debhelper (>= 10),
dh-python,
python-all,
python-all-dbg,
python-all-dev (>= 2.6.5-13~),
python-astropy,
python-h5py,
python-numpy (>= 1:1.4.1-4~),
python-h5py-dbg,
python-pyqt5,
python-pyqt5.qtsvg,
python-pyqt5.qtsvg-dbg,
python-setuptools,
python-all-dev,
python-numpy,
python-numpy-dbg,
python-qt4-dbg,
python-qt4-dev,
python-pyqt5-dbg,
python-sip-dbg,
python-sip-dev,
python3-all,
python3-all-dbg,
python3-astropy,
python3-h5py,
python3-h5py-dbg,
python3-pyqt5,
python3-pyqt5.qtsvg,
python3-pyqt5.qtsvg-dbg,
python3-setuptools,
python3-all-dev,
python3-numpy,
python3-numpy-dbg,
python3-pyqt5-dbg,
python3-sip-dbg,
python3-sip-dev,
python3-sphinx,
pyqt5-dev,
pyqt5-dev-tools,
qtbase5-dev,
xauth,
xfonts-base,
xmlto,
xvfb
Standards-Version: 3.9.5
Standards-Version: 4.1.0
X-Python-Version: >= 2.6
Homepage: http://home.gna.org/veusz/
X-Python3-Version: >= 3.3
Homepage: https://veusz.github.io/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/veusz/trunk/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/veusz/trunk/
Package: veusz
Architecture: all
Depends: python3-veusz (>= ${source:Version}),
veusz-data (>= ${source:Version}),
${misc:Depends},
${python3:Depends}
Description: 2D scientific plotting application with graphical interface
Veusz is a 2D scientific plotting and graphing package, designed to
produce publication-ready PDF or Postscript output. Veusz provides a GUI,
command line and scripting interface (based on Python) to its plotting
facilities. The plots are built using an object-based system to
provide a consistent interface.
.
This package includes the main executable, documentation and examples.
Package: veusz-data
Depends: ${misc:Depends}
Architecture: all
Description: Data files used by Veusz
The common data files shared by the python2 and python3 versions of the
Veusz scientific plotting package.
Package: python-veusz
Section: python
Architecture: all
Depends: python-numpy,
python-qt4,
veusz-helpers (>= ${source:Version}),
python-pyqt5,
python-pyqt5.qtsvg,
python-veusz.helpers (>= ${source:Version}),
veusz-data (>= ${source:Version}),
${misc:Depends},
${python:Depends}
Suggests: python-dbus,
python-h5py,
python-astropy
Breaks: veusz-helpers (<< 1.20.1-3)
Replaces: veusz-helpers (<< 1.20.1-3)
Suggests: ghostscript,
python-astropy,
python-dbus,
python-h5py
Description: 2D scientific plotting application with graphical interface
Veusz is a 2D scientific plotting and graphing package, designed to
produce publication-ready PDF or Postscript output. Veusz provides a GUI,
command line and scripting interface (based on Python) to its plotting
facilities. The plots are built using an object-based system to
provide a consistent interface.
.
This package includes the python module for Python 2.
Package: python3-veusz
Section: python
Architecture: all
Depends: python3-numpy,
python3-pyqt5,
python3-pyqt5.qtsvg,
python3-veusz.helpers (>= ${source:Version}),
veusz-data (>= ${source:Version}),
${misc:Depends},
${python3:Depends}
Suggests: ghostscript,
python3-astropy,
python3-dbus,
python3-h5py
Description: 2D scientific plotting application with graphical interface
Veusz is a 2D scientific plotting and graphing package, designed to
produce publication-ready Postscript or PDF output. Veusz provides a GUI,
produce publication-ready PDF or Postscript output. Veusz provides a GUI,
command line and scripting interface (based on Python) to its plotting
facilities. The plots are built using an object-based system to
provide a consistent interface. Veusz supports reading data from CSV, text,
HDF5 and FITS formats.
provide a consistent interface.
.
This package includes the python module for Python 3.
Package: veusz-helpers
Package: python-veusz.helpers
Section: python
Architecture: any
Depends: python-numpy,
python-qt4,
python-pyqt5,
${misc:Depends},
${python:Depends},
${shlibs:Depends},
${sip:Depends}
Breaks: veusz (<< ${source:Version})
Suggests: veusz (= ${source:Version})
Description: Architecture-specific helper module for Veusz
This package contains the architecture specific files for Veusz, a scientific
plotting package. This package contains the Python extension modules used
internally by Veusz.
Breaks: python-veusz (<< ${source:Version})
Suggests: python-veusz (= ${source:Version})
Description: Architecture-specific extension for Veusz (python2)
This package contains the python2 architecture specific extension for Veusz,
a scientific plotting package.
Package: python3-veusz.helpers
Section: python
Architecture: any
Depends: python3-numpy,
python3-pyqt5,
${misc:Depends},
${python3:Depends},
${shlibs:Depends},
${sip3:Depends}
Breaks: python3-veusz (<< ${source:Version})
Suggests: python3-veusz (= ${source:Version})
Description: Architecture-specific extension for Veusz (python3)
This package contains the python3 architecture specific extension for Veusz,
a scientific plotting package.
Package: veusz-helpers-dbg
Package: python-veusz.helpers-dbg
Section: debug
Priority: extra
Architecture: any
Depends: veusz-helpers (= ${binary:Version}),
python-numpy,
python-qt4,
Depends: python-veusz.helpers (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends},
${sip:Depends}
Recommends: python-dbg, python-numpy-dbg, python-qt4-dbg
Description: Architecture-specific helper module for Veusz (debug extension)
This package contains the architecture specific files for Veusz compiled to
be able to use the Python debugging package or using standard Python with
debugging symbols.
Recommends: python-dbg, python-numpy-dbg, python-pyqt5-dbg
Description: Architecture-specific extension for Veusz (python2 debug)
This package contains the python2 architecture-specific debug information
for Veusz, a scientific plotting package.
Package: python3-veusz.helpers-dbg
Section: debug
Priority: extra
Architecture: any
Depends: python3-veusz.helpers (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends},
${sip3:Depends}
Recommends: python3-dbg, python3-numpy-dbg, python3-pyqt5-dbg
Description: Architecture-specific extension for Veusz (python3 debug)
This package contains the python3 architecture-specific debug information
for Veusz, a scientific plotting package.
......@@ -67,7 +67,7 @@ License: LGPL-2.1 or GPL-3
Files: veusz/helpers/src/_nc_cntr.c
Copyright: (c) 2002-2005 John D. Hunter
License:
License: Python-like
LICENSE AGREEMENT FOR MATPLOTLIB 0.84
--------------------------------------
.
......
usr/lib/python2*/*-packages/veusz/helpers/*_d.so
usr/lib/python2*/*-packages/veusz/helpers/*[!_][!d].so
usr/lib/python2*/*-packages/veusz/*.py
usr/lib/python2*/*-packages/veusz/*/*.py
usr/lib/python2*/*-packages/veusz-*.egg-info/*
usr/lib/python3*/*-packages/veusz/helpers/*.cpython-*dm-*.so
usr/lib/python3*/*-packages/veusz/helpers/*.cpython-[0-9]*[!d]m-*.so
usr/lib/python3*/*-packages/veusz/*.py
usr/lib/python3*/*-packages/veusz/*/*.py
usr/lib/python3*/*-packages/veusz-*.egg-info/*
......@@ -5,49 +5,64 @@ export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
# Get the supported Python versions
PY3VERS = $(shell py3versions -r -v)
PYVERS = $(shell pyversions -r -v)
# Callable functions to determine the correct PYTHONPATH
pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
pythonpath_dbg = $$(ls -d $(CURDIR)/build/lib.*-$(1)-pydebug 2>/dev/null || ls -d $(CURDIR)/lib.*$(1)-pydebug)
pythonpath = $$(ls -d $(CURDIR)/.pybuild/pythonX.Y_$(1)/build)
pythonpath_dbg = $$(ls -d $(CURDIR)/.pybuild/pythonX.Y-dbg_$(1)/build)
# examples are not installed, and scripts are only installed by python3
install_args = --veusz-resource-dir=debian/tmp/usr/share/veusz --disable-install-examples
export PYBUILD_INSTALL_ARGS_python2 = --install-scripts=/dev/null $(install_args)
export PYBUILD_INSTALL_ARGS_python2-dbg = --install-scripts=/dev/null $(install_args)
export PYBUILD_INSTALL_ARGS_python3 = $(install_args)
export PYBUILD_INSTALL_ARGS_python3-dbg = --install-scripts=/dev/null $(install_args)
%:
dh $@ --with python2
dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
override_dh_auto_build: export http_proxy=127.0.0.1:9
override_dh_auto_build: export https_proxy=127.0.0.1:9
override_dh_auto_build: delete_generated
# icons for menus
gm convert icons/veusz_32.png debian/veusz.xpm
# regenerate docs
(cd Documents; ./generate_manual.sh)
dh_auto_build
# desktop files are copied from source package
cp -p support/veusz.desktop debian/
cp -p support/veusz.xml debian/veusz.sharedmimeinfo
# regenerate docs
PYTHONPATH=. sphinx-build -N -bhtml Documents/manual-source build/html
pod2man --release=`cat VERSION` --center="Veusz" Documents/man-page/veusz.pod build/veusz.1
override_dh_auto_install:
# do not install examples and put data files in /usr/share/veusz
dh_auto_install -- --veusz-resource-dir=debian/veusz/usr/share/veusz --disable-install-examples
dh_auto_install
# veusz follows symlink to find its resource directory
# veusz follows symlink to find its resources
for py in $(PYVERS); do \
dh_link -pveusz usr/share/veusz usr/lib/python$${py}/dist-packages/veusz/resources; \
dh_link -ppython-veusz usr/share/veusz usr/lib/python$${py}/dist-packages/veusz/resources; \
done
for py in $(PY3VERS); do \
dh_link -ppython3-veusz usr/share/veusz usr/lib/python$${py}/dist-packages/veusz/resources; \
done
dh_numpy
dh_numpy3
dh_sip
dh_sip3
override_dh_auto_test:
# Run self tests. The current directory is used as the resource
# directory as veusz hasn't been installed when this is run.
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
set -e -x;\
for py in $(PYVERS); do \
LC_ALL=C \
for py in $(PYVERS) $(PY3VERS); do \
PYTHONPATH=$(call pythonpath,$$py) \
VEUSZ_RESOURCE_DIR=. \
VEUSZ_RESOURCE_DIR=. \
xvfb-run -a \
--server-args "-screen 0 640x480x24" \
python$$py tests/runselftest.py ;\
LC_ALL=C \
PYTHONPATH=$(call pythonpath_dbg,$$py) \
VEUSZ_RESOURCE_DIR=. \
VEUSZ_RESOURCE_DIR=. \
xvfb-run -a \
--server-args "-screen 0 640x480x24" \
python$$py-dbg tests/runselftest.py ;\
......@@ -55,7 +70,8 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
endif
override_dh_strip:
dh_strip --dbg-package=veusz-helpers-dbg
dh_strip -ppython-veusz.helpers --dbg-package=python-veusz.helpers-dbg
dh_strip -ppython3-veusz.helpers --dbg-package=python3-veusz.helpers-dbg
override_dh_compress:
# don't compress Veusz example files
......@@ -66,9 +82,4 @@ override_dh_clean: delete_generated
delete_generated:
# delete files generated by rules
rm -f debian/veusz.xpm
rm -f Documents/manual.html Documents/manual.pdf \
Documents/manual.txt Documents/manual.fo \
Documents/veusz.1 Documents/veusz_listen.1
# delete any self test failures
rm -f tests/*.temp.selftest
rm -f debian/veusz.sharedmimeinfo debian/veusz.desktop
debian/upstream-signing-key.pgp
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
mQGiBDztHfURBACQm/xueTTTMwzicLWy8tnkUNag6XsbJSathqXQ/BaW38WpIwiq
eq2EhDq/IGBCmpPJoIxzQfj0ADVGQ+bxFZaNLJsZjMDZvrHUxL7K2WEm311Jmtvf
Li1+SzC+xRzyLVk9kQ0QZ/7OEeDiaeOa2I7mvbaoAwjiKtkWZZdQjM7aAwCg8Axf
b0d57Jh3Eak3/klk2D326zUD/042qGb/EcIEZeZIxdALY6nebf5FDlRsTxaT175K
t8hfywCQnVZHpHBOmaGiG+/sSF82izhOTt6p/1RgpK5Xc5BTlRPDmrZ1S0MPNhA3
1rgv4QXSaBil7GzLwrSGksgg+696od0D3tcztoUg5FHcdRh8arq5NCpr8/lQdBR1
jIBCA/0TcU0kzlobaOfIrVhl3uwPevwjmggW42TZREcOr8Bzl3bsCZzmotNhUneS
anBsYti3q319rz0yffHUqd7aHMKEzIL7nidQItPQwqzbAMNZ1Xum1ZURbkx9n7GR
eV87HG0prR6svQP06YkZYh/NC9sdobmxi+pyoHxUVnzJSJGF6rQnSmVyZW15IFNh
bmRlcnMgKERyKSA8anNzQGFzdC5jYW0uYWMudWs+iF8EExECABcFCwcKAwQDFQMC
AxYCAQIXgAUCUa5JAgASB2VHUEcAAQEJEP68Gt3hquBTrlQAnjGgDIlfZEd7urrH
zzuAiMu4il/NAJ99LsZYEDl2b7ftMS7EVtUaun6eILQpSmVyZW15IFNhbmRlcnMg
PGplcmVteUBqZXJlbXlzYW5kZXJzLm5ldD6IXwQTEQIAFwULBwoDBAMVAwIDFgIB
AheABQJRrkj/ABIHZUdQRwABAQkQ/rwa3eGq4FPuXQCfcglKHbtwimuNUQzZ2z5E
B0ijHz4AoJYnNwAWh0lTFCuSVZlyI6i3QjxouQENBDztHfcQBADKN8eNbkth7P87
RbGPaqRk0D0PCOudSv2Wf3ngVJF2JjQNbvRkirU0VqAB9txcOl/MPxvd9F13AVZS
MOVQ4gqdEDdmq5CwUQYRqLjlGJ+B2Ej26QixSRwMjFD02LkcjCBwUyot8DUR40iB
QRE10PvH9XGE8KSYtJtMqu2ooSIXRwAECwQAx9J7nnVlaYuqZDdgeB22nuHY9+sY
R1+dg/iv+bEnZl1xgHpnS+2hVkyBnoMq4rrTO0lrBOfv735Taz0zrZ6stWvbWx9U
bkxcDgYE3EObGpEYHNFhxKW4CMQVVYizp7XobQkV2pn0HrzyOyo6agB56oO5Xbb5
NAdys6pDkH3le7yIVAQYEQIADAUCR0GfkQUJE7qDDgASB2VHUEcAAQEJEP68Gt3h
quBTOtwAoOftLrgUIi1GQx6DTmJbSA+kWbLbAKCzYSodvZ/POt9F9mtzkWuSFc7k
HohUBBgRAgAMBQJZPtkFBQkgFCIJABIHZUdQRwABAQkQ/rwa3eGq4FPPqgCfd1NE
uNdPfy9O3ubAL9l+i8DwmZcAoIAKQGSlO7k1JYJ8aODn9EJ2YFqP
=vw/p
-----END PGP PUBLIC KEY BLOCK-----
usr/share/common-licenses/GPL-2 usr/share/veusz/COPYING
usr/lib/python*/*-packages/veusz/helpers/*_d.so
usr/lib/python*/*-packages/veusz/helpers/*[!_][!_].so
......@@ -5,5 +5,8 @@ Abstract: This manual describes how to use the Veusz scientific plotting package
Section: Science/Data Analysis
Format: HTML
Index: /usr/share/doc/veusz/manual.html
Files: /usr/share/doc/veusz/manimages/*
Index: /usr/share/doc/veusz/html/index.html
Files: /usr/share/doc/veusz/html/*
/usr/share/doc/veusz/html/_images/*
/usr/share/doc/veusz/html/_sources/*
/usr/share/doc/veusz/html/_static/*
Documents/manual.html
Documents/manimages/
build/html/
support/veusz.desktop usr/share/applications/
support/veusz.xml usr/share/mime/packages/
debian/veusz.xpm usr/share/pixmaps/
usr/bin
usr/lib/python*/*-packages/veusz/*.py
usr/lib/python*/*-packages/veusz/*/*.py
......@@ -5,4 +5,3 @@ usr/share/veusz/icons/veusz_64.png usr/share/icons/hicolor/64x64/apps/veusz.png
usr/share/veusz/icons/veusz_128.png usr/share/icons/hicolor/128x128/apps/veusz.png
usr/share/veusz/icons/veusz.svg usr/share/icons/hicolor/scalable/apps/veusz.svg
usr/share/doc/veusz/examples usr/share/veusz/examples
usr/share/common-licenses/GPL-2 usr/share/veusz/COPYING
Documents/veusz.1
Documents/veusz_listen.1
build/veusz.1
?package(veusz): \
needs="X11" \
section="Applications/Science/Data Analysis" \
title="Veusz" \
command="veusz" \
icon="/usr/share/pixmaps/veusz.xpm"
<?xml version='1.0'?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/x-veusz">
<comment>Veusz saved graph</comment>
<glob pattern="*.vsz"/>
<magic priority="50">
<match type="string" value="# Veusz saved document" offset="0"/>
</magic>
</mime-type>
</mime-info>
version=3
opts=pgpsigurlmangle=s/$/.sig/ http://download.gna.org/veusz/veusz-(.*)\.tar.gz
version=4
opts="pgpsigurlmangle=s%$%.asc%" \
https://github.com/veusz/veusz/releases .*/download/.*/veusz-(\d\S+)\.tar\.gz
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment