[gmt] 01/01: Drop Conflicts on turnin-ng & pslib-dev, gmt man pages use 'gmt' suffix now.

[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 3a7e709cff9f380c1ea2be6d3da7c38fd73a833c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 10 01:12:03 2015 +0200

    Drop Conflicts on turnin-ng & pslib-dev, gmt man pages use 'gmt' suffix now.
---
 debian/changelog | 7 +++++++
 debian/control   | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3173ad8..a6d1eb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gmt (5.1.2+dfsg1-1~exp8) UNRELEASED; urgency=medium
+
+  * Drop Conflicts on turnin-ng & pslib-dev,
+    gmt man pages use 'gmt' suffix now.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 10 Jul 2015 01:11:01 +0200
+
 gmt (5.1.2+dfsg1-1~exp7) experimental; urgency=medium
 
   * Add patch to append 'gmt' to the man page sections.
diff --git a/debian/control b/debian/control
index 7687fee..14cd967 100644
--- a/debian/control
+++ b/debian/control
@@ -60,8 +60,6 @@ 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,

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