[gmt] 02/02: Add Conflicts on turnin-ng & pslib-dev to gmt-common, and libpsl-dev to libgmt-dev.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository gmt.

commit eb6b04ca2020d270d2d94a87da40c12358b9a691
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jun 30 09:31:22 2015 +0200

    Add Conflicts on turnin-ng & pslib-dev to gmt-common, and libpsl-dev to libgmt-dev.
---
 debian/control | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/control b/debian/control
index b9fdbe5..638327f 100644
--- a/debian/control
+++ b/debian/control
@@ -58,6 +58,8 @@ Architecture: all
 Depends: ${misc:Depends}
 Breaks: gmt (<< 5.1.2)
 Replaces: gmt (<< 5.1.2)
+Conflicts: turnin-ng,
+           pslib-dev
 Description: Generic Mapping Tools - Architecture-independent files
  GMT is a collection of tools that allow users to manipulate
  (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@ -95,6 +97,7 @@ Depends: ${shlibs:Depends},
          libnetcdf-dev,
          ${misc:Depends}
 Suggests: gmt
+Conficts: libpsl-dev
 Description: Generic Mapping Tools Library - Development files
  These set of libraries allow manipulating geographic and Cartesian data sets
  (including filtering, trend fitting, gridding, projecting, etc.) and

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git