[gmt] 02/03: Add changelog entry for Conflicts changes.

[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 69bce3af0bd05f2565f471d06a8ef97ffef42bf4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 3 19:28:08 2015 +0200

    Add changelog entry for Conflicts changes.
---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e71af31..099aaa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gmt (5.1.2+dfsg1-1~exp5) UNRELEASED; urgency=medium
 
   * Add versioned Breaks/Replaces on gmt to gmt-common.
     (closes: #790521)
+  * Add Conflicts on turnin-ng & pslib-dev to gmt-common,
+    and libpsl-dev to libgmt-dev.
   * Add references to upstream metadata.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 30 Jun 2015 07:44:37 +0200

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