[plplot] 04/07: Create Python 3 packages instead of Python 2, and use Qt5 instead of Qt4
Ole Streicher
olebole at moszumanska.debian.org
Sun Aug 27 19:52:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository plplot.
commit 95d95574ddbbd5e0fc52192499bfed9c330a1d0c
Author: Ole Streicher <olebole at debian.org>
Date: Sat Aug 26 11:00:14 2017 +0200
Create Python 3 packages instead of Python 2, and use Qt5 instead of Qt4
---
debian/control | 39 +++++++++++-----------
debian/python-plplot-qt.install | 1 -
debian/python-plplot.install | 3 --
debian/python3-plplot-qt.install | 1 +
...hon-plplot.examples => python3-plplot.examples} | 0
debian/python3-plplot.install | 3 ++
debian/rules | 10 +++---
7 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/debian/control b/debian/control
index 25089aa..65e8804 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: camlidl,
liblua5.1-0-dev,
liboctave-dev,
libqhull-dev (>= 2003.1-8),
- libqt4-dev,
+ libqt5svg5-dev,
libshp-dev,
libwxgtk3.0-dev,
libx11-dev,
@@ -30,12 +30,13 @@ Build-Depends: camlidl,
ocaml-findlib,
ocaml-nox,
pkg-config,
- python-all-dev (>= 2.6.6-3~),
- python-gtk2-dev,
- python-numpy (>= 1:1.4.1-4~),
- python-qt4,
- python-qt4-dev,
- python-sip-dev,
+ pyqt5-dev,
+ python3-all-dev,
+ python3-numpy (>= 1:1.4.1-4~),
+ python3-pyqt5,
+ python3-sip-dev,
+ qtbase5-dev,
+ qtchooser,
swig,
tcl-dev,
tk-dev,
@@ -419,36 +420,36 @@ Description: Scientific plotting library (Qt bindings)
This package provides C++ bindings to allow use of the PLplot API in
Qt applications.
-Package: python-plplot
+Package: python3-plplot
Architecture: any
Section: python
Depends: ${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends}
-Provides: ${python:Provides}
-Description: Python support for PLplot, a plotting library
+Provides: ${python3:Provides}
+Description: Python 3 support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
line (linear, log), contour, 3D, fill, and almost 1000 characters
- (including Greek and mathematical) in its extended font set. The package
+ (including Greek and mathematical) in its extended font set. The package
is designed to make it easy to quickly get graphical output; only a
handful of function calls is typically required. For more advanced use,
virtually all aspects of plotting are configurable.
.
This package contains the library plmodule.so for gluing the PLplot
- scientific plotting library into Python applications. Examples are also
+ scientific plotting library into Python 3 applications. Examples are also
provided.
-Package: python-plplot-qt
+Package: python3-plplot-qt
Architecture: any
Section: python
Depends: plplot-driver-qt (= ${binary:Version}),
- python-plplot (= ${binary:Version}),
+ python3-plplot (= ${binary:Version}),
${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends}
-Provides: ${python:Provides}
-Description: Scientific plotting library (Python Qt GUI)
+Provides: ${python3:Provides}
+Description: Scientific plotting library (Python 3 Qt GUI)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
line (linear, log), contour, 3D, fill, and almost 1000 characters
@@ -457,7 +458,7 @@ Description: Scientific plotting library (Python Qt GUI)
handful of function calls is typically required. For more advanced use,
virtually all aspects of plotting are configurable.
.
- This package provides Python bindings to allow use of the PLplot API in
+ This package provides Python 3 bindings to allow use of the PLplot API in
qt applications.
Package: octave-plplot
diff --git a/debian/python-plplot-qt.install b/debian/python-plplot-qt.install
deleted file mode 100644
index e80c025..0000000
--- a/debian/python-plplot-qt.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/dist-packages/plplot_pyqt4.so
diff --git a/debian/python-plplot.install b/debian/python-plplot.install
deleted file mode 100644
index eff2dd1..0000000
--- a/debian/python-plplot.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/python*/dist-packages/*.py
-usr/lib/python*/dist-packages/_plplotc*.so
-usr/lib/python*/dist-packages/plplot_widget*.so
diff --git a/debian/python3-plplot-qt.install b/debian/python3-plplot-qt.install
new file mode 100644
index 0000000..2f8d7dd
--- /dev/null
+++ b/debian/python3-plplot-qt.install
@@ -0,0 +1 @@
+usr/lib/python3*/dist-packages/plplot_pyqt*.so
diff --git a/debian/python-plplot.examples b/debian/python3-plplot.examples
similarity index 100%
rename from debian/python-plplot.examples
rename to debian/python3-plplot.examples
diff --git a/debian/python3-plplot.install b/debian/python3-plplot.install
new file mode 100644
index 0000000..f5b3545
--- /dev/null
+++ b/debian/python3-plplot.install
@@ -0,0 +1,3 @@
+usr/lib/python3*/dist-packages/*.py
+usr/lib/python3*/dist-packages/_plplotc*.so
+usr/lib/python3*/dist-packages/_Pltk_init*.so
diff --git a/debian/rules b/debian/rules
index f6dc9a6..d8ae0a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,15 +16,17 @@ CXXFLAGS += $(CPPFLAGS)
FFLAGS += -fvisibility=hidden
LDFLAGS += -Wl,--as-needed
-CONFIGURE_OPTIONS = -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON \
- -DNON_TRANSITIVE=ON \
+export QT_SELECT=5
+
+CONFIGURE_OPTIONS = -DUSE_RPATH=OFF -DPLD_psttf=OFF -DNON_TRANSITIVE=ON \
+ -DENABLE_tk=ON -DENABLE_python=ON \
-DBUILD_TEST=ON -DBUILD_DOC=ON \
-DENABLE_ada=ON \
-DOCTAVE_OCT_DIR=$(OCTDIR) -DTRY_OCTAVE4=ON \
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
%:
- dh $@ -Scmake --with python2
+ dh $@ -Scmake --with python3
override_dh_auto_configure:
xvfb-run dh_auto_configure -- $(CONFIGURE_OPTIONS)
@@ -38,7 +40,7 @@ override_dh_auto_install:
# This will be reverted later, in override_dh_shlibdeps.
# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=35733#35
chmod ugo+x debian/tmp/usr/lib/*/octave/site/oct/api-*/*/plplot_octave.oct
- dh_numpy
+ dh_numpy3
override_dh_shlibdeps:
dh_shlibdeps
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git
More information about the debian-science-commits
mailing list