[plplot] 03/05: Dependency adjustments

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit 0c2428a110c8e42a8956363b138cc005ce585cdb
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Sep 8 22:26:40 2017 +0200

    Dependency adjustments
---
 debian/control | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 44b6a47..ce6240e 100644
--- a/debian/control
+++ b/debian/control
@@ -30,13 +30,13 @@ Build-Depends: camlidl,
                lua5.1,
                m4,
                ocaml-findlib,
+               ocaml-nox,
+               pkg-config,
+               pyqt5-dev,
                python-all-dev (>= 2.6.6-3~),
                python-numpy (>= 1:1.4.1-4~),
                python-pyqt5,
                python-sip-dev,
-               ocaml-nox,
-               pkg-config,
-               pyqt5-dev,
                python3-all-dev,
                python3-numpy (>= 1:1.4.1-4~),
                python3-pyqt5,
@@ -65,7 +65,6 @@ Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/plplot.git
 Package: libplplot15
 Architecture: any
 Section: libs
-Conflicts: libplplot11
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -108,6 +107,7 @@ Depends: libfreetype6-dev,
          libplplotwxwidgets1 (= ${binary:Version}),
          libqhull-dev,
          libqsastime-dev,
+         libshp-dev,
          ${misc:Depends}
 Breaks: libplplot-fortran9 (<< 5.9.8-1)
 Description: Scientific plotting library (development files)
@@ -130,10 +130,6 @@ Description: Scientific plotting library (development files)
 Package: libplplotcxx13
 Architecture: any
 Section: libs
-Conflicts: libplplot-c++10,
-           libplplot-c++9,
-           libplplot-c++9c2,
-           libplplot5
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -218,7 +214,6 @@ Description: Scientific plotting library (CSIRO csa library)
 Package: libqsastime0
 Architecture: any
 Section: libs
-Conflicts: libplplot9
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -313,7 +308,6 @@ Description: Scientific plotting library (wxWidgets bindings)
 
 Package: plplot-tcl
 Architecture: any
-Multi-Arch: same
 Depends: iwidgets4,
          plplot-driver-xwin,
          ${misc:Depends},
@@ -349,7 +343,6 @@ Description: Tcl/Tk tools for PLplot, a plotting library
 
 Package: plplot-tcl-dev
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
 Depends: libplplot15 (= ${binary:Version}),
          plplot-tcl,
          ${misc:Depends}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git