[Python-apps-commits] r13176 - in packages/veusz/branches/py3/debian (6 files)
jeremysanders-guest at users.alioth.debian.org
jeremysanders-guest at users.alioth.debian.org
Sun May 8 12:19:20 UTC 2016
Date: Sunday, May 8, 2016 @ 12:19:19
Author: jeremysanders-guest
Revision: 13176
Work in progress moving to py3/pybuild
Modified:
packages/veusz/branches/py3/debian/changelog
packages/veusz/branches/py3/debian/control
packages/veusz/branches/py3/debian/copyright
packages/veusz/branches/py3/debian/rules
packages/veusz/branches/py3/debian/veusz.install
Deleted:
packages/veusz/branches/py3/debian/veusz.menu
Modified: packages/veusz/branches/py3/debian/changelog
===================================================================
--- packages/veusz/branches/py3/debian/changelog 2016-05-08 12:15:53 UTC (rev 13175)
+++ packages/veusz/branches/py3/debian/changelog 2016-05-08 12:19:19 UTC (rev 13176)
@@ -1,3 +1,10 @@
+veusz (1.24-1) unstable; urgency=low
+
+ * Update to Veusz 1.24
+ * Move to using Python 3
+
+ -- Jeremy Sanders <jeremy at jeremysanders.net> Sat, 07 May 2016 13:30:00 +0200
+
veusz (1.21.1-1) unstable; urgency=low
* Update to Veusz 1.21.1
Modified: packages/veusz/branches/py3/debian/control
===================================================================
--- packages/veusz/branches/py3/debian/control 2016-05-08 12:15:53 UTC (rev 13175)
+++ packages/veusz/branches/py3/debian/control 2016-05-08 12:19:19 UTC (rev 13176)
@@ -3,45 +3,49 @@
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Jeremy Sanders <jeremy at jeremysanders.net>
-Build-Depends: debhelper (>= 7.3.5~),
+Build-Depends: debhelper (>= 9~),
docbook-utils,
docbook-xml,
fop,
graphicsmagick,
libqt4-dev,
perl,
- python-all-dbg,
- python-all-dev (>= 2.6.5-13~),
- python-pyfits,
- python-h5py,
- python-numpy (>= 1:1.4.1-4~),
- python-numpy-dbg,
- python-qt4-dbg,
python-qt4-dev,
- python-sip-dbg,
- python-sip-dev,
+ python3-all-dbg,
+ python3-all-dev (>= 3.3.0-1~),
+ python3-pyfits,
+ python3-h5py,
+ python3-numpy (>= 1:1.4.1-4~),
+ python3-numpy-dbg,
+ python3-pyqt4-dbg,
+ python3-setuptools,
+ python3-sip-dbg,
+ python3-sip-dev,
xauth,
xfonts-base,
xmlto,
xvfb
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.6
+Standards-Version: 3.9.8
+X-Python3-Version: >= 3.3
Homepage: http://home.gna.org/veusz/
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: python-numpy,
- python-qt4,
- veusz-helpers (>= ${source:Version}),
+Architecture: any
+Depends: python3-numpy,
+ python3-pyqt4,
+ python3-qt4,
${misc:Depends},
- ${python:Depends}
-Suggests: python-dbus,
- python-h5py,
- python-pyfits
-Breaks: veusz-helpers (<< 1.20.1-3)
-Replaces: veusz-helpers (<< 1.20.1-3)
+ ${python3:Depends},
+ ${shlibs:Depends},
+ ${sip3:Depends}
+Provides: python3-veusz
+Suggests: python3-dbus,
+ python3-h5py,
+ python3-pyfits
+Breaks: veusz-helpers (<< 1.24-1)
+Replaces: veusz-helpers (<< 1.24-1)
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,
@@ -50,33 +54,18 @@
provide a consistent interface. Veusz supports reading data from CSV, text,
HDF5 and FITS formats.
-Package: veusz-helpers
-Architecture: any
-Depends: python-numpy,
- python-qt4,
- ${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.
-
-Package: veusz-helpers-dbg
+Package: veusz-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: veusz-helpers (= ${binary:Version}),
- python-numpy,
- python-qt4,
+Depends: veusz (= ${binary:Version}),
+ python3-numpy,
+ python3-pyqt4,
${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends},
- ${sip:Depends}
-Recommends: python-dbg, python-numpy-dbg, python-qt4-dbg
+ ${sip3:Depends}
+Recommends: python3-dbg, python3-numpy-dbg, python3-pyqt4-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
Modified: packages/veusz/branches/py3/debian/copyright
===================================================================
--- packages/veusz/branches/py3/debian/copyright 2016-05-08 12:15:53 UTC (rev 13175)
+++ packages/veusz/branches/py3/debian/copyright 2016-05-08 12:19:19 UTC (rev 13176)
@@ -67,7 +67,7 @@
Files: veusz/helpers/src/_nc_cntr.c
Copyright: (c) 2002-2005 John D. Hunter
-License:
+License: Python
LICENSE AGREEMENT FOR MATPLOTLIB 0.84
--------------------------------------
.
Modified: packages/veusz/branches/py3/debian/rules
===================================================================
--- packages/veusz/branches/py3/debian/rules 2016-05-08 12:15:53 UTC (rev 13175)
+++ packages/veusz/branches/py3/debian/rules 2016-05-08 12:19:19 UTC (rev 13176)
@@ -1,37 +1,38 @@
#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-# Get the supported Python versions
-PYVERS = $(shell pyversions -r -v)
+export PYBUILD_NAME=veusz
+PYVERS = $(shell py3versions -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)
%:
- dh $@ --with python2
+ dh $@ --with python3 --buildsystem=pybuild
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)
+ (cd Documents; http_proxy=127.0.0.1:7 ./generate_manual.sh)
dh_auto_build
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
+ PYBUILD_INSTALL_ARGS_python3=" \
+ --veusz-resource-dir=debian/veusz/usr/share/veusz \
+ --disable-install-examples" \
+ dh_auto_install
# veusz follows symlink to find its resource directory
- for py in $(PYVERS); do \
- dh_link usr/share/veusz usr/lib/python$${py}/dist-packages/veusz/resources; \
- done
+ dh_link usr/share/veusz usr/lib/python3/dist-packages/veusz/resources
- dh_numpy
- dh_sip
+ dh_numpy3
+ dh_sip3
override_dh_auto_test:
# Run self tests. The current directory is used as the resource
@@ -55,7 +56,7 @@
endif
override_dh_strip:
- dh_strip --dbg-package=veusz-helpers-dbg
+ dh_strip -pveusz --dbg-package=veusz-dbg
override_dh_compress:
# don't compress Veusz example files
Modified: packages/veusz/branches/py3/debian/veusz.install
===================================================================
--- packages/veusz/branches/py3/debian/veusz.install 2016-05-08 12:15:53 UTC (rev 13175)
+++ packages/veusz/branches/py3/debian/veusz.install 2016-05-08 12:19:19 UTC (rev 13176)
@@ -1,6 +1,2 @@
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
Deleted: packages/veusz/branches/py3/debian/veusz.menu
===================================================================
--- packages/veusz/branches/py3/debian/veusz.menu 2016-05-08 12:15:53 UTC (rev 13175)
+++ packages/veusz/branches/py3/debian/veusz.menu 2016-05-08 12:19:19 UTC (rev 13176)
@@ -1,6 +0,0 @@
-?package(veusz): \
- needs="X11" \
- section="Applications/Science/Data Analysis" \
- title="Veusz" \
- command="veusz" \
- icon="/usr/share/pixmaps/veusz.xpm"
More information about the Python-apps-commits
mailing list